Merge "Hide C++ stuff in libc. Put it back in libstdc++."