am fb77fe99: am 26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."

* commit 'fb77fe99b7a6ef0ce016f187d79ac5d9c75742ba':
  Use libstc++ for the name of bionic's STL.