Merge "msm_vidc: resolve video compilation errors for msm8974 mr1."