Merge "Use audio_channel_mask_t more consistently"