Merge "msm: vidc: include msm-specific ion header" into msm-3.4