Merge "x86: cleanups for toolchain"