Remove makefile cruft.

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

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