Merge "adbd: switch the default USB implementation." am: 5782600271 am: 269ef5d068
am: d4c49c4b44

Change-Id: I85adc4e8d270a6c71dbd0266ba330df6c37b2faf