Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	audio/AudioPolicyManagerBase.cpp

Change-Id: I89ac037649e05540e85f7497e416f85032210776
Merge remote-tracking branch 'cm/cm-11.0' into HEAD