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