[coreboot-gerrit] Patch merged into coreboot/master: cbfstool: correct add-master-header logic to match runtime expectations