Merge "Removed libstdc++ from tinyxml so it will compile with libc++ that is in VNDK"