Merge "Upgrade to tinyxml2 6.0.0 (2017-12-11)" am: 433c28d93a am: 5bcafb3d48
am: 7d00362961

Change-Id: I1649025cb696eb082ed44748d95bbc1a4704bdfc