diff --git a/Android.bp b/Android.bp
index 6be0ae5..1964e14 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py.
+// This file is generated by cargo2android.py --run --dependencies --tests --host-first-multilib.
 
 rust_library_host {
     name: "libproc_macro2",
@@ -16,11 +16,32 @@
     rustlibs: [
         "libunicode_xid",
     ],
-    compile_multilib: "first", // added
+    compile_multilib: "first",
+}
+
+rust_test_host {
+    name: "proc-macro2_host_test_src_lib",
+    crate_name: "proc_macro2",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "default",
+        "proc-macro",
+    ],
+    flags: [
+        "--cfg use_proc_macro",
+        "--cfg wrap_proc_macro",
+    ],
+    rustlibs: [
+        "libquote",
+        "libunicode_xid",
+    ],
 }
 
 rust_defaults {
-    name: "proc-macro2_tests",
+    name: "proc-macro2_defaults",
     crate_name: "proc_macro2",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -41,59 +62,30 @@
 }
 
 rust_test_host {
-    name: "proc-macro2_tests_comments",
-    defaults: ["proc-macro2_tests"],
-    srcs: [
-        "tests/comments.rs",
-    ],
+    name: "proc-macro2_host_test_tests_comments",
+    defaults: ["proc-macro2_defaults"],
+    srcs: ["tests/comments.rs"],
 }
 
 rust_test_host {
-    name: "proc-macro2_tests_features",
-    defaults: ["proc-macro2_tests"],
-    srcs: [
-        "tests/features.rs",
-    ],
+    name: "proc-macro2_host_test_tests_features",
+    defaults: ["proc-macro2_defaults"],
+    srcs: ["tests/features.rs"],
 }
 
 rust_test_host {
-    name: "proc-macro2_tests_marker",
-    defaults: ["proc-macro2_tests"],
-    srcs: [
-        "tests/marker.rs",
-    ],
+    name: "proc-macro2_host_test_tests_marker",
+    defaults: ["proc-macro2_defaults"],
+    srcs: ["tests/marker.rs"],
 }
 
 rust_test_host {
-    name: "proc-macro2_tests_test",
-    defaults: ["proc-macro2_tests"],
-    srcs: [
-        "tests/test.rs",
-    ],
-}
-
-rust_test_host {
-    name: "proc-macro2_tests_proc_macro2",
-    crate_name: "proc_macro2",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    features: [
-        "default",
-        "proc-macro",
-    ],
-    flags: [
-        "--cfg use_proc_macro",
-        "--cfg wrap_proc_macro",
-    ],
-    rustlibs: [
-        "libquote",
-        "libunicode_xid",
-    ],
+    name: "proc-macro2_host_test_tests_test",
+    defaults: ["proc-macro2_defaults"],
+    srcs: ["tests/test.rs"],
 }
 
 // dependent_library ["feature_list"]
-//   proc-macro2-1.0.17
-//   quote-1.0.6
+//   proc-macro2-1.0.18
+//   quote-1.0.7
 //   unicode-xid-0.2.0 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index cd438cd..e1c840b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,27 +1,23 @@
 {
   "presubmit": [
     {
-      "name": "proc-macro2_tests_proc_macro2",
+      "name": "proc-macro2_host_test_src_lib",
       "host": true
     },
     {
-      "name": "proc-macro2_tests_comments",
+      "name": "proc-macro2_host_test_tests_comments",
       "host": true
     },
     {
-      "name": "proc-macro2_tests_features",
+      "name": "proc-macro2_host_test_tests_features",
       "host": true
     },
     {
-      "name": "proc-macro2_tests_marker",
+      "name": "proc-macro2_host_test_tests_marker",
       "host": true
     },
     {
-      "name": "proc-macro2_tests_test",
-      "host": true
-    },
-    {
-      "name": "proc-macro2_tests_marker",
+      "name": "proc-macro2_host_test_tests_test",
       "host": true
     }
   ]