Merge "Make tinyxml2 build with the VNDK."
am: 513377fb55

Change-Id: I3c736d3da6597bb38b7e8b6d3cda9fde897ef383