Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 74ab9ee..42777bd 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,31 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "path": "external/rust/crates/bitflags"
+    },
+    {
+      "path": "external/rust/crates/either"
+    },
+    {
+      "path": "external/rust/crates/rand_chacha"
+    },
+    {
+      "path": "external/rust/crates/tinytemplate"
+    },
+    {
+      "path": "external/rust/crates/tinyvec"
+    },
+    {
+      "path": "external/rust/crates/unicode-xid"
+    },
+    {
+      "path": "external/rust/crates/url"
+    }
+  ],
   "presubmit": [
     {
       "name": "ZipFuseTest"
@@ -8,34 +34,21 @@
       "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "base64_device_test_tests_decode"
-    },
-    {
-      "name": "base64_device_test_tests_encode"
-    },
-    {
-      "name": "base64_device_test_tests_helpers"
-    },
-    {
-      "name": "either_device_test_src_lib"
-    },
-    {
       "name": "microdroid_manager_test"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "url_device_test_src_lib"
-    },
-    {
-      "name": "url_device_test_tests_data"
-    },
-    {
-      "name": "url_device_test_tests_unit"
+      "name": "microdroid_manager_test"
     },
     {
       "name": "virtualizationservice_device_test"