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

Change-Id: I479f1de000ad2c9732550e0dc78a23ece811ff16