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