Merge "Revert "Don't manually link stlport.""