diff --git a/Android.bp b/Android.bp
index 2453dfe..6390eb5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,64 +37,29 @@
     ],
 }
 
-rust_defaults {
-    name: "lazy_static_test_defaults",
-    crate_name: "lazy_static",
+rust_test {
+    name: "lazy_static_test_tests_test",
     // has rustc warnings
-    srcs: ["src/lib.rs"],
+    host_supported: true,
+    crate_name: "lazy_static",
     cargo_env_compat: true,
     cargo_pkg_version: "1.4.0",
+    srcs: ["tests/test.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    edition: "2015",
-}
-
-rust_test_host {
-    name: "lazy_static_host_test_src_lib",
-    defaults: ["lazy_static_test_defaults"],
     test_options: {
         unit_test: true,
     },
-}
-
-rust_test {
-    name: "lazy_static_device_test_src_lib",
-    defaults: ["lazy_static_test_defaults"],
-}
-
-rust_defaults {
-    name: "lazy_static_test_defaults_lazy_static",
-    crate_name: "lazy_static",
-    // has rustc warnings
-    srcs: ["tests/test.rs"],
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.4.0",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
     edition: "2015",
     rustlibs: [
         "liblazy_static",
     ],
 }
 
-rust_test_host {
-    name: "lazy_static_host_test_tests_test",
-    defaults: ["lazy_static_test_defaults_lazy_static"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "lazy_static_device_test_tests_test",
-    defaults: ["lazy_static_test_defaults_lazy_static"],
-}
-
 rust_library {
     name: "liblazy_static",
     // has rustc warnings
     host_supported: true,
-    vendor_available: true,
     crate_name: "lazy_static",
     cargo_env_compat: true,
     cargo_pkg_version: "1.4.0",
@@ -107,5 +72,6 @@
         "com.android.uwb",
         "com.android.virt",
     ],
+    vendor_available: true,
     min_sdk_version: "29",
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8a6ab1e..0166f1d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,109 +1,66 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/android_logger"
+    },
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "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/jni"
+    },
+    {
+      "path": "external/rust/crates/libsqlite3-sys"
+    },
+    {
+      "path": "external/rust/crates/once_cell"
+    },
+    {
+      "path": "external/rust/crates/quiche"
+    },
+    {
+      "path": "external/rust/crates/regex"
+    },
+    {
+      "path": "external/rust/crates/shared_library"
+    },
+    {
+      "path": "external/rust/crates/tinytemplate"
+    },
+    {
+      "path": "external/rust/crates/tinyvec"
+    },
+    {
+      "path": "external/rust/crates/unicode-xid"
+    },
+    {
+      "path": "external/rust/crates/vulkano"
+    },
+    {
+      "path": "external/rust/crates/xml-rs"
+    }
+  ],
   "presubmit": [
     {
-      "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": "base64_device_test_tests_decode"
-    },
-    {
-      "name": "base64_device_test_tests_encode"
-    },
-    {
-      "name": "base64_device_test_tests_helpers"
-    },
-    {
-      "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": "doh_unit_test"
     },
     {
-      "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_km_compat_test"
     },
     {
@@ -116,10 +73,10 @@
       "name": "keystore2_test"
     },
     {
-      "name": "lazy_static_device_test_src_lib"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "lazy_static_device_test_tests_test"
+      "name": "lazy_static_test_tests_test"
     },
     {
       "name": "legacykeystore_test"
@@ -131,55 +88,87 @@
       "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": "unicode-xid_device_test_src_lib"
-    },
-    {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "open_then_run_module"
     },
     {
       "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "xml-rs_device_test_src_analyze"
+      "name": "doh_unit_test"
     },
     {
-      "name": "xml-rs_device_test_src_lib"
+      "name": "keystore2_km_compat_test"
     },
     {
-      "name": "xml-rs_device_test_tests_event_reader"
+      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "xml-rs_device_test_tests_event_writer"
+      "name": "keystore2_selinux_test"
     },
     {
-      "name": "xml-rs_device_test_tests_streaming"
+      "name": "keystore2_test"
+    },
+    {
+      "name": "keystore2_test_utils_test"
+    },
+    {
+      "name": "lazy_static_test_tests_test"
+    },
+    {
+      "name": "legacykeystore_test"
+    },
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "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": "open_then_run_module"
+    },
+    {
+      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 63c1f22..9501f3b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -11,10 +11,10 @@
   ],
   "device": true,
   "min-sdk-version": "29",
-  "vendor_available": true,
   "run": true,
   "test-blocklist": [
     "tests/no_std.rs"
   ],
-  "tests": true
-}
+  "tests": true,
+  "vendor-available": true
+}
\ No newline at end of file