diff --git a/Android.bp b/Android.bp
index a337b83..e958531 100644
--- a/Android.bp
+++ b/Android.bp
@@ -90,7 +90,7 @@
         export_aidl_headers: true,
     },
     whole_static_libs: [
-        "libincremental_aidl-unstable-cpp",
+        "libincremental_aidl-cpp",
     ],
 }
 
@@ -163,7 +163,7 @@
     },
     shared_libs: [
         "android.hardware.health.storage@1.0",
-        "android.hardware.health.storage-unstable-ndk_platform",
+        "android.hardware.health.storage-V1-ndk_platform",
         "libbinder_ndk",
     ],
     whole_static_libs: [
@@ -194,7 +194,7 @@
 
     shared_libs: [
         "android.hardware.health.storage@1.0",
-        "android.hardware.health.storage-unstable-ndk_platform",
+        "android.hardware.health.storage-V1-ndk_platform",
         "libbinder_ndk",
     ],