am 27757ed9: Merge "Use the build system\'s STL selection."

* commit '27757ed969c75ac5d6ec2eb6bbea0a12b2d1b700':
  Use the build system's STL selection.