Merge "Clean up redundant links to stlport."