Snap for 10453563 from b4445a27b7d1439a405cc3e8afd71de53639624c to mainline-art-release

Change-Id: Iad861c798025a8b7a2f967bd4a1bbe6aa4edfa46
diff --git a/Android.bp b/Android.bp
index 6b36480..a70942e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -70,4 +70,10 @@
         "default",
         "std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 9df2505..8b01acf 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,25 +1,21 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "system/security/keystore2"
+    },
+    {
+      "path": "system/security/keystore2/legacykeystore"
+    }
+  ],
   "presubmit": [
     {
       "name": "fallible-iterator_test_src_lib"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
     }
   ],
   "presubmit-rust": [
     {
       "name": "fallible-iterator_test_src_lib"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
     }
   ]
 }