am 8e708faf: am 5edef2e8: Merge "x86_64/x32: Avoid early fail on x32 or x86_64 build"

* commit '8e708fafb747b3f1e536d87016bb67c118fb5b0d':
  x86_64/x32: Avoid early fail on x32 or x86_64 build