Revert "Switch to libc++"

This reverts commit 216ae149fcbb6a5ecef884ddc6cc817caab2bbfa.

Change-Id: Iffeb23fc1aeca5ac2ca4cf2f9273e0bfcb46c1c9
diff --git a/common/Android.mk b/common/Android.mk
index a5d2688..a9ebcdf 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -150,8 +150,9 @@
 LOCAL_MODULE := libicuuc
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
 LOCAL_REQUIRED_MODULES += icu-data
-LOCAL_RTTI_FLAG := -frtti
-include external/libcxx/libcxx.mk
+# Use "-include" to not fail apps_only build.
+-include abi/cpp/use_rtti.mk
+-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
 #
diff --git a/i18n/Android.mk b/i18n/Android.mk
index 195ce01..344fd47 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -126,8 +126,9 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libicui18n
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
-LOCAL_RTTI_FLAG := -frtti
-include external/libcxx/libcxx.mk
+# Use "-include" to not fail apps_only build.
+-include abi/cpp/use_rtti.mk
+-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)