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

* commit '0b1d15742f4cc7f930981fc63ee74b5df51ce719':
  Stop using libstdc++.