Merge "Revert "adb: turn on libusb by default.""
am: b22067677e

Change-Id: I0fae08024b03bea8d03e9d5611575ebdba9b7e54