Merge "msm: vidc: Map rate control vbr_vfr to vbr_cfr"