am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."

* commit 'effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
  Switch frameworks/base/core/jni to the new icu.
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index bdef428..8894c18 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -162,6 +162,7 @@
 	$(call include-path-for, libhardware_legacy)/hardware_legacy \
 	$(TOP)/frameworks/av/include \
 	$(TOP)/system/media/camera/include \
+	external/icu/icu4c/source/common \
 	external/skia/src/core \
 	external/skia/src/pdf \
 	external/skia/src/images \
@@ -171,8 +172,6 @@
 	external/expat/lib \
 	external/openssl/include \
 	external/tremor/Tremor \
-	external/icu4c/i18n \
-	external/icu4c/common \
 	external/jpeg \
 	external/harfbuzz_ng/src \
 	external/zlib \