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

Change-Id: I1a742436986ce08235f1d6b5901afd3a33f26d2b