Merge "adbd: switch the default USB implementation."
am: 5782600271

Change-Id: Idbc6eba721e06bfa4659f2aac1592f6bdf84a9a5