Merge "Move selection of C++ STL into the build system."