Merge "Revert "mm-video-v4l2: vdec: Handle pixel alignment difference in resolution""