Merge commit 'f553a58425c66a990dbc5f4579c976a0636fc573'

* commit 'f553a58425c66a990dbc5f4579c976a0636fc573':
  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.