am 98f7742a: Merge "Move selection of C++ STL into the build system."

* commit '98f7742a7f5bdc69913ba5e15bba2e60ae5cf724':
  Move selection of C++ STL into the build system.