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

* commit 'db2e0247ed67dfdf6e16eb47348db81dc8ccd04d':
  Hide C++ stuff in libc. Put it back in libstdc++.