am a8cd96ad: Merge "Stop using libstdc++."

* commit 'a8cd96adeeb530eda74e435e626900a3a76844a7':
  Stop using libstdc++.