Merge "OpenJDK17: add java.io.Serial"