diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 08f4c0e..f4799f0 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -86,13 +86,6 @@
     ],
 }
 
-// Rules for moving classes part of the lib that haven't been
-// renamed yet for lack of time
-java_defaults {
-    name: "net-utils-jarjar-shared",
-    jarjar_rules: "jarjar-rules-shared.txt",
-}
-
 java_library {
     name: "net-tests-utils",
     srcs: [
@@ -171,6 +164,8 @@
 filegroup {
     name: "net-utils-framework-wifi-common-srcs",
     srcs: [
+        "framework/android/net/util/nsd/DnsSdTxtRecord.java",
+        "framework/android/net/util/MacAddressUtils.java",
         "framework/com/android/net/module/util/**/*.java",
     ],
     path: "framework",
@@ -186,7 +181,7 @@
     name: "net-utils-wifi-service-common-srcs",
     srcs: [
        "device/android/net/NetworkFactory.java",
-       "framework/com/android/net/module/util/NetUtils.java",
+       "framework/android/net/util/NetUtils.java",
     ],
     visibility: [
         "//frameworks/opt/net/wifi/service",