Overhaul Android support and make Swarming bot use python-adb

appengine/third_party/python-adb/adb/common.py

 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Common code for ADB and Fastboot.
 
 Common usb browsing, and usb communication.
 """
 import logging
 import socket
 import threading
 import weakref
 
-import libusb1
-import usb1
+from python_libusb1 import libusb1
+from python_libusb1 import usb1
 
 import usb_exceptions
 
 DEFAULT_TIMEOUT_MS = 1000
 
 _LOG = logging.getLogger('android_usb')
 
 
 def GetInterface(setting):
   """Get the class, subclass, and protocol for the given USB setting."""
@@ skipping 265 matching lines @@
       return self._connection.sendall(data)
 
   def BulkRead(self, numbytes, timeout=None):
       return self._connection.recv(numbytes)
 
   def Timeout(self, timeout_ms):
       return timeout_ms
 
   def Close(self):
       return self._connection.close()