Merge tag 'android-4.4.1_r1' into kitkat

Android 4.4.1 Release 1

Conflicts:
	audio/AudioPolicyManagerBase.cpp

Change-Id: Ie21c49a45ededbe9f4c2f946e08909dac519c1df