Merge "Fix build by removing external/icu4c from build."