Merge "msm: camera: VFE 4.0 bring up changes" into msm-3.4