Merge "msm: camera: Front camera fixes for 8974" into msm-3.4