am be18538d: Merge "Cleanup x86 flags and memset versions"

* commit 'be18538d4373364b6c9b1149a24974976169f52f':
  Cleanup x86 flags and memset versions