Merge change I40159068

* changes:
  Use icu4jni_error more consistently.