Merge "msm: vidc: update proper variable when setting entropy parameter."