Revert "Squash 2 commits from upstream"

This reverts commit 545ed6fd7df546618dedd80d0d3598535082d931.

Conflicts:
	include/media/stagefright/MediaDefs.h
	media/libstagefright/AwesomePlayer.cpp
	media/libstagefright/DataSource.cpp
	media/libstagefright/MediaDefs.cpp
	media/libstagefright/MediaExtractor.cpp
	media/libstagefright/OMXCodec.cpp