Add support for Junit tests in platform mode.

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 04a8f3cabaf63d2ee7d4123790cbacc50066494d..d706fd4159e5be64f549870ee532e9b05b4e301f 100644
--- a/build/android/pylib/base/test_run_factory.py
+++ b/build/android/pylib/base/test_run_factory.py
@@ -4,10 +4,13 @@
 
 from pylib.gtest import gtest_test_instance
 from pylib.instrumentation import instrumentation_test_instance
+from pylib.junit import junit_test_instance
 from pylib.local.device import local_device_environment
 from pylib.local.device import local_device_gtest_run
 from pylib.local.device import local_device_instrumentation_test_run
 from pylib.local.device import local_device_perf_test_run
+from pylib.local.machine import local_machine_environment
+from pylib.local.machine import local_machine_junit_test_run
 from pylib.perf import perf_test_instance
 
 
@@ -34,6 +37,11 @@ def CreateTestRun(args, env, test_instance, error_func):
                   perf_test_instance.PerfTestInstance):
       return _CreatePerfTestRun(args, env, test_instance)
 
+  if isinstance(env, local_machine_environment.LocalMachineEnvironment):
+    if isinstance(test_instance, junit_test_instance.JunitTestInstance):
+      return (local_machine_junit_test_run
+              .LocalMachineJunitTestRun(env, test_instance))
+
   error_func('Unable to create test run for %s tests in %s environment'
              % (str(test_instance), str(env)))