Merge "X86_64: Replace x86_64 xchg instruction use"