Merge "Camera: Lazy load sound files to speed up camera startup" am: 2b65dca6e1
am: 2e6ed61d17

Change-Id: I71f9628e4209264e34d523b52099e9c61111cd11