Merge "More audio_stream_type_t"