Merge "msm: vidc: Add support for DIVX 4/5/6" into msm-3.0