Merge "Separate icu4j from core-libart"