am 19d686ee: Merge "Don\'t manually link stlport."

* commit '19d686ee9340c81c23083fc30bc012f7f6ed5028':
  Don't manually link stlport.