Merge "expat: don't link against libstdc++"