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

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