Merge "Track tinyxml2 upgrade."