conflict fix

Conflicts:
	services/audioflinger/Android.mk