Merge "Cleanup x86 flags and memset versions"