Merge "Revert "Add support for USB audio docks.""