Merge remote-tracking branch 'AOSP/kitkat-mr1.1-release' into kk-ras-mr1.2_r2
Merge branch 'kk-ras-mr1.2_r2' of https://github.com/rascarlo/android_build into kk

Conflicts:
	core/build_id.mk