Merge "Fix host 64-bit ISA string" into lmp-dev