Squash 4.3 changes.

Conflicts:
	audio/AudioPolicyManagerBase.cpp
	include/hardware_legacy/AudioPolicyManagerBase.h

Change-Id: I0ad14b712726c030f5732e6c90edc52f890bfc01