diff --git a/Android.bp b/Android.bp
index df9a598..80bcd09 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies --no-subdir.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -22,24 +22,28 @@
     name: "libmanaged",
     host_supported: true,
     crate_name: "managed",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.0",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.virt",
-    ],
     features: [
         "default",
         "std",
     ],
 }
 
-rust_defaults {
-    name: "managed_defaults",
+rust_test {
+    name: "managed_test_src_lib",
+    host_supported: true,
     crate_name: "managed",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.0",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     features: [
         "default",
@@ -50,16 +54,3 @@
         "-C opt-level=1",
     ],
 }
-
-rust_test_host {
-    name: "managed_host_test_src_lib",
-    defaults: ["managed_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "managed_device_test_src_lib",
-    defaults: ["managed_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index f6a57ed..f9cd6e4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,11 +1,18 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/gdbstub_arch"
+    }
+  ],
   "presubmit": [
     {
-      "name": "gdbstub_arch_device_test_src_lib"
-    },
+      "name": "managed_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "managed_device_test_src_lib"
+      "name": "managed_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..1d312fd
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,6 @@
+{
+  "device": true,
+  "no-subdir": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file