Merge "Track tinyxml2 upgrade." am: daec05ff0c am: c2a005af46
am: b023cb23a1  -s ours

Change-Id: Ic63a778bdf4a5033b928569bf6439f14bd692bf2