[Android] Reland of Remove android_commands and android_testrunner.

build/android/gyp/util/build_device.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ A simple device interface for build steps.
 
 """
 
 import logging
 import os
 import re
 import sys
 
 from util import build_utils
 
 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..', '..')
 sys.path.append(BUILD_ANDROID_DIR)
 
-from pylib import android_commands
+from pylib.device import adb_wrapper
 from pylib.device import device_errors
 from pylib.device import device_utils
 
-GetAttachedDevices = android_commands.GetAttachedDevices
+
+def GetAttachedDevices():
+  return [a.GetDeviceSerial()
+          for a in adb_wrapper.Devices()]
 
 
 class BuildDevice(object):
   def __init__(self, configuration):
     self.id = configuration['id']
     self.description = configuration['description']
     self.install_metadata = configuration['install_metadata']
     self.device = device_utils.DeviceUtils(self.id)
 
   def RunShellCommand(self, *args, **kwargs):
@@ skipping 65 matching lines @@
   assert len(configurations) == 1
   return BuildDevice(configurations[0])
 
 
 def GetBuildDeviceFromPath(path):
   configurations = ReadConfigurations(path)
   if len(configurations) > 0:
     return GetBuildDevice(ReadConfigurations(path))
   return None