Revert "Merge remote-tracking branch 'upstream/master' into jb-mr1.1-release"

This reverts commit 9c0367803d45bd1a198f4821f0e45bb0cae35a5c, reversing
changes made to 30dd62b85a1bb9038a7759d7c94f2173d2421fd9.

	modified:   include/media/stagefright/MediaCodec.h
	modified:   include/media/stagefright/MediaExtractor.h
	modified:   include/private/media/VideoFrame.h
	modified:   libvideoeditor/osal/inc/M4OSA_Debug.h
	modified:   libvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
	modified:   libvideoeditor/vss/src/M4xVSS_internal.c
	modified:   libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
modified:   libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
	modified:   media/libmedia/AudioTrack.cpp
	modified:   media/libmedia/IMediaMetadataRetriever.cpp
	modified:   media/libmedia/mediaplayer.cpp
	modified:   media/libmediaplayerservice/MediaPlayerService.cpp
	modified:   media/libstagefright/Android.mk
	modified:   media/libstagefright/FLACExtractor.cpp
	modified:   media/libstagefright/MPEG4Extractor.cpp
	modified:   media/libstagefright/MPEG4Writer.cpp
	modified:   media/libstagefright/MediaCodec.cpp
	modified:   media/libstagefright/MetaData.cpp
	modified:   media/libstagefright/StagefrightMediaScanner.cpp
	modified:   media/libstagefright/StagefrightMetadataRetriever.cpp
	modified:   media/libstagefright/WAVExtractor.cpp
	modified:   media/libstagefright/WVMExtractor.cpp
	modified:   media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
	modified:   media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
	modified:   media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
	modified:   media/libstagefright/codecs/on2/dec/Android.mk
	modified:   media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
	modified:   media/libstagefright/httplive/M3UParser.cpp
	modified:   media/libstagefright/matroska/Android.mk
	modified:   media/libstagefright/mp4/FragmentedMP4Parser.cpp
	modified:   media/libstagefright/rtsp/AAMRAssembler.cpp
	modified:   media/libstagefright/rtsp/AH263Assembler.cpp
	modified:   media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
	modified:   media/libstagefright/rtsp/ARTPConnection.cpp
	modified:   media/libstagefright/rtsp/ARTSPConnection.cpp
	modified:   media/libstagefright/rtsp/MyHandler.h
	modified:   services/audioflinger/AudioPolicyService.cpp
	modified:   services/audioflinger/test-resample.cpp
	modified:   services/camera/libcameraservice/Camera2Client.cpp
	modified:   services/camera/libcameraservice/camera2/FrameProcessor.cpp
	modified:   services/camera/libcameraservice/camera2/Parameters.cpp
	modified:   services/camera/libcameraservice/camera2/Parameters.h