[coreboot-gerrit] Patch merged into coreboot/master: 0e53931 cbfstool: Clean up in preparation for adding new files