Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: Ia8650801521e4f61999c55f0a08e8de94c309c32
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 4fc1e98..fbe5bf8 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,97 +1,63 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/android_logger"
+    },
+    {
+      "path": "external/rust/crates/cast"
+    },
+    {
+      "path": "external/rust/crates/crc32fast"
+    },
+    {
+      "path": "external/rust/crates/env_logger"
+    },
+    {
+      "path": "external/rust/crates/futures-util"
+    },
+    {
+      "path": "external/rust/crates/gdbstub_arch"
+    },
+    {
+      "path": "external/rust/crates/jni"
+    },
+    {
+      "path": "external/rust/crates/libsqlite3-sys"
+    },
+    {
+      "path": "external/rust/crates/mio"
+    },
+    {
+      "path": "external/rust/crates/quiche"
+    },
+    {
+      "path": "external/rust/crates/quickcheck"
+    },
+    {
+      "path": "external/rust/crates/regex"
+    },
+    {
+      "path": "external/rust/crates/serde-xml-rs"
+    },
+    {
+      "path": "external/rust/crates/tokio"
+    },
+    {
+      "path": "external/rust/crates/tokio-test"
+    }
+  ],
   "presubmit": [
     {
       "name": "ZipFuseTest"
     },
     {
-      "name": "android_logger_device_test_src_lib"
-    },
-    {
-      "name": "android_logger_device_test_tests_config_log_level"
-    },
-    {
-      "name": "android_logger_device_test_tests_default_init"
-    },
-    {
-      "name": "android_logger_device_test_tests_multiple_init"
-    },
-    {
       "name": "authfs_device_test_src_lib"
     },
     {
       "name": "doh_unit_test"
     },
     {
-      "name": "env_logger_device_test_src_lib"
-    },
-    {
-      "name": "env_logger_device_test_tests_init-twice-retains-filter"
-    },
-    {
-      "name": "env_logger_device_test_tests_log-in-log"
-    },
-    {
-      "name": "env_logger_device_test_tests_log_tls_dtors"
-    },
-    {
-      "name": "env_logger_device_test_tests_regexp_filter"
-    },
-    {
-      "name": "futures-util_device_test_src_lib"
-    },
-    {
-      "name": "gdbstub_arch_device_test_src_lib"
-    },
-    {
-      "name": "jni_device_test_src_lib"
-    },
-    {
-      "name": "jni_device_test_tests_executor"
-    },
-    {
-      "name": "jni_device_test_tests_executor_nested_attach"
-    },
-    {
-      "name": "jni_device_test_tests_java_integers"
-    },
-    {
-      "name": "jni_device_test_tests_jmap"
-    },
-    {
-      "name": "jni_device_test_tests_jni_api"
-    },
-    {
-      "name": "jni_device_test_tests_jni_global_refs"
-    },
-    {
-      "name": "jni_device_test_tests_threads_attach_guard"
-    },
-    {
-      "name": "jni_device_test_tests_threads_detach"
-    },
-    {
-      "name": "jni_device_test_tests_threads_detach_daemon"
-    },
-    {
-      "name": "jni_device_test_tests_threads_explicit_detach"
-    },
-    {
-      "name": "jni_device_test_tests_threads_explicit_detach_daemon"
-    },
-    {
-      "name": "jni_device_test_tests_threads_explicit_detach_permanent"
-    },
-    {
-      "name": "jni_device_test_tests_threads_nested_attach_daemon"
-    },
-    {
-      "name": "jni_device_test_tests_threads_nested_attach_guard"
-    },
-    {
-      "name": "jni_device_test_tests_threads_nested_attach_permanently"
-    },
-    {
       "name": "keystore2_crypto_test_rust"
     },
     {
@@ -116,241 +82,90 @@
       "name": "libapkverify.test"
     },
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
-    },
-    {
-      "name": "libsqlite3_bindgen_test"
-    },
-    {
-      "name": "logger_device_test_config_log_level"
-    },
-    {
-      "name": "logger_device_test_default_init"
-    },
-    {
-      "name": "logger_device_test_env_log_level"
-    },
-    {
-      "name": "logger_device_test_multiple_init"
-    },
-    {
       "name": "logger_device_unit_tests"
     },
     {
+      "name": "logger_test_config_log_level"
+    },
+    {
+      "name": "logger_test_default_init"
+    },
+    {
+      "name": "logger_test_env_log_level"
+    },
+    {
+      "name": "logger_test_multiple_init"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
-      "name": "quiche_device_test_src_lib"
+      "name": "open_then_run_module"
     },
     {
-      "name": "serde-xml-rs_device_test_src_lib"
+      "name": "rustBinderTest"
     },
     {
-      "name": "tokio-test_device_test_src_lib"
-    },
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "tokio-test_device_test_tests_block_on"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio-test_device_test_tests_io"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio-test_device_test_tests_macros"
+      "name": "doh_unit_test"
     },
     {
-      "name": "tokio_device_test_tests__require_full"
+      "name": "keystore2_crypto_test_rust"
     },
     {
-      "name": "tokio_device_test_tests_buffered"
+      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "tokio_device_test_tests_io_async_fd"
+      "name": "keystore2_selinux_test"
     },
     {
-      "name": "tokio_device_test_tests_io_async_read"
+      "name": "keystore2_test"
     },
     {
-      "name": "tokio_device_test_tests_io_chain"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "tokio_device_test_tests_io_copy"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "tokio_device_test_tests_io_copy_bidirectional"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "tokio_device_test_tests_io_driver"
+      "name": "libapkverify.test"
     },
     {
-      "name": "tokio_device_test_tests_io_driver_drop"
+      "name": "logger_device_unit_tests"
     },
     {
-      "name": "tokio_device_test_tests_io_lines"
+      "name": "logger_test_config_log_level"
     },
     {
-      "name": "tokio_device_test_tests_io_mem_stream"
+      "name": "logger_test_default_init"
     },
     {
-      "name": "tokio_device_test_tests_io_read"
+      "name": "logger_test_env_log_level"
     },
     {
-      "name": "tokio_device_test_tests_io_read_buf"
+      "name": "logger_test_multiple_init"
     },
     {
-      "name": "tokio_device_test_tests_io_read_exact"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "tokio_device_test_tests_io_read_line"
+      "name": "open_then_run_module"
     },
     {
-      "name": "tokio_device_test_tests_io_read_to_end"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_to_string"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_until"
-    },
-    {
-      "name": "tokio_device_test_tests_io_split"
-    },
-    {
-      "name": "tokio_device_test_tests_io_take"
-    },
-    {
-      "name": "tokio_device_test_tests_io_write"
-    },
-    {
-      "name": "tokio_device_test_tests_io_write_all"
-    },
-    {
-      "name": "tokio_device_test_tests_io_write_buf"
-    },
-    {
-      "name": "tokio_device_test_tests_io_write_int"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_join"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_pin"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_select"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_test"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_try_join"
-    },
-    {
-      "name": "tokio_device_test_tests_net_bind_resource"
-    },
-    {
-      "name": "tokio_device_test_tests_net_lookup_host"
-    },
-    {
-      "name": "tokio_device_test_tests_no_rt"
-    },
-    {
-      "name": "tokio_device_test_tests_process_kill_on_drop"
-    },
-    {
-      "name": "tokio_device_test_tests_rt_basic"
-    },
-    {
-      "name": "tokio_device_test_tests_rt_common"
-    },
-    {
-      "name": "tokio_device_test_tests_rt_threaded"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_barrier"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_broadcast"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_errors"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_mpsc"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_mutex"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_mutex_owned"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_notify"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_oneshot"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_rwlock"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_semaphore"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_semaphore_owned"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_watch"
-    },
-    {
-      "name": "tokio_device_test_tests_task_abort"
-    },
-    {
-      "name": "tokio_device_test_tests_task_blocking"
-    },
-    {
-      "name": "tokio_device_test_tests_task_local"
-    },
-    {
-      "name": "tokio_device_test_tests_task_local_set"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_accept"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_connect"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_echo"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_into_split"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_into_std"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_peek"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_shutdown"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_socket"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_split"
-    },
-    {
-      "name": "tokio_device_test_tests_time_rt"
-    },
-    {
-      "name": "tokio_device_test_tests_udp"
-    },
-    {
-      "name": "tokio_device_test_tests_uds_cred"
-    },
-    {
-      "name": "tokio_device_test_tests_uds_split"
+      "name": "rustBinderTest"
     },
     {
       "name": "virtualizationservice_device_test"