Merge "msm: camera: CSID core 2 configuration" into msm-3.0