[coreboot-gerrit] Change in coreboot[master]: mb/intel/icelake_rvp: Remove nested variant header references