Merge "Remove ICU4J data build hack"