Merge "msm: vidc: Added error handling in clock data structure"