diff --git a/identity/aidl/Android.bp b/identity/aidl/Android.bp
index e2f9d0b..9f2e498 100644
--- a/identity/aidl/Android.bp
+++ b/identity/aidl/Android.bp
@@ -15,7 +15,7 @@
     ],
     imports: [
         "android.hardware.keymaster-V3",
-        "android.hardware.security.rkp-V3",
+        "android.hardware.security.keymint-V3",
     ],
     stability: "vintf",
     backend: {
@@ -31,28 +31,28 @@
             version: "1",
             imports: [
                 "android.hardware.keymaster-V3",
-                "android.hardware.security.rkp-V1",
+                "android.hardware.security.keymint-V1",
             ],
         },
         {
             version: "2",
             imports: [
                 "android.hardware.keymaster-V3",
-                "android.hardware.security.rkp-V1",
+                "android.hardware.security.keymint-V1",
             ],
         },
         {
             version: "3",
             imports: [
                 "android.hardware.keymaster-V3",
-                "android.hardware.security.rkp-V1",
+                "android.hardware.security.keymint-V1",
             ],
         },
         {
             version: "4",
             imports: [
                 "android.hardware.keymaster-V3",
-                "android.hardware.security.rkp-V3",
+                "android.hardware.security.keymint-V2",
             ],
         },
 
diff --git a/identity/aidl/default/Android.bp b/identity/aidl/default/Android.bp
index 7bc3c8d..a57875a 100644
--- a/identity/aidl/default/Android.bp
+++ b/identity/aidl/default/Android.bp
@@ -45,7 +45,6 @@
         "libpuresoftkeymasterdevice",
         "android.hardware.identity-support-lib",
         "android.hardware.keymaster-V3-ndk",
-        "android.hardware.security.rkp-V3-ndk",
     ],
 }
 
@@ -113,7 +112,6 @@
         "android.hardware.keymaster-V3-ndk",
         "android.hardware.identity-libeic-hal-common",
         "android.hardware.identity-libeic-library",
-        "android.hardware.security.rkp-V3-ndk",
     ],
     srcs: [
         "service.cpp",
diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp
index 5e303bb..54bf887 100644
--- a/identity/aidl/vts/Android.bp
+++ b/identity/aidl/vts/Android.bp
@@ -39,8 +39,6 @@
         "libcrypto",
     ],
     static_libs: [
-        "android.hardware.security.rkp-V3-cpp",
-        "android.hardware.security.rkp-V3-ndk",
         "android.hardware.security.secureclock-V1-ndk",
         "libcppbor_external",
         "libcppcose_rkp",
diff --git a/security/keymint/aidl/default/Android.bp b/security/keymint/aidl/default/Android.bp
index 17520b7..1a17fd4 100644
--- a/security/keymint/aidl/default/Android.bp
+++ b/security/keymint/aidl/default/Android.bp
@@ -25,7 +25,6 @@
         "keymint_use_latest_hal_aidl_ndk_shared",
     ],
     shared_libs: [
-        "android.hardware.security.rkp-V3-ndk",
         "android.hardware.security.sharedsecret-V1-ndk",
         "android.hardware.security.secureclock-V1-ndk",
         "libbase",
diff --git a/security/keymint/aidl/vts/functional/Android.bp b/security/keymint/aidl/vts/functional/Android.bp
index 13143bf..ef5b0bd 100644
--- a/security/keymint/aidl/vts/functional/Android.bp
+++ b/security/keymint/aidl/vts/functional/Android.bp
@@ -35,7 +35,6 @@
         "libcrypto",
     ],
     static_libs: [
-        "android.hardware.security.rkp-V3-ndk",
         "android.hardware.security.secureclock-V1-ndk",
         "libcppbor_external",
         "libcppcose_rkp",
diff --git a/security/keymint/support/Android.bp b/security/keymint/support/Android.bp
index 891bb2c..3f48320 100644
--- a/security/keymint/support/Android.bp
+++ b/security/keymint/support/Android.bp
@@ -63,9 +63,6 @@
     defaults: [
         "keymint_use_latest_hal_aidl_ndk_shared",
     ],
-    static_libs: [
-        "android.hardware.security.rkp-V3-ndk",
-    ],
     shared_libs: [
         "libbase",
         "libbinder_ndk",