Trying to fix a build error
Merge remote-tracking branch 'origin/kitkat' into kitkat

Conflicts:
	config/common.mk