am 18b86b97: am 77f27f1d: Merge "Cleanup x86 and x86_64 flags"

* commit '18b86b97b83e7d254125723363f170bc6f8d391e':
  Cleanup x86 and x86_64 flags