Merge "Revert "Remove tinyxml (not to be confused with tinyxml2)."" am: 7a4bee04f5

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml/+/1504281

Change-Id: I37920f7f25dbc58cbd2da9beba5daf652cb46125