diff --git a/compos/compos_key_cmd/Android.bp b/compos/compos_key_cmd/Android.bp
index 00d1035..1d889c6 100644
--- a/compos/compos_key_cmd/Android.bp
+++ b/compos/compos_key_cmd/Android.bp
@@ -12,7 +12,7 @@
     ],
 
     shared_libs: [
-        "compos_aidl_interface-ndk_platform",
+        "compos_aidl_interface-ndk",
         "libbase",
         "libbinder_rpc_unstable",
         "libbinder_ndk",
diff --git a/microdroid/keymint/Android.bp b/microdroid/keymint/Android.bp
index 6d651b9..a0bbaf4 100644
--- a/microdroid/keymint/Android.bp
+++ b/microdroid/keymint/Android.bp
@@ -15,7 +15,7 @@
         "-Wextra",
     ],
     shared_libs: [
-        "android.hardware.security.keymint-V1-ndk_platform",
+        "android.hardware.security.keymint-V1-ndk",
         "lib_android_keymaster_keymint_utils",
         "libbase",
         "libbinder_ndk",
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 7332149..f545f8e 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -18,7 +18,7 @@
     name: "MicrodroidTestNativeLib",
     srcs: ["src/native/testbinary.cpp"],
     shared_libs: [
-        "android.system.keystore2-V1-ndk_platform",
+        "android.system.keystore2-V1-ndk",
         "libbase",
         "libbinder_ndk",
         "MicrodroidTestNativeLibSub",