diff --git a/Android.bp b/Android.bp
index c6e70cf..b604af7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,12 @@
     cargo_pkg_version: "1.0.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
 }
 
 rust_test {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index f9ce301..386d786 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,27 +3,21 @@
   "imports": [
     {
       "path": "external/rust/crates/libsqlite3-sys"
+    },
+    {
+      "path": "system/security/keystore2"
+    },
+    {
+      "path": "system/security/keystore2/legacykeystore"
     }
   ],
   "presubmit": [
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
       "name": "peeking_take_while_test_src_lib"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
       "name": "peeking_take_while_test_src_lib"
     }
   ]