am 28e55dd9: Merge "Fix host 64-bit ISA string" into lmp-dev

* commit '28e55dd9a315ef33e2d2fa6506d544362406f759':
  Fix host 64-bit ISA string