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

* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.