Update from https://crrev.com/308331

build/android/pylib/base/test_run_factory.py

Index: build/android/pylib/base/test_run_factory.py
diff --git a/build/android/pylib/base/test_run_factory.py b/build/android/pylib/base/test_run_factory.py
index 6ccfb37ec95afb146d4fb57072b551440f617da4..550b4cf1df8f7f08b3ec143bf6da0d614cb6dfb7 100644
--- a/build/android/pylib/base/test_run_factory.py
+++ b/build/android/pylib/base/test_run_factory.py
@@ -2,9 +2,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-def CreateTestRun(_args, _env, _test_instance, error_func):
+from pylib.remote.device import remote_device_gtest_run
+from pylib.remote.device import remote_device_uirobot_run
 
+def CreateTestRun(args, env, test_instance, error_func):
+  if args.environment == 'remote_device':
+      if test_instance.TestType() == 'gtest':
+        return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance)
+      if test_instance.TestType() == 'uirobot':
+        return remote_device_uirobot_run.RemoteDeviceUirobotRun(
+            env, test_instance)
   # TODO(jbudorick) Add local gtest test runs
   # TODO(jbudorick) Add local instrumentation test runs.
-  error_func('No test runs are currently supported.')
-
+  error_func('Unable to create %s test run in %s environment' % (
+      test_instance.TestType(), args.environment))