[coreboot-gerrit] Patch merged into coreboot/master: google/enguarde: Adapt to current tree