Merge commit '99e330b5' into froyo-plus-aosp * commit '99e330b5': Properly fill in the component name for the software decoders.