Merge "msm: vidc: Fix scratch buffer allocation." into msm-3.4