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

* commit '5baecee3c6bf348b77b8785bcd8e35362a3507fb':
  Cleanup x86 flags and memset versions