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

Change-Id: I88acecb9321d4a3480622b04b5a49ae87d7aff78