Don't manually link stlport.

Change-Id: Ie2c698447ba478b3f79f2cc8331427190973ebf0
Merge "Don't manually link stlport."