Merge "msm: vidc: Add DIVX311 support" into msm-3.0