Merge "msm: camera: context: add name to cam_context for debug" into dev/msm-4.9-camx