Update BoardConfig.mk

Post vendor merge - BoardConfig.mk reflect vendor changes