Merge "libvpx: Cherry-pick 0d88e15 from upstream"