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

Change-Id: Ia6d1f5443b67dbe66cf63aa8c52ad43ecb14883e