Squashed commit of the following CDM changes:

* Add additional parameters to CDM decryption API
  https://widevine-internal-review.googlesource.com/#/c/6500/

* Pass Length and Flags Parameters to Decrypt()
  https://widevine-internal-review.googlesource.com/#/c/6740/

* Remove core files from oemcrypto/mock
  https://widevine-internal-review.googlesource.com/#/c/6853/

Change-Id: I1c73f5454da20da99130b161543fb990e16e7130

libwvdrmengine/oemcrypto/mock/Android.mk

@@ -2,21 +2,26 @@ 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/lock.cpp \
-    src/log.cpp \
-    src/string_conversions.cpp \
     src/wvcrc.cpp \
+    $(CDM_SRC_DIR)/lock.cpp \
+    $(CDM_SRC_DIR)/log.cpp \
+    $(CORE_SRC_DIR)/string_conversions.cpp \
 
 LOCAL_MODULE_TAGS := tests
 
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/../include \
     $(LOCAL_PATH)/src \
+    vendor/widevine/libwvdrmengine/cdm/core/include \
+    vendor/widevine/libwvdrmengine/third_party/stringencoders/src \
     bionic \
     external/gtest/include \
     external/openssl/include \
@@ -32,6 +37,7 @@ LOCAL_SHARED_LIBRARIES := \
     libutils \
     libz \
 
+LOCAL_WHOLE_STATIC_LIBRARIES := libmodp_b64
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
 LOCAL_MODULE := liboemcrypto