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

build/android/tombstones.py

Index: build/android/tombstones.py
diff --git a/build/android/tombstones.py b/build/android/tombstones.py
index 1a958ac28673c9d9a7ac83adc8c64fa6f75b9f5f..3f3508631ada13a58cac2f83826cccef10fa6752 100755
--- a/build/android/tombstones.py
+++ b/build/android/tombstones.py
@@ -19,8 +19,9 @@ import subprocess
 import sys
 import optparse
 
-from pylib import android_commands
+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 run_tests_helper
 
@@ -235,14 +236,15 @@ def main():
   if options.device:
     devices = [options.device]
   else:
-    devices = android_commands.GetAttachedDevices()
+    devices = adb_wrapper.AdbWrapper.Devices(
+        filters=device_filter.DefaultFilters())
 
   # This must be done serially because strptime can hit a race condition if
   # used for the first time in a multithreaded environment.
   # http://bugs.python.org/issue7980
   tombstones = []
-  for device_serial in devices:
-    device = device_utils.DeviceUtils(device_serial)
+  for adb in devices:
+    device = device_utils.DeviceUtils(adb)
     tombstones += _GetTombstonesForDevice(device, options)
 
   _ResolveTombstones(options.jobs, tombstones)