Merge "media/stagefright: add support for codec attributes in MediaCodecInfo"