Revert of [Android] Remove android_commands uses from build/android/. (patchset #4 id:60001 of https://codereview.chromium.org/1088793002/)

Reason for revert:
Broken for AdbWrapper.Devices(filters=None)

Original issue's description:
> [Android] Remove android_commands uses from build/android/.
>
> This also adds filtering to AdbWrapper.GetDevices().
>
> BUG=267773
>
> Committed: https://crrev.com/55d1762e76ebe2494c882594c620993419d97b98
> Cr-Commit-Position: refs/heads/master@{#325254}

TBR=perezju@chromium.org,klundberg@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=267773

Review URL: https://codereview.chromium.org/1089273002

Cr-Commit-Position: refs/heads/master@{#325276}

1 files changed, 3 insertions, 5 deletions

diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py
index b6da19e..5d0fd17 100755
--- a/build/android/adb_install_apk.py
+++ b/build/android/adb_install_apk.py
@@ -10,9 +10,8 @@ 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
 
 
@@ -72,11 +71,10 @@ def main(argv):
   constants.SetBuildType(options.build_type)
   ValidateInstallAPKOption(parser, options, args)
 
-  devices = adb_wrapper.AdbWrapper.Devices(
-      filters=device_filter.DefaultFilters())
+  devices = android_commands.GetAttachedDevices()
 
   if options.device:
-    if options.device not in [d.GetDeviceSerial() for d in devices]:
+    if options.device not in devices:
       raise Exception('Error: %s not in attached devices %s' % (options.device,
                       ','.join(devices)))
     devices = [options.device]