Merge "msm: camera: Add v4l2 private ioctls" into msm-3.4