am 2d1ef137: Merge "Camera2: Play shutter and recording sounds." into jb-mr1-dev

* commit '2d1ef1371db8b202b693f1657f56824f9af8d565':
  Camera2: Play shutter and recording sounds.