am b0cc9aae: am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"

* commit 'b0cc9aae50089f0b77d6adc74f4d6027f0316b52':
  x86: cleanups for toolchain