Merge "X86/X86_64: Switch to locked add from mfence"