Merge "mm-camera: configure the mipi csi based on lanecount" into msm-3.0