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

Change-Id: I398b7d627745e140263cca4e2835d4ef7bd03f1f