Merge "Build core-icu4j against core_current sdk"