Merge tag 'android-4.4.1_r1' of https://android.googlesource.com/platform/build into kk4.4

Android 4.4.1 Release 1

Conflicts:
	core/Makefile
	core/build_id.mk