Revert of [Android] Clean up old_interface in build/android/.

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 pylib.device import device_errors
 from pylib.device import device_utils
@@ skipping 16 matching lines @@
       try:
         p.wait(1)
       except Exception as e:
         logging.warning('Failed waiting for %s to die. %s', p.pid, e)
 
 
 def CleanupLeftoverProcesses():
   """Clean up the test environment, restarting fresh adb and HTTP daemons."""
   _KillWebServers()
   device_utils.RestartServer()
+  p = device_utils.DeviceUtils.parallel()
+  p.old_interface.RestartAdbdOnDevice()
+  try:
+    p.EnableRoot()
+  except device_errors.CommandFailedError as e:
+    # TODO(jbudorick) Handle this exception appropriately after interface
+    #                 conversions are finished.
+    logging.error(str(e))
+  p.WaitUntilFullyBooted()
 
-  def cleanup_device(d):
-    d.RestartAdbd()
-    try:
-      d.EnableRoot()
-    except device_errors.CommandFailedError as e:
-      logging.error(str(e))
-    d.WaitUntilFullyBooted()
-
-  device_utils.DeviceUtils.parallel().pMap(cleanup_device)
-