[coreboot-gerrit] Patch merged into coreboot/master: libpayload: Allow non-default CBFS media