Add support for cc_perftests and other non-telemetry gtest based tests.

scripts/slave/recipes/android/perf.py

Index: scripts/slave/recipes/android/perf.py
diff --git a/scripts/slave/recipes/android/perf.py b/scripts/slave/recipes/android/perf.py
index 63a5eec3b6e916fd3c14072633925bc20190c541..33c062da2f6cf5b4e2eb4877f17fe66d16509f87 100644
--- a/scripts/slave/recipes/android/perf.py
+++ b/scripts/slave/recipes/android/perf.py
@@ -129,13 +129,16 @@ def GenSteps(api):
       browser='android-chrome-shell',
       num_shards=builder['num_device_shards'],
       devices=api.chromium_android.devices[0:1]).json.output
-
+  perf_gtests = api.chromium.list_gtest_perf_tests(
+      api.properties['buildername']).json.output
   try:
     api.chromium_android.run_sharded_perf_tests(
       config=api.json.input(data=perf_tests),
       perf_id=builder['perf_id'],
       chartjson_file=True)
-
+    api.chromium_android.run_other_gtests(
+      perf_gtests,
+      perf_id=builder['perf_id'])
   finally:
     api.chromium_android.common_tests_final_steps()
 
@@ -162,13 +165,31 @@ def GenTests(api):
   yield (api.test('provision_devices') +
       api.properties.generic(
           repo_name='src',
-              repo_url=REPO_URL,
-              mastername='chromium.perf',
-              buildername='Android Nexus5 Perf',
-              parent_buildername='parent_buildername',
-              parent_buildnumber='1729',
-              parent_revision='deadbeef',
-              revision='deadbeef',
-              slavename='slavename',
-              target='Release')
+          repo_url=REPO_URL,
+          mastername='chromium.perf',
+          buildername='Android Nexus5 Perf',
+          parent_buildername='parent_buildername',
+          parent_buildnumber='1729',
+          parent_revision='deadbeef',
+          revision='deadbeef',
+          slavename='slavename',
+          target='Release')
       + api.step_data('provision_devices', retcode=1))
+
+  yield (
+    api.test('gtest_failure') +
+    api.properties.generic(repo_name='src',
+                           repo_url=REPO_URL,
+                           mastername='chromium.perf',
+                           buildername='Android Nexus5 Perf',
+                           parent_buildername='Linux parent_buildername',
+                           parent_buildnumber='1729',
+                           parent_revision='deadbeef',
+                           revision='deadbeef',
+                           slavename='slavename',
+                           target='Release') +
+    api.override_step_data(
+        'cc_perftests',
+        api.json.output([]),
+        retcode=1)
+  )