am c0634b29: Merge "Allow HOST_ARCH x86_64 to build."

* commit 'c0634b29d6d78ae1d881d19cfb9f916bbeee6603':
  Allow HOST_ARCH x86_64 to build.