Merge "adbd: switch the default USB implementation."