Remove makefile cruft.

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

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