Merge tag 'android-4.4.3_r1' into kitkat

Android 4.4.3 release 1

Conflicts:
	VolumeManager.h