am 3c6b9cca: Merge "Use audio_stream_type_t consistently"

* commit '3c6b9cca79c872427599a325bcbb5d4a00113d80':
  Use audio_stream_type_t consistently