Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: I27c720422d9dce022639dd1ca8463076fc22f135
Change-Id: I93a4188c21bab64d778578dc2d2fbfd6690db757
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 4e7a9da..a7a027c 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -223,7 +223,6 @@
        "device/android/net/NetworkFactoryImpl.java",
        "device/android/net/NetworkFactoryLegacyImpl.java",
        "device/android/net/NetworkFactoryShim.java",
-       "framework/com/android/net/module/util/NetUtils.java",
     ],
     visibility: [
         "//frameworks/opt/net/wifi/service",