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

@@ -4,18 +4,32 @@
 LOCAL_PATH := $(call my-dir)
 
 # -----------------------------------------------------------------------------
-# Builds libmodp_b64.a
+# Builds libcdm_utils.a
 #
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmodp_b64
+LOCAL_MODULE := libcdm_utils
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_C_INCLUDES := \
     bionic \
-    external/stlport/stlport
+    external/stlport/stlport \
+    vendor/widevine/libwvdrmengine/cdm/core/include \
+    vendor/widevine/libwvdrmengine/cdm/include \
+    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libwvdrmengine/third_party/stringencoders/src
 
-LOCAL_SRC_FILES := third_party/stringencoders/src/modp_b64w.cpp
+SRC_DIR := cdm/src
+CORE_SRC_DIR := cdm/core/src
+LOCAL_SRC_FILES := third_party/stringencoders/src/modp_b64w.cpp \
+    $(CORE_SRC_DIR)/properties.cpp \
+    $(CORE_SRC_DIR)/string_conversions.cpp \
+    $(SRC_DIR)/clock.cpp \
+    $(SRC_DIR)/file_store.cpp \
+    $(SRC_DIR)/lock.cpp \
+    $(SRC_DIR)/log.cpp \
+    $(SRC_DIR)/properties_android.cpp \
+    $(SRC_DIR)/timer.cpp \
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -77,6 +91,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES := \
   libcdm \
+  libcdm_utils \
   libwvwrapper \
   libwvlevel3 \
   libprotobuf-cpp-2.3.0-lite \