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

* commit 'db17bb0732fea4e8fe575f49045449e5b683fd7a':