Merge remote-tracking branch 'th/kitkat' into kitkat

Conflicts:
	core/Makefile
	core/binary.mk
	core/envsetup.mk
	core/tasks/kernel.mk
	tools/releasetools/ota_from_target_files

Change-Id: I68b88855d4966baf5af3a82ac3c960801824fb83