Don't hide C++ STL choice from the build system. Change-Id: I46958a199e41f2705d38f4dd0009e0c99cbe0a00