Update from chromium https://crrev.com/301315

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 e95a5529f3aa2d0b7f5c72ee10851ec955d90139..6a7c90bcc7e4a61b9a90148b842fa545e6149fd3 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -75,9 +75,9 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
       'webview:android_webview/test/data/device_files'),
     ])
 
-VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'gpu', 'mojo', 'sync',
+VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'gpu', 'sync',
                    'telemetry_perf_unittests', 'ui', 'unit', 'webkit',
-                   'webkit_layout'])
+                   'webkit_layout', 'python_unittests'])
 
 RunCmd = bb_utils.RunCmd
 
@@ -208,20 +208,6 @@ def RunTelemetryPerfUnitTests(options):
   RunCmd(['tools/perf/run_tests'] + args)
 
 
-def RunMojoTests(options):
-  """Runs the mojo unit tests.
-
-  Args:
-    options: options object.
-  """
-  test = I('MojoTest',
-           None,
-           'org.chromium.mojo.tests',
-           'MojoTest',
-           'bindings:mojo/public/interfaces/bindings/tests/data')
-  RunInstrumentationSuite(options, test)
-
-
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
 
@@ -534,12 +520,18 @@ def RunGPUTests(options):
           EscapeBuilderName(builder_name)])
 
 
+def RunPythonUnitTests(_options):
+  for suite in constants.PYTHON_UNIT_TEST_SUITES:
+    bb_annotations.PrintNamedStep(suite)
+    RunCmd(['build/android/test_runner.py', 'python', '-s', suite])
+
+
 def GetTestStepCmds():
   return [
       ('chromedriver', RunChromeDriverTests),
       ('chrome_proxy', RunChromeProxyTests),
       ('gpu', RunGPUTests),
-      ('mojo', RunMojoTests),
+      ('python_unittests', RunPythonUnitTests),
       ('sync', RunChromeSyncShellTests),
       ('telemetry_perf_unittests', RunTelemetryPerfUnitTests),
       ('ui', RunInstrumentationTests),