[Android] Attempt to continue after single-device failure in cleanup_device.

build/android/pylib/utils/test_environment.py

Index: build/android/pylib/utils/test_environment.py
diff --git a/build/android/pylib/utils/test_environment.py b/build/android/pylib/utils/test_environment.py
index 0a1326e7cb936f65a185725062e033c7e48c2058..732140c33b334efc51b423199420e6a1ca8de2bd 100644
--- a/build/android/pylib/utils/test_environment.py
+++ b/build/android/pylib/utils/test_environment.py
@@ -40,13 +40,13 @@ def CleanupLeftoverProcesses(devices):
   device_utils.RestartServer()
 
   def cleanup_device(d):
-    d.WaitUntilFullyBooted()
-    d.RestartAdbd()
     try:
+      d.WaitUntilFullyBooted()
+      d.RestartAdbd()
       d.EnableRoot()
+      d.WaitUntilFullyBooted()
     except device_errors.CommandFailedError:
-      logging.exception('Failed to enable root')
-    d.WaitUntilFullyBooted()
+      logging.exception('Failed to clean up device. Attempting to continue.')
 
   device_utils.DeviceUtils.parallel(devices).pMap(cleanup_device)