Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	services/surfaceflinger/Android.mk

Change-Id: I70c2aeb8ff70d08fc8104f2bbb3f034f1a06858e