Merge "Use audio_format_t consistently"