Merge "msm: vidc: Clean-up duplicate code" into msm-4.9