Merge "Revert "Remove tinyxml (not to be confused with tinyxml2).""