Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	Android.mk
	Volume.cpp
	Volume.h
	VolumeManager.cpp

Change-Id: Ic3e413d61df82b9fbe49079279ca0d00b08d8ed3
Merge branch 'cm' into HEAD