[coreboot-gerrit] Change in coreboot[master]: mb/google/hatch: Consolidate mainboard.c for Puff