Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: Iab75c19f155179f57a173b22aa231af2cc50ad30
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 687dbc8..1a7be13 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,13 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/num-bigint"
+    },
+    {
+      "path": "external/rust/crates/oid-registry"
+    }
+  ],
   "presubmit": [
     {
       "name": "libapkverify.integration_test"
@@ -8,40 +16,36 @@
       "name": "libapkverify.test"
     },
     {
-      "name": "num-bigint_device_test_src_lib"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "num-bigint_device_test_tests_bigint"
+      "name": "num-integer_test_src_lib"
     },
     {
-      "name": "num-bigint_device_test_tests_bigint_bitwise"
+      "name": "num-integer_test_tests_average"
     },
     {
-      "name": "num-bigint_device_test_tests_bigint_scalar"
+      "name": "num-integer_test_tests_roots"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "num-bigint_device_test_tests_biguint"
+      "name": "libapkverify.test"
     },
     {
-      "name": "num-bigint_device_test_tests_biguint_scalar"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "num-bigint_device_test_tests_modpow"
+      "name": "num-integer_test_src_lib"
     },
     {
-      "name": "num-bigint_device_test_tests_roots"
+      "name": "num-integer_test_tests_average"
     },
     {
-      "name": "num-integer_device_test_src_lib"
-    },
-    {
-      "name": "num-integer_device_test_tests_average"
-    },
-    {
-      "name": "num-integer_device_test_tests_roots"
-    },
-    {
-      "name": "oid-registry_device_test_src_lib"
+      "name": "num-integer_test_tests_roots"
     }
   ]
 }