am 597cc8a0: Merge "Now we support both x86 and x86_64 host arch."

* commit '597cc8a0455cfda0d8a5ebbd4f169133ab7f3b37':
  Now we support both x86 and x86_64 host arch.