Remove makefile cruft.

Don't manually include stlport, and don't use private bionic headers.

Change-Id: I76937432378bd4b280185e0ea1a76910cb3632f3
Merge "Remove makefile cruft."