Merge "hal: fix for surround sound recording"