mako: Add overlay for gamma control semantics

This change will allow for gamma control heading strings to be
set on a per-device basis, mako in this instance.

Change-Id: I51507e104a9f32a2f18359fa8151e0185d1644bc
camera: Fix the flash sync issue in CAF mode

Fix the sync issue between snapshot and flash
in CAF mode.
This is still not an ideal solution, but at least
it doesn't generate black photos anymore

Change-Id: Iccb84c2a00c8b891a8c57c72aa77d970af00bbed
Merge "mako: Add overlay for gamma control semantics" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2