diff --git a/aidl/fingerprint/Android.bp b/aidl/fingerprint/Android.bp
index e67e23a0..7565911c 100644
--- a/aidl/fingerprint/Android.bp
+++ b/aidl/fingerprint/Android.bp
@@ -21,8 +21,8 @@ cc_binary {
         "libbase",
         "libbinder_ndk",
         "libhardware",
-        "android.hardware.biometrics.fingerprint-V3-ndk",
-        "android.hardware.biometrics.common-V3-ndk",
+        "android.hardware.biometrics.fingerprint-V4-ndk",
+        "android.hardware.biometrics.common-V4-ndk",
         "android.hardware.biometrics.common.util",
     ],
     static_libs: ["libandroid.hardware.biometrics.fingerprint.SamsungProps"],
diff --git a/aidl/thermal/Android.bp b/aidl/thermal/Android.bp
index d2c03c5e..f3987696 100644
--- a/aidl/thermal/Android.bp
+++ b/aidl/thermal/Android.bp
@@ -27,7 +27,7 @@ cc_binary {
     "libutils",
     "libnl",
     "libbinder_ndk",
-    "android.frameworks.stats-V1-ndk",
+    "android.frameworks.stats-V2-ndk",
     "android.hardware.power-V1-ndk",
     "android.hardware.thermal-V1-ndk",
     "pixel-power-ext-V1-ndk",
@@ -37,7 +37,7 @@ cc_binary {
     "libpixelstats",
   ],
   export_shared_lib_headers: [
-    "android.frameworks.stats-V1-ndk",
+    "android.frameworks.stats-V2-ndk",
     "pixelatoms-cpp",
   ],
   cflags: [