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

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