Merge "msm: vidc: Update the MACRO definitions"