Make tests run for presubmit builds

Bug: 181615964
Test: watch TH
Change-Id: Idc1de5259ba270e6c025e9e30ef1dc6cdafcd6d9
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 13c68d7..69d4568 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,13 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "MicrodroidHostTestCases"
-    },
+    }
+  ],
+  "postsubmit": [
+    // TODO(jiyong): promote this to presubmit. That currently doesn't work because
+    // this test is skipped for cf_x86_64_phone (not aosp_cf_x86_64_phone), but tradefed
+    // somehow thinks that the test wasn't executed at all and reports it as a failure.
     {
       "name": "VirtualizationTestCases"
     }
diff --git a/apkdmverity/TEST_MAPPING b/apkdmverity/TEST_MAPPING
index 997b3f9..1bbec76 100644
--- a/apkdmverity/TEST_MAPPING
+++ b/apkdmverity/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit" : [
+  "presubmit" : [
     {
       "name" : "apkdmverity.test"
     }
diff --git a/authfs/TEST_MAPPING b/authfs/TEST_MAPPING
index cabd5df..d0c0b09 100644
--- a/authfs/TEST_MAPPING
+++ b/authfs/TEST_MAPPING
@@ -3,10 +3,5 @@
     {
       "name": "authfs_device_test_src_lib"
     }
-  ],
-  "postsubmit": [
-    {
-      "name": "MicrodroidHostTestCases"
-    }
   ]
 }
diff --git a/zipfuse/TEST_MAPPING b/zipfuse/TEST_MAPPING
index 5b313c1..81a8aeb 100644
--- a/zipfuse/TEST_MAPPING
+++ b/zipfuse/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit" : [
+  "presubmit" : [
     {
       "name" : "ZipFuseTest"
     }