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

* commit 'e4778e6ab82a40475081482f26759985deeb7f21':
  Clean up of X86 build flags