OEMCrypto v16.1

Merge of http://go/wvgerrit/93404

This CL updates the Widevine CDM to support OEMCrypto v16.1

Test: Tested in 16.2 CL
Bug: 141247171
Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b

libwvdrmengine/oemcrypto/test/common.mk

@@ -7,18 +7,24 @@ endif
 
 LOCAL_SRC_FILES:= \
   oec_device_features.cpp \
+  oec_decrypt_fallback_chain.cpp \
+  oec_key_deriver.cpp \
   oec_session_util.cpp \
   oemcrypto_session_tests_helper.cpp \
   oemcrypto_test.cpp \
   oemcrypto_test_android.cpp \
   oemcrypto_test_main.cpp \
   wvcrc.cpp \
+  ../../cdm/util/test/test_sleep.cpp \
 
 LOCAL_C_INCLUDES += \
   $(LOCAL_PATH)/../include \
+  $(LOCAL_PATH)/../odk/include \
+  $(LOCAL_PATH)/../odk/kdo/include \
   $(LOCAL_PATH)/../ref/src \
   vendor/widevine/libwvdrmengine/cdm/core/include \
   vendor/widevine/libwvdrmengine/cdm/util/include \
+  vendor/widevine/libwvdrmengine/cdm/util/test \
 
 LOCAL_STATIC_LIBRARIES := \
   libcdm \
@@ -27,7 +33,10 @@ LOCAL_STATIC_LIBRARIES := \
   libgtest \
   libgtest_main \
   libwvlevel3 \
+  libcdm_protos \
   libcdm_utils \
+  libwv_kdo \
+  libwv_odk \
 
 LOCAL_SHARED_LIBRARIES := \
   libbase \
@@ -37,4 +46,3 @@ LOCAL_SHARED_LIBRARIES := \
   libstagefright_foundation \
   libutils \
   libz \
-