am 0f690d9e: Merge "Fix x86-64 libvpx build."

* commit '0f690d9eda1893e66223138d2b930eb3e0164820':
  Fix x86-64 libvpx build.