Merge "msm: camera: Device tree changes in msm sensor" into msm-3.4