Merge "Enable art/tools/ahat to use libicu_jni." into main