Revert "Merge remote-tracking branch 'upstream/master' into jb42"

This reverts commit e3db782906d70f28790cd2a734059a171e25cfab, reversing
changes made to 0459263c3d55f66ce3ae064fba6c67ab4d6ac183.

	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/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/libstagefright/Android.mk
	modified:   media/libstagefright/FLACExtractor.cpp
	modified:   media/libstagefright/MP3Extractor.cpp
	modified:   media/libstagefright/MPEG4Extractor.cpp
	modified:   media/libstagefright/MediaCodec.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/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
	modified:   media/libstagefright/codecs/on2/dec/Android.mk
	modified:   media/libstagefright/id3/ID3.cpp
	modified:   media/libstagefright/include/ID3.h
	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/ARTSPConnection.cpp
	modified:   media/libstagefright/rtsp/MyHandler.h
	modified:   media/mediaserver/main_mediaserver.cpp
	deleted:    tools/resampler_tools/Android.mk
	deleted:    tools/resampler_tools/fir.cpp