Merge changes Iff0716b8,Ibf485f3b

* changes:
  OpenJDK 17: java.lang.annotation.ElementType (RECORD_COMPONENT)
  OpenJDK 17: java.lang.annotation.* (no-op)