Merge "msm: camera: Return the correct  pointer" into dev/msm-4.9-camx