am a8b6e06f: Merge "Switch to libc++"

* commit 'a8b6e06ffdb59582cb3e8498b297b209f46ed33d':
  Switch to libc++