Merge "Don't hide C++ STL choice from the build system."