[coreboot-gerrit] Change in coreboot[master]: sb/intel/common: Fix conflicting OIC register definition