Make it easier to use stlport correctly.

Change-Id: I55da59c8c11057b7d881301ec8c9fd4aa3bd92bf
Merge "Make it easier to use stlport correctly."
Make libstlport.mk interoperate correctly with use_rtti.mk.

Change-Id: I639d0d3dc36a0b7c2d3fb2ded42e8801daccfa7a
Merge "Make libstlport.mk interoperate correctly with use_rtti.mk."
Merge https://android.googlesource.com/platform/external/stlport into HEAD

Conflicts:
	Android.mk

Change-Id: I07097c0069dc7bc5194280e851e0ab97b7c38c31