Merge "libvpx: fix compile error"