diff --git a/hal/audiocontrol/aidl/1.0/Android.bp b/hal/audiocontrol/aidl/1.0/Android.bp
index a57c53a..093a8eb 100644
--- a/hal/audiocontrol/aidl/1.0/Android.bp
+++ b/hal/audiocontrol/aidl/1.0/Android.bp
@@ -79,7 +79,7 @@
     ],
     header_libs: ["libxsdc-utils"],
     shared_libs: [
-        "android.hardware.automotive.audiocontrol-V1-ndk_platform",
+        "android.hardware.automotive.audiocontrol-V1-ndk",
         "libgrpc++",
         "libprotobuf-cpp-full",
         "libbase",
@@ -105,9 +105,9 @@
     header_libs: ["libxsdc-utils"],
     shared_libs: [
         "android.hardware.automotive.audiocontrol-server.trout",
-        "android.hardware.automotive.audiocontrol-V1-ndk_platform",
+        "android.hardware.automotive.audiocontrol-V1-ndk",
         "android.hardware.automotive.utils.watchdog",
-        "android.automotive.watchdog-V2-ndk_platform",
+        "android.automotive.watchdog-V2-ndk",
         "libbase",
         "libbinder_ndk",
         "libutils",
diff --git a/hal/common/android/watchdog/Android.bp b/hal/common/android/watchdog/Android.bp
index 68525c5..32236b4 100644
--- a/hal/common/android/watchdog/Android.bp
+++ b/hal/common/android/watchdog/Android.bp
@@ -27,7 +27,7 @@
     ],
     export_include_dirs: ["."],
     shared_libs: [
-        "android.automotive.watchdog-V2-ndk_platform",
+        "android.automotive.watchdog-V2-ndk",
         "libbase",
         "libbinder_ndk",
         "libhidlbase",
diff --git a/hal/dumpstate/1.1/Android.bp b/hal/dumpstate/1.1/Android.bp
index 78c5323..4df26bb 100644
--- a/hal/dumpstate/1.1/Android.bp
+++ b/hal/dumpstate/1.1/Android.bp
@@ -74,7 +74,7 @@
         "android.hardware.automotive.utils.watchdog",
         "android.hardware.dumpstate@1.0",
         "android.hardware.dumpstate@1.1",
-        "android.automotive.watchdog-V2-ndk_platform",
+        "android.automotive.watchdog-V2-ndk",
         "libbase",
         "libbinder_ndk",
         "libcutils",