Merge "Use the build system's STL selection."