Run APK tests on the android_test trybot.

build/android/run_tests.py

Index: build/android/run_tests.py
diff --git a/build/android/run_tests.py b/build/android/run_tests.py
index 6f59cb27caf25b304d6609c2eca5950f51bdaa57..f059a24a28951d8875392cb0f8691e548e35331e 100755
--- a/build/android/run_tests.py
+++ b/build/android/run_tests.py
@@ -76,6 +76,13 @@ _TEST_SUITES = ['base_unittests',
                 'ui_unittests',
                ]
 
+# Test suites which are build as an APK. This will be replaced by the default
+# list when we start building all suites as APK.
+_APK_TEST_SUITES = ['replaceme',  # Test the template apk too.
+                    'base_unittests',
+                    'ipc_tests',
+                    'ui_unittests',
+                   ]
 
 def FullyQualifiedTestSuites(apk):
   """Return a fully qualified list that represents all known suites.
@@ -86,11 +93,11 @@ def FullyQualifiedTestSuites(apk):
   test_suite_dir = os.path.abspath(os.path.join(run_tests_helper.CHROME_DIR,
                                                 'out', 'Release'))
   if apk:
-    # out/Release/$SUITE_apk/ChromeNativeTests-debug.apk
+    # out/Release/$SUITE_apk/$SUITE-debug.apk
     suites = [os.path.join(test_suite_dir,
                            t + '_apk',
-                           'ChromeNativeTests-debug.apk')
-              for t in _TEST_SUITES]
+                           t + '-debug.apk')
+              for t in _APK_TEST_SUITES]
   else:
     suites = [os.path.join(test_suite_dir, t) for t in _TEST_SUITES]
   return suites