[coreboot-gerrit] Patch merged into coreboot/master: Fix butterfly usb map.