Merge "Revert "Add icu4j to core-libart.jar.""