Merge branch 'cm-10.2' into cm-10.2_LTE
Merge branch 'cm-10.2_LTE' into cm-10.2_LTE-test
Revert "Revert "camera: Fix the flash sync issue in CAF mode""

This reverts commit c0485225c8caa430e3d6f15ef0bc22d6b031246b.

Rather have working flash for now until a better fix is found.