Merge "audio_channel_in_mask_from_count now handles up to 8 channels" into mnc-dev