Merge "Fix x86-64 libvpx build."