Add telemetry tests to Android tester.

build/android/buildbot/bb_device_steps.py

Index: build/android/buildbot/bb_device_steps.py
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index c6e5f268128b24a8b473683e95a5ab05dd204ac4..175cb16dfca907eb48dc8739a5518c5f27a46650 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -77,7 +77,8 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
       'webview:android_webview/test/data/device_files'),
     ])
 
-VALID_TESTS = set(['chromedriver', 'gpu', 'ui', 'unit', 'webkit',
+VALID_TESTS = set(['chromedriver', 'gpu', 'telemetry_perf_unittests',
+                   'telemetry_unittests', 'ui', 'unit', 'webkit',
                    'webkit_layout', 'webrtc_chromium', 'webrtc_native'])
 
 RunCmd = bb_utils.RunCmd
@@ -164,6 +165,28 @@ def RunChromeDriverTests(options):
           '--update-log'])
 
 
+def RunTelemetryUnitTests(_):
+  """Runs the telemetry unit tests.
+
+  Args:
+    options: options object.
+  """
+  args = ['--browser', 'android-chromium-testshell']
+  bb_annotations.PrintNamedStep('telemetry_unittests')
+  RunCmd(['tools/telemetry/run_tests'] + args)
+
+
+def RunTelemetryPerfUnitTests(_):
+  """Runs the telemetry perf unit tests.
+
+  Args:
+    options: options object.
+  """
+  args = ['--browser', 'android-chromium-testshell']
+  bb_annotations.PrintNamedStep('telemetry_perf_unittests')
+  RunCmd(['tools/perf/run_tests'] + args)
+
+
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
 
@@ -481,6 +504,8 @@ def GetTestStepCmds():
   return [
       ('chromedriver', RunChromeDriverTests),
       ('gpu', RunGPUTests),
+      ('telemetry_perf_unittests', RunTelemetryPerfUnitTests),
+      ('telemetry_unittests', RunTelemetryUnitTests),
       ('unit', RunUnitTests),
       ('ui', RunInstrumentationTests),
       ('webkit', RunWebkitTests),