[coreboot-gerrit] Change in coreboot[master]: Merge Haswell and Broadwell files