Merge "Track tinyxml2 upgrade."
am: daec05ff0c

Change-Id: I1152cbceb7dc48b34398a91967d592dc6930c8da