Merge "msm: camera: icp: Fix the buffer overflow" into dev/msm-4.9-camx