Increase Android test robustness.

build/android/test_package.py

Index: build/android/test_package.py
diff --git a/build/android/test_package.py b/build/android/test_package.py
index 433e7f182a86f46eaa914c44cab4b4c2ccffbd44..16b834c6821d475af618dc4ee7e00801c603c950 100644
--- a/build/android/test_package.py
+++ b/build/android/test_package.py
@@ -128,6 +128,7 @@ class TestPackage(object):
     """
     ok_tests = []
     failed_tests = []
+    timed_out = False
     re_run = re.compile('\[ RUN      \] ?(.*)\r\n')
     re_fail = re.compile('\[  FAILED  \] ?(.*)\r\n')
     re_ok = re.compile('\[       OK \] ?(.*)\r\n')
@@ -152,6 +153,7 @@ class TestPackage(object):
         if found == 3:  # pexpect.TIMEOUT
           logging.error('Test terminated after %d second timeout.',
                         self.timeout)
+          timed_out = True
         break
     p.close()
     if not self.rebaseline and ready_to_continue:
@@ -163,4 +165,4 @@ class TestPackage(object):
                                         '\npexpect.after: %s'
                                         % (p.before,
                                            p.after))]
-    return TestResults.FromOkAndFailed(ok_tests, failed_tests)
+    return TestResults.FromOkAndFailed(ok_tests, failed_tests, timed_out)