am 9f497870: Merge "Don\'t manually link stlport."

* commit '9f4978701783942e836aeab526727458e9cb1492':
  Don't manually link stlport.