Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	audio/AudioPolicyManagerBase.cpp

Change-Id: I0cfebdc274f244bc0b762322864ac82715e3250b