Merge "Track tinyxml2 upgrade." am: daec05ff0c
am: c2a005af46

Change-Id: I619ff3901747c16443eba65b3f848709b2edf1d0