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

Change-Id: I19b7d82bcc60c6942e4faa1db2ee2999a1d698a0