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

Change-Id: Ib25af848035f9bf1376c3c48506d9c5f882a9cb5