Don't manually link stlport.

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