Merge "vpx_integer.h: fix incorrect type emulation"