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

build/android/pylib/utils/test_environment.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import psutil
 import signal
 
 from devil.android import device_errors
 from devil.android import device_utils
@@ skipping 22 matching lines @@
 def CleanupLeftoverProcesses(devices):
   """Clean up the test environment, restarting fresh adb and HTTP daemons.
 
   Args:
     devices: The devices to clean.
   """
   _KillWebServers()
   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)