Revert of [Android] Add --blacklist-file as a command-line option.

build/android/pylib/utils/emulator.py

Index: build/android/pylib/utils/emulator.py
diff --git a/build/android/pylib/utils/emulator.py b/build/android/pylib/utils/emulator.py
index c614d0d3d8100e74e6d85e9b835cf3c880a5ad28..cc07e6139d7f51bcd0f63cad9dccc09cdc2c57db 100644
--- a/build/android/pylib/utils/emulator.py
+++ b/build/android/pylib/utils/emulator.py
@@ -18,7 +18,6 @@
 from pylib import cmd_helper
 from pylib import constants
 from pylib import pexpect
-from pylib.device import adb_wrapper
 from pylib.device import device_errors
 from pylib.device import device_utils
 from pylib.utils import time_profile
@@ -90,16 +89,16 @@
   running but a device slot is taken.  A little bot trouble and we're out of
   room forever.
   """
-  emulators = [device_utils.DeviceUtils(a)
-               for a in adb_wrapper.AdbWrapper.Devices()
-               if a.is_emulator]
+  emulators = [d for d in device_utils.DeviceUtils.HealthyDevices()
+               if d.adb.is_emulator]
   if not emulators:
     return
   for e in emulators:
     e.adb.Emu(['kill'])
   logging.info('Emulator killing is async; give a few seconds for all to die.')
   for _ in range(5):
-    if not any(a.is_emulator for a in adb_wrapper.AdbWrapper.Devices()):
+    if not any(d.adb.is_emulator for d
+               in device_utils.DeviceUtils.HealthyDevices()):
       return
     time.sleep(1)
 
@@ -143,9 +142,8 @@
 def _GetAvailablePort():
   """Returns an available TCP port for the console."""
   used_ports = []
-  emulators = [device_utils.DeviceUtils(a)
-               for a in adb_wrapper.AdbWrapper.Devices()
-               if a.is_emulator]
+  emulators = [d for d in device_utils.DeviceUtils.HealthyDevices()
+               if d.adb.is_emulator]
   for emulator in emulators:
     used_ports.append(emulator.adb.GetDeviceSerial().split('-')[1])
   for port in PortPool.port_range():