am 91adf75c: Merge "Fix detection of C++ STL for tests."

* commit '91adf75c3e0f13bab71e573ec4e3731699f7136e':
  Fix detection of C++ STL for tests.