am 5921fb51: Merge change I91eb0354 into eclair-mr2
Merge commit '5921fb51' into eclair-mr2-plus-aosp
* commit '5921fb51':
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.