[coreboot-gerrit] Patch merged into coreboot/master: cbfstool: keep cbfs master header pointer