Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev
am: a2266f7a0f

Change-Id: Ibb406207b55a532fdb42a68d0787b851deec8d05