Merge "msm: vidc: Add AFD and CC metadata support to extradata"