Update configs

Change-Id: Ie7aa3a7d7074c83b9ba9139ad602976ab16450e9

Conflicts:
	BoardConfig.mk