[coreboot-gerrit] Patch merged into coreboot/master: x86/Makefile.inc: Fix redundant addition of memlayout.ld in bootblock