Revert "Add our integration tests to cts"

This reverts commit a7351654f40cd0f6caccf1780d55d1fe2632af11.

Reason for revert: Failing google_required_freeze/test-mapping-presubmit/vendor_img_cf_x86_rvc b/218303240
Test: N/A

Change-Id: I5691376a3e8cb8d7455222f73f965a7bca01b707
diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index bc8a4a5..1aef796 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -5,16 +5,12 @@
 java_test_host {
     name: "MicrodroidHostTestCases",
     srcs: ["java/**/*.java"],
-    test_suites: [
-        "cts",
-        "general-tests",
-    ],
+    test_suites: ["general-tests"],
     libs: [
         "tradefed",
     ],
     static_libs: [
         "VirtualizationTestHelper",
     ],
-    per_testcase_directory: true,
     data: [":MicrodroidTestApp"],
 }
diff --git a/tests/hostside/AndroidTest.xml b/tests/hostside/AndroidTest.xml
index 79428ce..e8aced6 100644
--- a/tests/hostside/AndroidTest.xml
+++ b/tests/hostside/AndroidTest.xml
@@ -14,11 +14,6 @@
      limitations under the License.
 -->
 <configuration description="Tests for microdroid">
-    <option name="test-suite-tag" value="cts" />
-    <option name="config-descriptor:metadata" key="component" value="security" />
-    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
-    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
-    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="MicrodroidHostTestCases.jar" />
     </test>