Conflicts:
	media/libmedia/AudioSystem.cpp
	services/audioflinger/AudioPolicyService.cpp