Merge "vpxdec: normalize frame size types"