Merge "adb: turn on libusb by default." am: 817b2f3b2c
am: ef501512fa

Change-Id: If47ca0f1e6d09ff3dc9481f9cd68e6ff315f7781