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

Change-Id: Ibaec7fe7dabb5d640b48acf0b9e5b7d2688712bd