Merge "msm: vidc: fix issues raised by static analyzer"