Update from https://crrev.com/311346

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 c8e0582034a500bf7c9a759967aa2fb2885a7b18..3f00caaceb4d628cb5d0712c55fa6b7be416add1 100644
--- a/build/android/pylib/base/test_run_factory.py
+++ b/build/android/pylib/base/test_run_factory.py
@@ -4,7 +4,9 @@
 
 from pylib.gtest import gtest_test_instance
 from pylib.gtest import local_device_gtest_run
+from pylib.instrumentation import instrumentation_test_instance
 from pylib.local.device import local_device_environment
+from pylib.local.device import local_device_instrumentation_test_run
 from pylib.remote.device import remote_device_environment
 from pylib.remote.device import remote_device_gtest_run
 from pylib.remote.device import remote_device_uirobot_run
@@ -15,16 +17,19 @@ def CreateTestRun(_args, env, test_instance, error_func):
   if isinstance(env, local_device_environment.LocalDeviceEnvironment):
     if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
       return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance)
+    if isinstance(test_instance,
+                  instrumentation_test_instance.InstrumentationTestInstance):
+      return (local_device_instrumentation_test_run
+              .LocalDeviceInstrumentationTestRun(env, test_instance))
 
   if isinstance(env, remote_device_environment.RemoteDeviceEnvironment):
     if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
       return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance)
+    # TODO(rnephew): Add remote_device instrumentation test runs.
     if isinstance(test_instance, uirobot_test_instance.UirobotTestInstance):
       return remote_device_uirobot_run.RemoteDeviceUirobotRun(
           env, test_instance)
 
-  # TODO(jbudorick): Add local instrumentation test runs.
-  # TODO(rnephew): Add remote_device instrumentation test runs.
 
   error_func('Unable to create test run for %s tests in %s environment'
              % (str(test_instance), str(env)))