[coreboot-gerrit] [XS] Change in coreboot[main]: soc/intel/apollolake: Remove conflicting C1e settings