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