Merge "Change AIDL module name"

services/net/Android.bp

@@ -6,7 +6,7 @@ java_library_static {
     ],
     static_libs: [
         "dnsresolver_aidl_interface-V2-java",
-        "netd_aidl_interface-java",
+        "netd_aidl_interface-unstable-java",
         "networkstack-client",
         "tethering-client",
     ],

services/tests/servicestests/Android.bp

@@ -74,7 +74,7 @@ android_test {
         "libui",
         "libunwindstack",
         "libutils",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
     ],
 
     dxflags: ["--multi-dex"],

services/tests/uiservicestests/Android.bp

@@ -55,6 +55,6 @@ android_test {
         "libui",
         "libunwindstack",
         "libutils",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
     ],
 }

tests/net/Android.bp

@@ -37,7 +37,7 @@ java_defaults {
         "libvndksupport",
         "libziparchive",
         "libz",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
     ],
 }