Camera update

Merge branch cm-11.0 with
CyanogenMod/android_device_samsung_msm8960-common cm-11.0