Merge "Fix x86 calling convention issue." into lmp-dev