Merge 48f8641d19988395e9be5fcb793c075e90e043e4 on remote branch

Change-Id: Ic71f56b2a6534978db6158b5ae023dfb78cff480
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 525e195..08b3cb2 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -10,5 +10,16 @@
     {
       "name": "microdroid_manager_test"
     }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 5f001a6..c01fbda 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,7 @@
 {
-    "dependency-blocklist": [
-        "data_encoding"
-    ],
-    "device": true,
-    "run": true
-}
-
+  "dependency-blocklist": [
+    "data_encoding"
+  ],
+  "device": true,
+  "run": true
+}
\ No newline at end of file