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

* commit 'effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
  Switch frameworks/base/core/jni to the new icu.