Merge "media: include AOSP OMX codecs xml"