Merge \"Merge \\\"SoundPool: fix enforced camera shutter sound\\\" into nyc-dev am: a2266f7a0f am: f638978b07\" into nyc-mr1-dev-plus-aosp
am: 984e51b4da

Change-Id: Icef781a5d53f99930e78936785ba351701f625d3