[coreboot-gerrit] Patch merged into coreboot/master: 2dd161f cbfstool: Clean up code