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