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

Change-Id: I7983ba982c4ec85b0ca72a8a97b96f21bc60a085