I was able to spend some time on this. Eventually I figured out a way to get the standard library to do external entity expansion without too much headache, so switching out all of the upstream tests to use XIncludes is no longer necessary.
Review is here: https://review.trustedfirmware.org/c/TF-A/tf-a-tests/+/21135