Revert "camera: improve snapshot KPI"

This reverts commit 1a0e156ed8e9fb80e4fdd5160d710fe7775f0516.

Change-Id: Ie02a04f60af4d6896057890ef81fa058494605e8
Merge "Revert "camera: improve snapshot KPI"" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2