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

* commit 'be0d295da912076239a1e112c4b7b94be10cf7af':
  Don't manually link stlport.