am 40d48e17: Merge "Stop using stlport."

* commit '40d48e177f243c6093a45301db122a0475cc1124':
  Stop using stlport.