Merge "Cleanup x86 and x86_64 flags"