Merge "tinyxml: reduce visibility." am: e1e5c1304d am: 3eb636e00b am: 87c970db58
am: 354bbb9275

Change-Id: Ib72375335cb443194fa5924c6d1b1ed725a81554