Merge remote-tracking branch 'av/kitkat' into kitkat-legacy

Conflicts:
	media/libmediaplayerservice/Android.mk
	media/libstagefright/Android.mk
	services/audioflinger/Android.mk
	services/camera/libcameraservice/Android.mk