Merge "Don't manually link stlport."