Merge branch x86/build into x86/efi and fix up arch/x86/boot/tools/build.c