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