Merge remote-tracking branch 'github/kk4.4' into slim-master

Conflicts:
	camera/Android.mk
	camera/CameraParameters.cpp
	cmds/screenrecord/screenrecord.cpp
	include/camera/CameraParameters.h
	include/media/stagefright/AudioPlayer.h
	include/media/stagefright/AudioSource.h
	include/media/stagefright/ExtendedCodec.h
	include/media/stagefright/OMXCodec.h
	media/libeffects/visualizer/EffectVisualizer.cpp
	media/libmedia/AudioRecord.cpp
	media/libmedia/AudioTrack.cpp
	media/libmedia/mediaplayer.cpp
	media/libmediaplayerservice/Android.mk
	media/libmediaplayerservice/MediaPlayerService.cpp
	media/libmediaplayerservice/StagefrightRecorder.cpp
	media/libstagefright/ACodec.cpp
	media/libstagefright/Android.mk
	media/libstagefright/AudioPlayer.cpp
	media/libstagefright/AudioSource.cpp
	media/libstagefright/AwesomePlayer.cpp
	media/libstagefright/CameraSource.cpp
	media/libstagefright/ExtendedCodec.cpp
	media/libstagefright/ExtendedUtils.cpp
	media/libstagefright/LPAPlayer.cpp
	media/libstagefright/MPEG4Extractor.cpp
	media/libstagefright/MPEG4Writer.cpp
	media/libstagefright/MediaCodec.cpp
	media/libstagefright/OMXCodec.cpp
	media/libstagefright/StagefrightMediaScanner.cpp
	media/libstagefright/TimedEventQueue.cpp
	media/libstagefright/Utils.cpp
	media/libstagefright/codecs/aacdec/SoftAAC2.cpp
	media/libstagefright/httplive/LiveSession.cpp
	media/libstagefright/include/AwesomePlayer.h
	media/libstagefright/include/ExtendedUtils.h
	services/audioflinger/Android.mk
	services/audioflinger/AudioFlinger.cpp
	services/audioflinger/Effects.cpp
	services/audioflinger/Threads.cpp
	services/audioflinger/Tracks.cpp
	services/camera/libcameraservice/Android.mk