[android] Make build_type a singleton.

build/android/pylib/host_driven/test_runner.py

Index: build/android/pylib/host_driven/test_runner.py
diff --git a/build/android/pylib/host_driven/test_runner.py b/build/android/pylib/host_driven/test_runner.py
index 9a9acdd53a249cfc5a3b46879c94173a69719cf0..53fd70f3dae1c56672559a1370dc0a38e5f5fc10 100644
--- a/build/android/pylib/host_driven/test_runner.py
+++ b/build/android/pylib/host_driven/test_runner.py
@@ -49,7 +49,7 @@ class HostDrivenTestRunner(base_test_runner.BaseTestRunner):
   """
 
   #override
-  def __init__(self, device, shard_index, tool, build_type, push_deps,
+  def __init__(self, device, shard_index, tool, push_deps,
                cleanup_test_files):
     """Creates a new HostDrivenTestRunner.
 
@@ -57,13 +57,12 @@ class HostDrivenTestRunner(base_test_runner.BaseTestRunner):
       device: Attached android device.
       shard_index: Shard index.
       tool: Name of the Valgrind tool.
-      build_type: 'Release' or 'Debug'.
       push_deps: If True, push all dependencies to the device.
       cleanup_test_files: Whether or not to cleanup test files on device.
     """
 
-    super(HostDrivenTestRunner, self).__init__(device, tool, build_type,
-                                               push_deps, cleanup_test_files)
+    super(HostDrivenTestRunner, self).__init__(device, tool, push_deps,
+                                               cleanup_test_files)
 
     # The shard index affords the ability to create unique port numbers (e.g.
     # DEFAULT_PORT + shard_index) if the test so wishes.
@@ -87,8 +86,8 @@ class HostDrivenTestRunner(base_test_runner.BaseTestRunner):
     exception_raised = False
 
     try:
-      test.SetUp(self.device, self.shard_index, self.build_type,
-                 self._push_deps, self._cleanup_test_files)
+      test.SetUp(self.device, self.shard_index, self._push_deps,
+                 self._cleanup_test_files)
     except Exception:
       logging.exception(
           'Caught exception while trying to run SetUp() for test: ' +