Merge "msm: vidc: Fix scratch1 size calculation for HEVC & VP9"