Merge "Use audio_stream_type_t consistently"