Merge "audio: add CHANNEL_INDEX_MASK_6 for surround sound"