Merge commit '9627e72f' into remote

Conflicts:
	include/media/IMediaSource.h
	include/media/stagefright/MPEG4Writer.h
	media/libeffects/visualizer/EffectVisualizer.cpp
	media/libmedia/AudioTrack.cpp
	media/libmedia/IMediaSource.cpp
	media/libmedia/IOMX.cpp
	media/libmediaplayerservice/MediaPlayerService.cpp
	media/libmediaplayerservice/MediaPlayerService.h
	media/libmediaplayerservice/StagefrightRecorder.cpp
	media/libmediaplayerservice/nuplayer/GenericSource.cpp
	media/libstagefright/ACodec.cpp
	media/libstagefright/MPEG4Writer.cpp
	media/libstagefright/MediaCodecSource.cpp
	media/libstagefright/StagefrightMetadataRetriever.cpp
	media/libstagefright/foundation/MetaData.cpp
	media/libstagefright/include/OMXNodeInstance.h
	media/libstagefright/omx/OMXNodeInstance.cpp
	media/libstagefright/omx/SimpleSoftOMXComponent.cpp
	media/libstagefright/rtsp/ASessionDescription.cpp
	services/audioflinger/Threads.cpp
	services/audiopolicy/Android.mk
	services/audiopolicy/common/managerdefinitions/src/TypeConverter.cpp
	services/audiopolicy/managerdefault/AudioPolicyManager.cpp
	services/camera/libcameraservice/device3/Camera3OutputStream.h

Change-Id: I9e2c9c06ce58c9cde52a850e81054ec1734f6e06