Merge pull request #132 from benjaminp:jdk21

PiperOrigin-RevId: 570077296
Change-Id: I71fa7e7ede7c5a287abb82b4e25571a5382b5e99