[coreboot-gerrit] Patch merged into coreboot/master: payload choice: Fix build of FILO