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, 19 insertions, 23 deletions

diff --git a/build/android/enable_asserts.py b/build/android/enable_asserts.py
index 8fb7dca..0e30bc2 100755
--- a/build/android/enable_asserts.py
+++ b/build/android/enable_asserts.py
@@ -6,37 +6,33 @@
 
 """Enables dalvik vm asserts in the android device."""
 
-import argparse
-import sys
-
+from pylib import android_commands
 from pylib.device import device_utils
+import optparse
+import sys
 
 
-def main():
-  parser = argparse.ArgumentParser()
-
-  set_asserts_group = parser.add_mutually_exclusive_group(required=True)
-  set_asserts_group.add_argument(
-      '--enable_asserts', dest='set_asserts', action='store_true',
+def main(argv):
+  option_parser = optparse.OptionParser()
+  option_parser.add_option('--enable_asserts', dest='set_asserts',
+      action='store_true', default=None,
       help='Sets the dalvik.vm.enableassertions property to "all"')
-  set_asserts_group.add_argument(
-      '--disable_asserts', dest='set_asserts', action='store_false',
+  option_parser.add_option('--disable_asserts', dest='set_asserts',
+      action='store_false', default=None,
       help='Removes the dalvik.vm.enableassertions property')
-
-  args = parser.parse_args()
+  options, _ = option_parser.parse_args(argv)
 
   # TODO(jbudorick): Accept optional serial number and run only for the
   # specified device when present.
-  devices = device_utils.DeviceUtils.parallel()
-
-  def set_java_asserts_and_restart(device):
-    if device.SetJavaAsserts(args.set_asserts):
-      device.RunShellCommand('stop')
-      device.RunShellCommand('start')
-
-  devices.pMap(set_java_asserts_and_restart)
-  return 0
+  devices = android_commands.GetAttachedDevices()
+  for device in [device_utils.DeviceUtils(serial) for serial in devices]:
+    if options.set_asserts != None:
+      if device.SetJavaAsserts(options.set_asserts):
+        # TODO(jbudorick) How to best do shell restarts after the
+        #                 android_commands refactor?
+        device.RunShellCommand('stop')
+        device.RunShellCommand('start')
 
 
 if __name__ == '__main__':
-  sys.exit(main())
+  main(sys.argv)