Merge "msm: camera: Clean up camera sensor driver" into dev/msm-4.9-camx