Merge "msm: vidc: Remove duplicate header files" into msm-3.0