Merge tag 'android-4.4.1_r1' into kitkat

Android 4.4.1 Release 1

Conflicts:
	Android.mk
	Volume.h
	VolumeManager.cpp