Merge "msm: camera: icp: hfi compatibility fix" into dev/msm-4.9-camx