Merge "Fix detection of C++ STL for tests."