[coreboot-gerrit] Change in coreboot[4.11_branch]: Makefile.inc: Ignore _HID & _ADR conflicts in Broadwell & Lynxpoint