Merge "Specify version for aidl_interface explicitly"
diff --git a/Android.bp b/Android.bp
index fc28e1a..b1bce40 100644
--- a/Android.bp
+++ b/Android.bp
@@ -92,7 +92,7 @@
     libs: ["unsupportedappusage"],
     static_libs: [
         "androidx.annotation_annotation",
-        "netd_aidl_interface-unstable-java",
+        "netd_aidl_interface-lateststable-java",
         "netlink-client",
         "networkstack-client",
         "net-utils-framework-common",
diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index 662a5c5..96ff315 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp
@@ -156,8 +156,8 @@
         "src/android/net/shared/**/*.java",
     ],
     static_libs: [
-        "ipmemorystore-aidl-interfaces-unstable-java",
-        "networkstack-aidl-interfaces-unstable-java",
+        "ipmemorystore-aidl-interfaces-V10-java",
+        "networkstack-aidl-interfaces-V10-java",
     ],
     visibility: [
         "//frameworks/base/packages/Tethering",