Manually cherrypicked from libvpx/master: 1b833d63d9c82270e4ea588541d14e9111c64c79 a4f3751b Change-Id: I3b82e54a3173ac1458a13f33fd36094fec066f1c