[coreboot-gerrit] Patch merged into coreboot/master: cbfs: hardcode file alignment