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/cdm/test/unit-test.mk

@@ -34,15 +34,15 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
 
 LOCAL_STATIC_LIBRARIES := \
     libcdm \
+    libcdm_protos \
     libgmock \
     libgtest \
     libgtest_main \
     libwvwrapper \
     libwvlevel3 \
+    libcdm_utils \
     libprotobuf-cpp-2.3.0-lite
 
-LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos
-
 LOCAL_SHARED_LIBRARIES := \
     libcrypto \
     libcutils \