Merge "libvpx: Cherry-pick 0d88e15 from upstream" am: 8585b76890 am: 77e94fada8 am: 31d6328b8d
am: f8c7c2b8ab

Change-Id: I694c3fd1e9baa19f69e7bca2439dfe2062df7036