diff --git a/services/core/Android.bp b/services/core/Android.bp
index a2f73a6730b50..d9a534916da6e 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -53,8 +53,8 @@ java_library_static {
         "android.hardware.configstore-V1.0-java",
         "android.hardware.contexthub-V1.0-java",
         "android.hidl.manager-V1.2-java",
-        "dnsresolver_aidl_interface-V4-java",
-        "netd_event_listener_interface-java",
+        "dnsresolver_aidl_interface-java",
+        "netd_aidl_interfaces-platform-java",
     ],
 }
 
diff --git a/services/net/Android.bp b/services/net/Android.bp
index bb5409b3e032f..8b444b0fed414 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -12,8 +12,7 @@ java_library_static {
         ":services.net-sources",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-V4-java",
-        "netd_aidl_interface-V3-java",
+        "netd_aidl_interfaces-platform-java",
         "netlink-client",
         "networkstack-client",
         "net-utils-services-common",
@@ -44,7 +43,8 @@ java_library {
         "framework-wifi-util-lib",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-V2-java",
+        // All the classes in netd_aidl_interface must be jarjar so they do not conflict with the
+        // classes generated by netd_aidl_interfaces-platform-java above.
         "netd_aidl_interface-V3-java",
         "netlink-client",
         "networkstack-client",