KOT49
Merge https://github.com/TwistedRoms/android_build into kk4.4

Conflicts:
	core/build_id.mk