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

@@ -4,8 +4,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-  oemcrypto_test.cpp \
-  ../../cdm/src/log.cpp \
+  oemcrypto_test.cpp
 
 LOCAL_MODULE_TAGS := tests
 
@@ -19,6 +18,8 @@ LOCAL_C_INCLUDES += \
   external/stlport/stlport \
   $(LOCAL_PATH)/../include \
   $(LOCAL_PATH)/../mock/src \
+  vendor/widevine/libwvdrmengine/cdm/core/include \
+  vendor/widevine/libwvdrmengine/third_party/stringencoders/src \
 
 # TODO(fredgc): fix order dependencies on libwvlevel3 and libwvwrapper.
 LOCAL_STATIC_LIBRARIES := \