Mako: Update torch overlays

The config in settings is deprecated - move it to framework

Change-Id: I1e0312b66bc4dc9b5c7189b7e7c191c53d5475a9
Revert "camera: Fix the flash sync issue in CAF mode"

This reverts commit 0be4d675df0654f1b55f0f516893b8cc6f696f56.
Can lead to freeze/reboot if flash ON
and not touching to Focus

Change-Id: Ia7b556dabde2f515c9f99abd408e9f7359f44cd1
Merge remote-tracking branch 'cm/cm-10.2' into HEAD