Merge "backport vp8/9 unsigned int overflow fix"