diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 3111ab7..0c37235 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -95,11 +95,7 @@
     // TODO (b/148190005): change to module-libs-api-stubs-current once it is ready.
     sdk_version: "core_platform",
     privileged: true,
-    // Build system doesn't track transitive dependeicies for jni_libs, list all the dependencies
-    // explicitly.
     jni_libs: [
-        "liblog",
-        "libnativehelper_compat_libc++",
         "libtetherutilsjni",
     ],
     resource_dirs: [
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index 1a3d5b6..5b73dd5 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -41,8 +41,7 @@
 
 java_library {
     name: "framework-tethering",
-    // TODO (b/146757305): change to module_app_current once available
-    sdk_version: "core_platform",
+    sdk_version: "module_current",
     srcs: [
         "src/android/net/TetheredClient.java",
         "src/android/net/TetheringManager.java",
@@ -56,7 +55,6 @@
 
     libs: [
         "framework-annotations-lib",
-        "android_system_stubs_current",
     ],
 
     hostdex: true, // for hiddenapi check