Merge "adb: silence warning from libusb." am: ee5083b3c7
am: 4a749cc3f1

Change-Id: Ic2ab02abe3b2d1f001ee52c9ced9c0cb4db1e129