Merge tag 'android-4.4.2_r2' of https://android.googlesource.com/platform/build into kk

Android 4.4.2 Release 2

Conflicts:
	core/build_id.mk
Merge branch 'kk-ras-mr1.2_r2' of https://github.com/rascarlo/android_build into kk

Conflicts:
	core/build_id.mk