am 5ee74388: Merge "Disallow using stlport."

* commit '5ee74388b1e5678f353ba8a804e8bb3a20420cb5':
  Disallow using stlport.