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

Change-Id: I70c93faf116d9acdaf9852d286ecc64e87ecc05c