Merge "Make tinyxml2 build with the VNDK."