[coreboot-gerrit] Patch merged into coreboot/master: cbfstool: Allows mixed-state fmap regions to work