Merge "Regenerate the ART MTS definition to include more Libcore tests."
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-02.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-02.xml
index e32e4f7..5429ea8 100644
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-02.xml
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-02.xml
@@ -16,9 +16,15 @@
 -->
 <configuration description="List of ART MTS tests that do not need root access (shard 02)">
     <!-- CTS Libcore OJ tests. -->
-    <option name="compatibility:include-filter" value="CtsLibcoreOjTestCases"/>
+    <option name="compatibility:include-filter" value="CtsLibcoreApiEvolutionTestCases"/>
+    <option name="compatibility:include-filter" value="CtsLibcoreFileIOTestCases"/>
     <option name="compatibility:include-filter" value="CtsLibcoreJsr166TestCases"/>
+    <option name="compatibility:include-filter" value="CtsLibcoreLegacy22TestCases"/>
+    <option name="compatibility:include-filter" value="CtsLibcoreOjTestCases"/>
     <!-- Enable MainlineTestModuleController for CTS Libcore OJ tests. -->
-    <option name="compatibility:module-arg" value="CtsLibcoreOjTestCases:enable:true"/>
+    <option name="compatibility:module-arg" value="CtsLibcoreApiEvolutionTestCases:enable:true"/>
+    <option name="compatibility:module-arg" value="CtsLibcoreFileIOTestCases:enable:true"/>
     <option name="compatibility:module-arg" value="CtsLibcoreJsr166TestCases:enable:true"/>
+    <option name="compatibility:module-arg" value="CtsLibcoreLegacy22TestCases:enable:true"/>
+    <option name="compatibility:module-arg" value="CtsLibcoreOjTestCases:enable:true"/>
 </configuration>