Add rust_test and update TEST_MAPPING am: 7062658fd0 am: deb3b8ef51 am: a3532cd1cd am: ca7e6fe2ae

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-utils/+/1365106

Change-Id: I2ddfab3d0e1a5bbc0aa3133cfedb3d5438b9b303
diff --git a/Android.bp b/Android.bp
index 6c0e772..dcef607 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --test --dependencies.
+// This file is generated by cargo2android.py --run --device --tests --dependencies.
 
 rust_library {
     name: "libpin_utils",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 86a462b..5c54778 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,25 +1,26 @@
+// Generated by cargo2android.py for tests in Android.bp
 {
   "presubmit": [
     {
-      "name": "pin-utils_device_test_tests_projection"
-    },
-    {
-      "name": "pin-utils_host_test_tests_projection",
-      "host": true
-    },
-    {
-      "name": "pin-utils_device_test_tests_stack_pin"
-    },
-    {
-      "name": "pin-utils_host_test_tests_stack_pin",
+      "name": "pin-utils_host_test_src_lib",
       "host": true
     },
     {
       "name": "pin-utils_device_test_src_lib"
     },
     {
-      "name": "pin-utils_host_test_src_lib",
+      "name": "pin-utils_host_test_tests_projection",
       "host": true
+    },
+    {
+      "name": "pin-utils_device_test_tests_projection"
+    },
+    {
+      "name": "pin-utils_host_test_tests_stack_pin",
+      "host": true
+    },
+    {
+      "name": "pin-utils_device_test_tests_stack_pin"
     }
   ]
 }