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

Change-Id: I8e79a3f627ec38c736decdca2c88b56a4f5b5452