Increase Android test robustness.

build/android/test_package_executable.py

Index: build/android/test_package_executable.py
diff --git a/build/android/test_package_executable.py b/build/android/test_package_executable.py
index badea4a8e70cc336711633aef93d005c8011176e..dae8408b902a174126941e3f7aa4df26f9fc1177 100644
--- a/build/android/test_package_executable.py
+++ b/build/android/test_package_executable.py
@@ -43,6 +43,7 @@ class TestPackageExecutable(TestPackage):
 
   def _GetGTestReturnCode(self):
     ret = None
+    ret_code = 1  # Assume failure if we can't find it
     ret_code_file = tempfile.NamedTemporaryFile()
     try:
       if not self.adb.Adb().Pull(
@@ -105,6 +106,9 @@ class TestPackageExecutable(TestPackage):
     cmd_helper.RunCmd(['chmod', '+x', sh_script_file.name])
     self.adb.PushIfNeeded(sh_script_file.name,
                           '/data/local/chrome_test_runner.sh')
+    logging.info('Conents of the test runner script: ')
+    for line in open(sh_script_file.name).readlines():
+      logging.info('  ' + line.rstrip())
 
   def RunTestsAndListResults(self):
     """Runs all the tests and checks for failures.