Merge "Take advantage of audio_channel_in_mask_from_count" into mnc-dev