Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	audio/AudioPolicyManagerBase.cpp

Change-Id: I15414a8b534c11f776562e59d24ed37f9ed82496