Merge "Add a manifest fragment to our c2 codecs"