Overhaul Android support and make Swarming bot use python-adb

appengine/third_party/python-adb/adb/filesync_protocol.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.
 """ADB protocol implementation.
 
 Implements the ADB protocol as seen in android's adb/adbd binaries, but only the
 host side.
 """
 
 import collections
 import stat
 import struct
 import time
 
-import libusb1
+from python_libusb1 import libusb1
 
 import adb_protocol
 import usb_exceptions
 
 # Default mode for pushed files.
 DEFAULT_PUSH_MODE = stat.S_IFREG | stat.S_IRWXU | stat.S_IRWXG
 # Maximum size of a filesync DATA packet.
 MAX_PUSH_DATA = 2*1024
 
 
@@ skipping 175 matching lines @@
   def _ReadBuffered(self, size):
     # Ensure recv buffer has enough data.
     while len(self.recv_buffer) < size:
       _, data = self.adb.ReadUntil('WRTE')
       self.recv_buffer += data
 
     result = self.recv_buffer[:size]
     self.recv_buffer = self.recv_buffer[size:]
     return result