Merge 'android-4.3_r2.1' into jb-mr2

Conflicts:
	camera/CameraParameters.cpp
	include/camera/Camera.h
	include/camera/CameraParameters.h
	include/media/AudioTrack.h
	include/media/IAudioFlinger.h
	include/media/stagefright/ACodec.h
	include/media/stagefright/MediaDefs.h
	media/libmedia/Android.mk
	media/libmedia/AudioRecord.cpp
	media/libmedia/AudioTrack.cpp
	media/libmedia/IAudioFlingerClient.cpp
	media/libmedia/ToneGenerator.cpp
	media/libmedia/mediaplayer.cpp
	media/libmediaplayerservice/StagefrightRecorder.cpp
	media/libstagefright/ACodec.cpp
	media/libstagefright/MPEG4Extractor.cpp
	media/libstagefright/OMXCodec.cpp
	media/libstagefright/StagefrightMediaScanner.cpp
	media/libstagefright/avc_utils.cpp
	media/libstagefright/codecs/aacdec/SoftAAC2.cpp
	media/libstagefright/include/avc_utils.h
	media/libstagefright/wifi-display/Android.mk
	media/mediaserver/Android.mk
	media/mediaserver/main_mediaserver.cpp
	services/audioflinger/AudioFlinger.cpp
	services/audioflinger/AudioFlinger.h
	services/camera/libcameraservice/Android.mk
	services/camera/libcameraservice/CameraService.cpp

Change-Id: Iccf4ffd24e7f7cca71b114c71f3200c13585a663