diff --git a/Android.bp b/Android.bp
index 2f8bd71..a7618e6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,12 +37,18 @@
     ],
 }
 
-rust_defaults {
-    name: "getrandom_defaults",
+rust_test {
+    name: "getrandom_test_src_lib",
+    host_supported: true,
     crate_name: "getrandom",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.3",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: ["std"],
     rustlibs: [
@@ -51,22 +57,11 @@
     ],
 }
 
-rust_test_host {
-    name: "getrandom_host_test_src_lib",
-    defaults: ["getrandom_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "getrandom_device_test_src_lib",
-    defaults: ["getrandom_defaults"],
-}
-
 rust_defaults {
-    name: "getrandom_defaults_getrandom",
+    name: "getrandom_test_defaults",
     crate_name: "getrandom",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.3",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -78,24 +73,10 @@
     ],
 }
 
-rust_test_host {
-    name: "getrandom_host_test_tests_custom",
-    defaults: ["getrandom_defaults_getrandom"],
-    srcs: ["tests/custom.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
-    name: "getrandom_device_test_tests_custom",
-    defaults: ["getrandom_defaults_getrandom"],
-    srcs: ["tests/custom.rs"],
-}
-
-rust_test_host {
-    name: "getrandom_host_test_tests_normal",
-    defaults: ["getrandom_defaults_getrandom"],
+    name: "getrandom_test_tests_normal",
+    defaults: ["getrandom_test_defaults"],
+    host_supported: true,
     srcs: ["tests/normal.rs"],
     test_options: {
         unit_test: true,
@@ -103,30 +84,21 @@
 }
 
 rust_test {
-    name: "getrandom_device_test_tests_normal",
-    defaults: ["getrandom_defaults_getrandom"],
-    srcs: ["tests/normal.rs"],
-}
-
-rust_test_host {
-    name: "getrandom_host_test_tests_rdrand",
-    defaults: ["getrandom_defaults_getrandom"],
+    name: "getrandom_test_tests_rdrand",
+    defaults: ["getrandom_test_defaults"],
+    host_supported: true,
     srcs: ["tests/rdrand.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
-rust_test {
-    name: "getrandom_device_test_tests_rdrand",
-    defaults: ["getrandom_defaults_getrandom"],
-    srcs: ["tests/rdrand.rs"],
-}
-
 rust_library {
     name: "libgetrandom",
     host_supported: true,
     crate_name: "getrandom",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.3",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: ["std"],
@@ -139,7 +111,3 @@
         "com.android.virt",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   cfg-if-1.0.0
-//   libc-0.2.97
diff --git a/TEST_MAPPING b/TEST_MAPPING
index b29c381..42e04b4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,266 +1,117 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "path": "external/rust/crates/cast"
+    },
+    {
+      "path": "external/rust/crates/crc32fast"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-deque"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-epoch"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-queue"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-utils"
+    },
+    {
+      "path": "external/rust/crates/mio"
+    },
+    {
+      "path": "external/rust/crates/quickcheck"
+    },
+    {
+      "path": "external/rust/crates/rand_chacha"
+    },
+    {
+      "path": "external/rust/crates/rand_core"
+    },
+    {
+      "path": "external/rust/crates/rand_xorshift"
+    },
+    {
+      "path": "external/rust/crates/regex"
+    },
+    {
+      "path": "external/rust/crates/ryu"
+    },
+    {
+      "path": "external/rust/crates/tokio"
+    }
+  ],
   "presubmit": [
     {
+      "name": "ZipFuseTest"
+    },
+    {
       "name": "apkdmverity.test"
     },
     {
-      "name": "base64_device_test_tests_decode"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "name": "getrandom_test_src_lib"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "name": "getrandom_test_tests_normal"
     },
     {
-      "name": "crossbeam-epoch_device_test_src_lib"
-    },
-    {
-      "name": "crossbeam-epoch_device_test_tests_loom"
-    },
-    {
-      "name": "crossbeam-utils_device_test_src_lib"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_atomic_cell"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_cache_padded"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_parker"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_sharded_lock"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_thread"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_wait_group"
-    },
-    {
-      "name": "getrandom_device_test_src_lib"
-    },
-    {
-      "name": "getrandom_device_test_tests_custom"
-    },
-    {
-      "name": "getrandom_device_test_tests_normal"
-    },
-    {
-      "name": "getrandom_device_test_tests_rdrand"
+      "name": "getrandom_test_tests_rdrand"
     },
     {
       "name": "keystore2_test"
     },
     {
+      "name": "keystore2_test_utils_test"
+    },
+    {
       "name": "legacykeystore_test"
     },
     {
-      "name": "rand_core_device_test_src_lib"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "rand_xorshift_device_test_src_lib"
-    },
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "rand_xorshift_device_test_tests_mod"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio_device_test_tests__require_full"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "tokio_device_test_tests_buffered"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_io_async_fd"
+      "name": "getrandom_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_io_async_read"
+      "name": "getrandom_test_tests_normal"
     },
     {
-      "name": "tokio_device_test_tests_io_chain"
+      "name": "getrandom_test_tests_rdrand"
     },
     {
-      "name": "tokio_device_test_tests_io_copy"
+      "name": "keystore2_test"
     },
     {
-      "name": "tokio_device_test_tests_io_copy_bidirectional"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "tokio_device_test_tests_io_driver"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "tokio_device_test_tests_io_driver_drop"
-    },
-    {
-      "name": "tokio_device_test_tests_io_lines"
-    },
-    {
-      "name": "tokio_device_test_tests_io_mem_stream"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_buf"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_exact"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_line"
-    },
-    {
-      "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": "microdroid_manager_test"
     },
     {
       "name": "virtualizationservice_device_test"