Merge "avc/hevc: Align 128 everywhere"