Merge tag 'android-5.1.0_r1' into HEAD

Android 5.1.0 release 1

Conflicts:
	include/media/stagefright/ACodec.h
	include/media/stagefright/foundation/AWakeLock.h
	media/libmedia/AudioTrack.cpp
	media/libmediaplayerservice/MediaPlayerFactory.cpp
	media/libmediaplayerservice/nuplayer/GenericSource.cpp
	media/libmediaplayerservice/nuplayer/GenericSource.h
	media/libmediaplayerservice/nuplayer/NuPlayer.cpp
	media/libmediaplayerservice/nuplayer/NuPlayer.h
	media/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
	media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
	media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
	media/libstagefright/ACodec.cpp
	media/libstagefright/CameraSource.cpp
	media/libstagefright/MediaCodec.cpp
	media/libstagefright/MediaCodecSource.cpp
	media/libstagefright/foundation/AWakeLock.cpp
	media/libstagefright/foundation/Android.mk
	media/libstagefright/httplive/PlaylistFetcher.h
	media/libstagefright/omx/OMXNodeInstance.cpp
	services/audioflinger/AudioFlinger.cpp
	services/audioflinger/Threads.cpp
	services/audiopolicy/AudioPolicyManager.cpp
	services/audiopolicy/AudioPolicyManager.h

Change-Id: Ibf7f492d2e7d62f7a6dd49ce075cf275540fdbb3