Clean up makefile cruft.

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

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