am 9c93ba1d: Merge "Remove uses of stlport in testrunner."

* commit '9c93ba1d30bdbc4c01d051b6bea4c11347368efd':
  Remove uses of stlport in testrunner.