Manually cherry-picked from libvpx/nextgenv2 9441f10b Change-Id: I51c20902770938f456ce0b68b42ca5ed2f821896