Merge "Optimizing: Replace x86 xchg use with xor sequence"