Merge "Build the tinyxml2 tests." am: 8c7e56d180
am: e7197bcf2f

Change-Id: Ida70751a0eef1738ed767c66c49d75646c50745b