Merge "Revert "msm_vidc: Add slice extradata support""