Fix GContainer XMP prefix.

Also clean up management of various XMP prefixes and names to hopefully
make it easier to maintain and reason about.

Bug: 264715926
Test: test currently failing for unrelated reason
Change-Id: I5ca491d6fa1edb44086e4c7ed53221f67694cdda
2 files changed