Snap for 7785160 from afd8dd4f717f736e44c1ec81c5032b5e6e9f4cf8 to t-keystone-qcom-release

Change-Id: I67c03759076f3fa115b0bdc1c0cf35b5894d21d0
diff --git a/Android.bp b/Android.bp
index c0d3722..dad6f38 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,7 +74,6 @@
     name: "apf_run_test",
     src: "apf_run_test.sh",
     filename: "apf_run_test.sh",
-    test_suites: ["general-tests"],
     test_config: "apf_run_test.xml",
     data: ["testdata/*"],
     data_bins: ["apf_run"],
@@ -86,4 +85,7 @@
             enabled: false,
         },
     },
+    test_options: {
+        unit_test: true,
+    },
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 564bf92..f590b05 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,7 +1,5 @@
 {
     "presubmit": [
-        { "name": "NetworkStackTests" },
-        { "name": "apf_run_test",
-          "host": true }
+        { "name": "NetworkStackTests" }
     ]
 }