Clean up makefile cruft.

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

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