Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: Idf18a23945d4dd9a96bc14abb57f2ac4671e7ff5
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 1390fe5..aaad5d5 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,10 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/oid-registry"
+    }
+  ],
   "presubmit": [
     {
       "name": "libapkverify.integration_test"
@@ -11,10 +16,21 @@
       "name": "microdroid_manager_test"
     },
     {
-      "name": "oid-registry_device_test_src_lib"
+      "name": "rusticata-macros_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "rusticata-macros_device_test_src_lib"
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "rusticata-macros_test_src_lib"
     }
   ]
 }