Separate CTS/VTS/general tests into different modules

Bug: 381987880
Bug: 380801348
Test: run MicrodroidTestApp.CTS and check avfIsRequired is not run
run MicrodroidTestApp.VTS and check avfIsRequired ran

Change-Id: Idfc956a95f3de6a59d526804cba1f7705c9dacfd
diff --git a/tests/testapk/AndroidTest.xml b/tests/testapk/AndroidTest.xml
index e490da4..221c25c 100644
--- a/tests/testapk/AndroidTest.xml
+++ b/tests/testapk/AndroidTest.xml
@@ -43,4 +43,6 @@
     <!-- Controller that will skip the module if a native bridge situation is detected -->
     <!-- For example: module wants to run arm and device is x86 -->
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.NativeBridgeModuleController" />
+
+    <!-- PLACEHOLDER_FOR_ANNOTATION -->
 </configuration>