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

Change-Id: Idf5e30a236b394fcae7072e3f10a171dc549fb86