am fc52c06f: am ffcdd9f1: Merge "x86_64: Unify 64-bit check in x86 compiler"

* commit 'fc52c06fa204d305df7f6b5aafbc125bd1ed0741':
  x86_64: Unify 64-bit check in x86 compiler