Merge "libvpx: Cherry-pick 0d88e15 from upstream"
am: 8585b76890

Change-Id: I2541c546f8cf9643fb1cae5c3049823af08fe0cd