Merge "Revert "hal: fix no sound issue when using some USB headset.""