[coreboot-gerrit] Change in coreboot[master]: HACK HACK required changes for rebase HACK HACK