am 91a7b145: Merge "More audio_stream_type_t"

* commit '91a7b145dfc677fa511c1aea44c1ef8b09a77e96':
  More audio_stream_type_t