Merge "audio: Fix and enhance channel mask enums"