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

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