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