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

* commit '6039c1e34245711baab6c4c3e06da0e4d9d632ae':
  Camera2: Play shutter and recording sounds.