[coreboot-gerrit] Patch merged into coreboot/master: 24d1d4b x86: Unify arch/io.h and arch/romcc_io.h