Move OEMCrypto Mock files to Clear Key Library

In order to match the other implementations of CDM, we are going
to replace the android OEMCrypto mockup with the one in the cdm
repository.

This would be disruptive to the clear key library because it
relies on the current implementation of the mockup.  In order to
prevent that, I am moving the current mockup into the same directory
as the clear key library.  Then, we can put the new mockup under
the directory libwvdrmengine.

This mockup will then be deleted when the clear key library is deleted.

Change-Id: I89ee23f249dacd18241ae5ca499329e620bf5a2c

libclearkeydrmengine/Android.mk

@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := \
     frameworks/av/include \
     vendor/widevine/libclearkeydrmengine/include \
     vendor/widevine/libclearkeydrmengine/crypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
     libwvclearkeycryptoplugin \
@@ -31,4 +31,4 @@ include $(BUILD_SHARED_LIBRARY)
 
 # Sublibraries Needed:
 include vendor/widevine/libclearkeydrmengine/crypto/Android.mk
-include vendor/widevine/libwvdrmengine/oemcrypto/mock/Android.mk
+include vendor/widevine/libclearkeydrmengine/oemcrypto/mock/Android.mk

libclearkeydrmengine/crypto/Android.mk

@@ -6,7 +6,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
     vendor/widevine/libclearkeydrmengine/crypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_MODULE := libwvclearkeycryptoplugin
 

libclearkeydrmengine/crypto/test/Android.mk

@@ -9,7 +9,7 @@ LOCAL_C_INCLUDES := \
     external/gtest/include \
     external/stlport/stlport \
     vendor/widevine/libclearkeydrmengine/crypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
     libgtest \

libclearkeydrmengine/inttest/Android.mk

@@ -11,8 +11,8 @@ LOCAL_C_INCLUDES := \
     external/openssl/include \
     external/stlport/stlport \
     vendor/widevine/libclearkeydrmengine/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/mock \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/mock \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
     libgtest \

libclearkeydrmengine/oemcrypto/mock/Android.mk

@@ -7,7 +7,7 @@ LOCAL_SRC_FILES := MockOEMCrypto.cpp \
         OEMCryptoWrapper.cpp \
         wvcrc.cpp \
 
-LOCAL_C_INCLUDES += vendor/widevine/libwvdrmengine/oemcrypto/include \
+LOCAL_C_INCLUDES += vendor/widevine/libclearkeydrmengine/oemcrypto/include \
         external/openssl/include \
         external/openssh
 

libclearkeydrmengine/oemcrypto/test/Android.mk

@@ -9,8 +9,8 @@ LOCAL_MODULE_TAGS := tests
 
 LOCAL_C_INCLUDES += \
     bionic \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/mock \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/mock \
     external/gtest/include \
     external/openssl/include \
     external/stlport/stlport \
@@ -34,4 +34,4 @@ LOCAL_MODULE:=test-oemcrypto
 include $(BUILD_EXECUTABLE)
 
 # Sublibraries Needed:
-include vendor/widevine/libwvdrmengine/oemcrypto/mock/Android.mk
+include vendor/widevine/libclearkeydrmengine/oemcrypto/mock/Android.mk

libclearkeydrmengine/test/Android.mk

@@ -14,7 +14,7 @@ LOCAL_C_INCLUDES := \
     external/stlport/stlport \
     vendor/widevine/libclearkeydrmengine/include \
     vendor/widevine/libclearkeydrmengine/crypto/include \
-    vendor/widevine/libwvdrmengine/oemcrypto/include \
+    vendor/widevine/libclearkeydrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
     libgtest \