[Android] Restore old exception types alongside new ones.

build/android/pylib/instrumentation/test_runner.py

Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index b37629a35a9aeb7c5e6d5d32225a7991c376fa69..3be22a1338a588020e76f4fcb12a24cfac9664a5 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -329,7 +329,10 @@ class TestRunner(base_test_runner.BaseTestRunner):
       return self.device.old_interface.RunInstrumentationTest(
           test, self.test_pkg.GetPackageName(),
           self._GetInstrumentationArgs(), timeout)
-    except adb_wrapper.CommandTimeoutError:
+    except (adb_wrapper.CommandTimeoutError,
+            # TODO(jbudorick) Remove this once the underlying implementations
+            #                 for the above are switched or wrapped.
+            android_commands.errors.WaitForResponseTimedOutError):
       logging.info('Ran the test with timeout of %ds.' % timeout)
       raise
 
@@ -368,8 +371,10 @@ class TestRunner(base_test_runner.BaseTestRunner):
     # See ../../third_party/android/testrunner/adb_interface.py
     except (adb_wrapper.CommandTimeoutError,
             adb_wrapper.DeviceUnreachableError,
-            # TODO(jbudorick) Remove this once the underlying implementations
+            # TODO(jbudorick) Remove these once the underlying implementations
             #                 for the above are switched or wrapped.
+            android_commands.errors.WaitForResponseTimedOutError,
+            android_commands.errors.DeviceUnresponsiveError,
             android_commands.errors.InstrumentationError), e:
       if start_date_ms:
         duration_ms = int(time.time()) * 1000 - start_date_ms