Merge "Use audio_source_t consistently"