Merge "stagefright: use media_codecs_google*.xml files"