Merge "tinyxml: reduce visibility." am: e1e5c1304d
am: 3eb636e00b

Change-Id: I6a44caffe48f01237d1be25d8e3a368446f8a3bd