am ae77561b: Merge change I7f11a67a into eclair-mr2

Merge commit 'ae77561b8f4de45228b0d63f0d7508d428b9516a' into eclair-mr2-plus-aosp

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