MicrodroidTestApp is a self-instrumenting test

This is a first step for making our tests to run on device.
MicrodroidTestApp now becomes a self-instrumenting test. The test
currently does nothing at the moment though.

Bug: 203483081
Test: atest MicrodroidTestApp
Change-Id: I675f622e9d014fb1bb358d4ab537dcd5377ba2ba
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 0b0810f..493fc93 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -2,12 +2,12 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-android_test_helper_app {
+android_test {
     name: "MicrodroidTestApp",
+    test_suites: ["device-tests"],
     srcs: ["src/java/**/*.java"],
-    libs: [
-        "android.system.virtualmachine",
-    ],
+    static_libs: ["androidx.test.runner"],
+    libs: ["android.system.virtualmachine"],
     jni_libs: ["MicrodroidTestNativeLib"],
     platform_apis: true,
     use_embedded_native_libs: true,