Merge "Use audio_stream_type_t consistently"
tree: f279f37a12104778bdf7fa912e2205dd0c339f6e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/