Merge "msm: camera: icp: Adapt driver to common logging mechanism" into dev/msm-4.9-camx