Merge "Revert "Use stable ICU symbols (non-version-specific suffix) in libopenjdk""