[Android] Implement instrumentation tests in platform mode.

build/android/pylib/base/test_instance_factory.py

Index: build/android/pylib/base/test_instance_factory.py
diff --git a/build/android/pylib/base/test_instance_factory.py b/build/android/pylib/base/test_instance_factory.py
index 6fd3ca9b74ac8471ae91d8b2c4dafe4125b0bff1..2ba469c383356eca8f6fa453d2235f6f7a83dc7b 100644
--- a/build/android/pylib/base/test_instance_factory.py
+++ b/build/android/pylib/base/test_instance_factory.py
@@ -4,6 +4,7 @@
 
 from pylib import constants
 from pylib.gtest import gtest_test_instance
+from pylib.instrumentation import instrumentation_test_instance
 from pylib.utils import isolator
 from pylib.uirobot import uirobot_test_instance
 
@@ -14,8 +15,11 @@ def CreateTestInstance(args, error_func):
   if args.command == 'gtest':
     return gtest_test_instance.GtestTestInstance(
         args, isolator.Isolator(constants.ISOLATE_DEPS_DIR), error_func)
-  if args.command == 'uirobot':
+  elif args.command == 'instrumentation':
+    return instrumentation_test_instance.InstrumentationTestInstance(
+        args, isolator.Isolator(constants.ISOLATE_DEPS_DIR), error_func)
+  elif args.command == 'uirobot':
     return uirobot_test_instance.UirobotTestInstance(args)
-  # TODO(jbudorick) Add instrumentation test instance.
+
 
   error_func('Unable to create %s test instance.' % args.command)