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

build/android/adb_install_apk.py

Index: build/android/adb_install_apk.py
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py
index 5d0fd171494090e70247d0552a4cf3d4f2bb6c33..b6da19ef2691bb8185080a42e5c59905a418cab1 100755
--- a/build/android/adb_install_apk.py
+++ b/build/android/adb_install_apk.py
@@ -10,8 +10,9 @@ import optparse
 import os
 import sys
 
-from pylib import android_commands
 from pylib import constants
+from pylib.device import adb_wrapper
+from pylib.device import device_filter
 from pylib.device import device_utils
 
 
@@ -71,10 +72,11 @@ def main(argv):
   constants.SetBuildType(options.build_type)
   ValidateInstallAPKOption(parser, options, args)
 
-  devices = android_commands.GetAttachedDevices()
+  devices = adb_wrapper.AdbWrapper.Devices(
+      filters=device_filter.DefaultFilters())
 
   if options.device:
-    if options.device not in devices:
+    if options.device not in [d.GetDeviceSerial() for d in devices]:
       raise Exception('Error: %s not in attached devices %s' % (options.device,
                       ','.join(devices)))
     devices = [options.device]