Remove makefile cruft.

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

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