Relands test_runner.py, updates buildbot scripts

build/android/pylib/gtest/test_package_apk.py

Index: build/android/pylib/gtest/test_package_apk.py
diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py
index 8b9badb3a0aa43dd90d5b123537d487de0dd3703..540ef83f1a2415b6e96ac19c89c95a527dc1211e 100644
--- a/build/android/pylib/gtest/test_package_apk.py
+++ b/build/android/pylib/gtest/test_package_apk.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+"""Defines TestPackageApk to help run APK-based native tests."""
 
 import logging
 import os
@@ -96,7 +97,7 @@ class TestPackageApk(TestPackage):
       self._StartActivity()
       # Wait for native test to complete.
       p = self._WatchFifo(timeout=30 * self.tool.GetTimeoutScale())
-      p.expect("<<ScopedMainEntryLogger")
+      p.expect('<<ScopedMainEntryLogger')
       p.close()
     finally:
       self.tool.CleanUpEnvironment()
@@ -105,8 +106,8 @@ class TestPackageApk(TestPackage):
     ret = self._ParseGTestListTests(content)
     return ret
 
-  def CreateTestRunnerScript(self, gtest_filter, test_arguments):
-    self._CreateTestRunnerScript('--gtest_filter=%s %s' % (gtest_filter,
+  def CreateTestRunnerScript(self, test_filter, test_arguments):
+    self._CreateTestRunnerScript('--gtest_filter=%s %s' % (test_filter,
                                                            test_arguments))
 
   def RunTestsAndListResults(self):