Merge "X86: Use locked add rather than mfence"