Merge "Remove uses of stlport in testrunner."