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

* commit '7f7b12b8ebba299868505984d6cf15b11f75aadf':
  Cleanup x86 flags and memset versions