am 01d4881f: Merge "Build with libc++ instead of stlport."

* commit '01d4881f5cba62d6cd5f27010fddfd9df27b0a08':
  Build with libc++ instead of stlport.