Don't manually link stlport.

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