[Android] Switch to new interfaces of GetAVDs and RestartAdbServer.

build/android/pylib/gtest/test_runner.py

Index: build/android/pylib/gtest/test_runner.py
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 51248612a1726a74da32f934d0830b88e094d676..f50c58ccf8a730fa764748f21432f0316c14dc87 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -10,7 +10,7 @@ from pylib import constants
 from pylib import pexpect
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
-from pylib.device import adb_wrapper
+from pylib.device import device_errors
 from pylib.perf import perf_control
 
 
@@ -129,7 +129,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
       # We're here because either the device went offline, or the test harness
       # crashed without outputting the CRASHED marker (crbug.com/175538).
       if not self.device.old_interface.IsOnline():
-        raise adb_wrapper.DeviceUnreachableError(
+        raise device_errors.DeviceUnreachableError(
             'Device %s went offline.' % self.device.old_interface.GetDevice())
       if full_test_name:
         results.AddResult(base_test_result.BaseTestResult(