Merge "stagefright: add c2 gsm and mpeg2 decoders to codec xmls"