am 4272b32a: Merge "Clean up of X86 build flags"

* commit '4272b32a86bd22ce560e41816cece950a7af4e51':
  Clean up of X86 build flags