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