Migrate OS tests to CTSv2

bug:21762834
Change-Id: I69147dbd09d2226d15b767aaefc32e21ae564f3d
diff --git a/hostsidetests/os/AndroidTest.xml b/hostsidetests/os/AndroidTest.xml
index 6694c30..2c991cb 100644
--- a/hostsidetests/os/AndroidTest.xml
+++ b/hostsidetests/os/AndroidTest.xml
@@ -13,7 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="CTS package preparer for install/uninstall of the apk used as a test operation target">
+<configuration description="Config for the CTS os host tests">
     <include name="common-config" />
-    <option name="cts-apk-installer:test-file-name" value="CtsDeviceOsTestApp.apk" />
+    <option name="apk-installer:test-file-name" value="CtsDeviceOsTestApp.apk" />
+    <test class="com.android.tradefed.testtype.HostTest">
+        <option name="class" value="android.os.cts.OsHostTests" />
+    </test>
 </configuration>