Merge pull request #3553 from luizluca/libvpx-update