Finish (for now) the icu4jni cleanup

Manually cherry-picked