Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0

Conflicts:
	Android.mk