Merge "msm: camera: CCI driver for 8974" into msm-3.4