Merge change 5099

* changes:
  Move the BoardConfig.mk search and inclusion to core/config.mk.