Add AMP support to test runner.

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 fd74b960bef005c90d875b234cf7f5c0928556fc..1343cfd68627d49a444ae7c1ef23fd2975376022 100644
--- a/build/android/pylib/base/test_instance_factory.py
+++ b/build/android/pylib/base/test_instance_factory.py
@@ -2,10 +2,16 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from pylib import constants
+from pylib.gtest import gtest_test_instance
+from pylib.uirobot import uirobot_test_instance
+from pylib.utils import isolator
 
-def CreateTestInstance(_command, _options, error_func):
-
-  # TODO(jbudorick) Add gtest test instance.
+def CreateTestInstance(command, options, error_func):
+  if command == 'gtest':
+    return gtest_test_instance.GtestTestInstance(
+        options, isolator.Isolator(constants.ISOLATE_DEPS_DIR))
+  if command == 'uirobot':
+    return uirobot_test_instance.UirobotTestInstance(options)
   # TODO(jbudorick) Add instrumentation test instance.
-  error_func('No test instances currently supported.')
-
+  error_func('Unable to create %s test instance.' % command)