Overhaul Android support and make Swarming bot use python-adb

appengine/third_party/python-adb/PATCH.swarming

Index: appengine/third_party/python-adb/PATCH.swarming
diff --git a/appengine/third_party/python-adb/PATCH.swarming b/appengine/third_party/python-adb/PATCH.swarming
index 9b788affc1bf09b1f0f72f8ad992783fc9817d8b..63f808acf362a99c2ebaecc8d7f152ed666d1745 100644
--- a/appengine/third_party/python-adb/PATCH.swarming
+++ b/appengine/third_party/python-adb/PATCH.swarming
@@ -74,3 +74,27 @@
          if e.usb_error.value == -7:  # Timeout.
            raise usb_exceptions.DeviceAuthError(
                'Accept auth key on device, then retry.')
+--- a/adb/common.py
++++ b/adb/common.py
+@@ -20,8 +20,8 @@ import socket
+ import threading
+ import weakref
+ 
+-import libusb1
+-import usb1
++from python_libusb1 import libusb1
++from python_libusb1 import usb1
+ 
+ import usb_exceptions
+ 
+--- a/adb/filesync_protocol.py
++++ b/adb/filesync_protocol.py
+@@ -22,7 +22,7 @@ import stat
+ import struct
+ import time
+ 
+-import libusb1
++from python_libusb1 import libusb1
+ 
+ import adb_protocol
+ import usb_exceptions