Revert "Rename aidl_ include and src directories."

This reverts commit 5400741601.

Reason for revert: broke hidl build

Change-Id: I3954a1c0d6c0d7a663bd2a1c8c8888cae37cee80

libwvdrmengine/mediadrm/Android.bp

@@ -74,9 +74,9 @@ cc_library_static {
     name: "libwvdrmdrmplugin_aidl",
 
     srcs: [
-        "src/WVDrmPlugin.cpp",
-        "src/WVGenericCryptoInterface.cpp",
-        "src/wv_metrics_adapter.cpp",
+        "aidl_src/WVDrmPlugin.cpp",
+        "aidl_src/WVGenericCryptoInterface.cpp",
+        "aidl_src/wv_metrics_adapter.cpp",
     ],
 
     include_dirs: [
@@ -86,8 +86,9 @@ cc_library_static {
         "vendor/widevine/libwvdrmengine/cdm/include",
         "vendor/widevine/libwvdrmengine/cdm/metrics/include",
         "vendor/widevine/libwvdrmengine/cdm/util/include",
+        "vendor/widevine/libwvdrmengine/aidl_include",
         "vendor/widevine/libwvdrmengine/include",
-        "vendor/widevine/libwvdrmengine/mediadrm/include",
+        "vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
         "vendor/widevine/libwvdrmengine/oemcrypto/include",
     ],
 
@@ -116,9 +117,9 @@ cc_library_static {
     name: "libwvdrmdrmplugin_aidl_fuzz",
 
     srcs: [
-        "src/WVDrmPlugin.cpp",
-        "src/WVGenericCryptoInterface.cpp",
-        "src/wv_metrics_adapter.cpp",
+        "aidl_src/WVDrmPlugin.cpp",
+        "aidl_src/WVGenericCryptoInterface.cpp",
+        "aidl_src/wv_metrics_adapter.cpp",
     ],
 
     include_dirs: [
@@ -128,8 +129,9 @@ cc_library_static {
         "vendor/widevine/libwvdrmengine/cdm/include",
         "vendor/widevine/libwvdrmengine/cdm/metrics/include",
         "vendor/widevine/libwvdrmengine/cdm/util/include",
+        "vendor/widevine/libwvdrmengine/aidl_include",
         "vendor/widevine/libwvdrmengine/include",
-        "vendor/widevine/libwvdrmengine/mediadrm/include",
+        "vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
         "vendor/widevine/libwvdrmengine/oemcrypto/include",
     ],
 

libwvdrmengine/mediadrm/test/Android.mk

@@ -65,8 +65,9 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/cdm/include \
   vendor/widevine/libwvdrmengine/cdm/metrics/include \
   vendor/widevine/libwvdrmengine/cdm/util/include \
+  vendor/widevine/libwvdrmengine/aidl_include \
   vendor/widevine/libwvdrmengine/include \
-  vendor/widevine/libwvdrmengine/mediadrm/include \
+  vendor/widevine/libwvdrmengine/mediadrm/aidl_include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
@@ -174,8 +175,9 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/cdm/include \
   vendor/widevine/libwvdrmengine/cdm/metrics/include \
   vendor/widevine/libwvdrmengine/cdm/util/include \
+  vendor/widevine/libwvdrmengine/aidl_include \
   vendor/widevine/libwvdrmengine/include \
-  vendor/widevine/libwvdrmengine/mediadrm/include \
+  vendor/widevine/libwvdrmengine/mediadrm/aidl_include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \