am 8f6c3b4f: Merge "Fix CPU architecture check for x86_64."

* commit '8f6c3b4fb3e93db76c3c209d204d8bec918924e0':
  Fix CPU architecture check for x86_64.