[coreboot-gerrit] Patch merged into coreboot/master: mainboard/{google, intel}: Change config option selection