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

Change-Id: I04ac51370daadf6ecf6e07730d264fb4be483a24