Merge "Revert "adbd: switch the default USB implementation.""
am: c2970282cb

Change-Id: I55b9fa99642980d229623b0b1231b448b79f97b6