[Android] Remove android_commands uses from build/android/. (reland)

build/android/pylib/local/device/local_device_environment.py

Index: build/android/pylib/local/device/local_device_environment.py
diff --git a/build/android/pylib/local/device/local_device_environment.py b/build/android/pylib/local/device/local_device_environment.py
index 72acb6e2ec44e71ce1922b88225888035123a68d..8346762371c03883cdac138ab17a7ae6b754d053 100644
--- a/build/android/pylib/local/device/local_device_environment.py
+++ b/build/android/pylib/local/device/local_device_environment.py
@@ -5,6 +5,7 @@
 from pylib.base import environment
 from pylib.device import adb_wrapper
 from pylib.device import device_errors
+from pylib.device import device_filter
 from pylib.device import device_utils
 from pylib.utils import parallelizer
 
@@ -20,8 +21,8 @@ class LocalDeviceEnvironment(environment.Environment):
 
   #override
   def SetUp(self):
-    # TODO(jbudorick): This can be refined to support filters etc.
-    available_devices = adb_wrapper.AdbWrapper.GetDevices()
+    available_devices = adb_wrapper.AdbWrapper.Devices(
+        filters=device_filter.DefaultFilters())
     if not available_devices:
       raise device_errors.NoDevicesError
     if self._device: