Squash 2 commits from upstream

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