Merge "msm: camera: Correct the IOCTL numbers." into msm-3.0