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

* commit 'f5bbfe825afdbcb6e88df19ef6535b23ea5589e7':
  x86: cleanups for toolchain