Merge "Switch to using libstlport.mk and use_rtti.mk."