Merge commit '8e8573285eeea9388e7c1f201c1fd0f267e2772b' into HEAD

Conflicts:
	BoardConfig.mk
	extract-files.sh
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/packages/apps/Settings/res/values/config.xml
	tg.dependencies
	vendorsetup.sh
BoardConfig: Rework kernel toolchain defines and ROM toolchain defines