Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0
tree: 301e8c5fca969e2d8b97614f90349538487b43fd
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/