Clean up makefile cruft.

Don't manually include/link stlport, don't include private bionic
headers.

Change-Id: I2b04462f14eca2ba965489c89b6ae5eb9c269984
Merge "Clean up makefile cruft."