libvpx: Cherry-pick 1961a92 from upstream am: 57e9ae1497
am: 90b12e62bf

Change-Id: I3e22bd0f0b274e7c068e1d8f40858225bb19a121