Merge "msm: camera: Sensors changes for 8974" into msm-3.4