Rename aidl_ include and src directories.

[ Merged from http://go/wvgerrit/152549 ]

Test: unit tests
Test: Google TV and Netflix
Test: atest GtsMediaTestCases

Bug: 216527109
Change-Id: Id70e43315550508e6fedacfee4f4ec009a24d0e3

libwvdrmengine/mediadrm/Android.bp

@@ -74,9 +74,9 @@ cc_library_static {
     name: "libwvdrmdrmplugin_aidl",
 
     srcs: [
-        "aidl_src/WVDrmPlugin.cpp",
-        "aidl_src/WVGenericCryptoInterface.cpp",
-        "aidl_src/wv_metrics_adapter.cpp",
+        "src/WVDrmPlugin.cpp",
+        "src/WVGenericCryptoInterface.cpp",
+        "src/wv_metrics_adapter.cpp",
     ],
 
     include_dirs: [
@@ -86,9 +86,8 @@ 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/aidl_include",
+        "vendor/widevine/libwvdrmengine/mediadrm/include",
         "vendor/widevine/libwvdrmengine/oemcrypto/include",
     ],
 
@@ -117,9 +116,9 @@ cc_library_static {
     name: "libwvdrmdrmplugin_aidl_fuzz",
 
     srcs: [
-        "aidl_src/WVDrmPlugin.cpp",
-        "aidl_src/WVGenericCryptoInterface.cpp",
-        "aidl_src/wv_metrics_adapter.cpp",
+        "src/WVDrmPlugin.cpp",
+        "src/WVGenericCryptoInterface.cpp",
+        "src/wv_metrics_adapter.cpp",
     ],
 
     include_dirs: [
@@ -129,9 +128,8 @@ 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/aidl_include",
+        "vendor/widevine/libwvdrmengine/mediadrm/include",
         "vendor/widevine/libwvdrmengine/oemcrypto/include",
     ],
 

libwvdrmengine/mediadrm/test/Android.mk

@@ -65,9 +65,8 @@ 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/aidl_include \
+  vendor/widevine/libwvdrmengine/mediadrm/include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
@@ -175,9 +174,8 @@ 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/aidl_include \
+  vendor/widevine/libwvdrmengine/mediadrm/include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \