Don't manually link stlport.

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

These makefiles are auto-generated and should not be edited manually.

This reverts commit 498d6e3a415c8fd681828abdf6394a5c4406de0d.

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