Remove ODK from unused makefiles

Merge from Widevine repo of http://go/wvgerrit/95087

The ODK library is used in OEMCrypto, and in test code, but it is not
needed in the CDM layer. As such, it can be removed from the
Android.mk for cdm libraries.

Bug: 150809634
Test: unit tests
Change-Id: If29458e7d3d940f9a383d77e5082e7388e19c32f

libwvdrmengine/Android.mk

@@ -168,7 +168,6 @@ LOCAL_STATIC_LIBRARIES := \
   libwvdrmcryptoplugin \
   libwvdrmdrmplugin \
   libwvlevel3 \
-  libwv_odk \
 
 LOCAL_SHARED_LIBRARIES := \
   libbase \
@@ -230,7 +229,6 @@ LOCAL_STATIC_LIBRARIES := \
   libwvdrmcryptoplugin_hidl \
   libwvdrmdrmplugin_hidl \
   libwvlevel3 \
-  libwv_odk \
 
 LOCAL_SHARED_LIBRARIES := \
   android.hardware.drm@1.0 \

libwvdrmengine/cdm/Android.bp

@@ -17,7 +17,6 @@ cc_library_static {
         "vendor/widevine/libwvdrmengine/cdm/util/include",
         "vendor/widevine/libwvdrmengine/cdm/include",
         "vendor/widevine/libwvdrmengine/oemcrypto/include",
-        "vendor/widevine/libwvdrmengine/oemcrypto/odk/include",
         "external/jsmn",
         "external/protobuf/src",
     ],

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -33,7 +33,6 @@
 #include "license_protocol.pb.h"
 #include "log.h"
 #include "metrics_collections.h"
-#include "odk.h"
 #include "properties.h"
 #include "wv_cdm_constants.h"