am e065696c: am ae77561b: Merge change I7f11a67a into eclair-mr2

Merge commit 'e065696cd93a454877b44de9b96a033a7553b5ff'

* commit 'e065696cd93a454877b44de9b96a033a7553b5ff':
  Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.