Merge "Revert ""msm: vidc: Use aligned width and height while calculating load"""