Remove makefile cruft.

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

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