[coreboot-gerrit] Patch merged into coreboot/master: 1b311de google/butterfly: Remove unused cmos.layout options