m8: merge BoardConfig/BoardConfigCommon

Change-Id: I319ec880230dabf6f0154ddd0deb8f06ae2c2bbe

Conflicts:
	BoardConfig.mk
	BoardConfigCommon.mk