Merge "Clean up of X86 build flags"