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

* commit 'a335c869748b133c661cc1efff3028984ee9f7aa':
  Fix x86-64 libvpx build.