[coreboot-gerrit] Change in coreboot[master]: arch/x86: Fix building with CONFIG_VBOOT_SEPARATE_VERSTAGE=n