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

* commit 'e5f323dcc0b0e07f7f77ff6133a8596473fcdc1a':
  Remove uses of stlport in testrunner.