This is a manual cherry-pick from libvpx/master:
e61d82bd4fab408b32011568a52524b6a82bcf25

Change-Id: I29bbcea604507d016d4783c7ed1697712814478d