Merge "hal: Sound card detection changes"