[coreboot-gerrit] Patch merged into coreboot/master: arch/x86/bootblock_normal: Fix failure to build