Merge tag 'android-4.4.2_r2' into kk-4.4

Android 4.4.2 Release 2

Conflicts:
	core/build_id.mk