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/oemcrypto/mock/Android.mk

@@ -2,18 +2,12 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-CDM_SRC_DIR=../../cdm/src
-CORE_SRC_DIR=../../cdm/core/src
-
 LOCAL_SRC_FILES:= \
     src/oemcrypto_engine_mock.cpp \
     src/oemcrypto_key_mock.cpp \
     src/oemcrypto_keybox_mock.cpp \
     src/oemcrypto_mock.cpp \
     src/wvcrc.cpp \
-    $(CDM_SRC_DIR)/lock.cpp \
-    $(CDM_SRC_DIR)/log.cpp \
-    $(CORE_SRC_DIR)/string_conversions.cpp \
 
 LOCAL_MODULE_TAGS := tests
 
@@ -37,7 +31,9 @@ LOCAL_SHARED_LIBRARIES := \
     libutils \
     libz \
 
-LOCAL_WHOLE_STATIC_LIBRARIES := libmodp_b64
+LOCAL_STATIC_LIBRARIES := \
+    libcdm_utils
+
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
 LOCAL_MODULE := liboemcrypto