am a21d5d2c: am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1

* commit 'a21d5d2c53a37e4f20716cbb5e5d1944b8a3f7df':
  Move Camera.Sound to a stand-alone class CameraSound.