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

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