Add Call to Install Keybox to Widevine CDM

This merges the following changes from the Widevine CDM repository:

1a72a7e  Combine utility code into single library on Android
  Combines several previously-separate files into a static library,
  libcdm_utils, so that it can easily be used by both CDM and
  OEMCrypto.

8c4d04d  Install Keybox
  If the keybox has not been installed, install it from
  /factory/wv.keys.

Bug: 9972451
Change-Id: I8688ecd0adcf321e0c7d0faf55dd10f3910c12ec

libwvdrmengine/mediadrm/test/Android.mk

@@ -18,6 +18,8 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES := \
   libcdm \
+  libcdm_protos \
+  libcdm_utils \
   libgmock \
   libgmock_main \
   libgtest \
@@ -46,8 +48,6 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_ADDITIONAL_DEPENDENCIES += $(proto_generated_headers)
 
-LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos
-
 # End protobuf section
 
 LOCAL_MODULE := libwvdrmdrmplugin_test