Revert "wifi-service: Jar-Jar net util library"

Reason for revert: b/147807058

Reverted Changes:
I902b7b742: telephony: jar-jar net.util classes on the usage s...
I90a9c537b: wifi-service: Link net util libraries
Ic3b92ca63: libs(net/common): Fixes for wifi to include.
Ib2fb2bf05: wifi-service: Jar-Jar net util library.

Bug: 147807058
Change-Id: I6a0cf666be126f45b859e38446862654e056a009
diff --git a/Tethering/jarjar-rules.txt b/Tethering/jarjar-rules.txt
index 3c182ec..c6efa41 100644
--- a/Tethering/jarjar-rules.txt
+++ b/Tethering/jarjar-rules.txt
@@ -16,4 +16,3 @@
 rule android.net.LocalLog* com.android.networkstack.tethering.LocalLog@1
 
 rule android.net.shared.Inet4AddressUtils* com.android.networkstack.tethering.shared.Inet4AddressUtils@1
-rule android.net.util.** com.android.networkstack.tethering.util.@1
diff --git a/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java b/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java
index 174836c..4dd6830 100644
--- a/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java
+++ b/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java
@@ -21,7 +21,8 @@
 import android.net.NetworkCapabilities;
 import android.net.RouteInfo;
 import android.net.util.InterfaceSet;
-import android.net.util.NetUtils;
+
+import com.android.net.module.util.NetUtils;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;