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

Change-Id: I6ae2457bd8bd9f53b35373fb1be7eb66f80f1510