Squash 2 commits from upstream

libstagefright: Extended media support via FFMPEG
libstagefright: Re-introduce a QCOM_HARDWARE

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