Increase Android test robustness.

build/android/test_result.py

Index: build/android/test_result.py
diff --git a/build/android/test_result.py b/build/android/test_result.py
index eb468f37e86050c0afe629eeb6ee6f041e4581f0..0c564368a133f7f4d383f4df6cb6c0e1445f7217 100644
--- a/build/android/test_result.py
+++ b/build/android/test_result.py
@@ -57,12 +57,14 @@ class TestResults(object):
     self.unknown = []
     self.disabled = []
     self.unexpected_pass = []
+    self.timed_out = False
 
   @staticmethod
-  def FromOkAndFailed(ok, failed):
+  def FromOkAndFailed(ok, failed, timed_out=False):
     ret = TestResults()
     ret.ok = ok
     ret.failed = failed
+    ret.timed_out = timed_out
     return ret
 
   @staticmethod
@@ -76,6 +78,8 @@ class TestResults(object):
       ret.unknown += t.unknown
       ret.disabled += t.disabled
       ret.unexpected_pass += t.unexpected_pass
+      if t.timed_out:
+        ret.timed_out = True
     return ret
 
   def _Log(self, sorted_list):