am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1

* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
  Switch camera sounds to always use the system enforced audio stream.
tree: da9649b4ca178078ae86b4ef85e6b0c937086949
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/