Merge "Fix module tags on stagefright software decoders."