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

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