Fix Merge issues with Record 2

fix red bots

Change-Id: I5c4f2da193b91794c399a4a9d6625c645800ab75
diff --git a/src/test/examplesJava16/records/EmptyRecordAnnotation.java b/src/test/examplesJava17/records/EmptyRecordAnnotation.java
similarity index 94%
rename from src/test/examplesJava16/records/EmptyRecordAnnotation.java
rename to src/test/examplesJava17/records/EmptyRecordAnnotation.java
index 7236a66..350e8ce 100644
--- a/src/test/examplesJava16/records/EmptyRecordAnnotation.java
+++ b/src/test/examplesJava17/records/EmptyRecordAnnotation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
diff --git a/src/test/examplesJava16/records/UnusedRecordField.java b/src/test/examplesJava17/records/UnusedRecordField.java
similarity index 85%
rename from src/test/examplesJava16/records/UnusedRecordField.java
rename to src/test/examplesJava17/records/UnusedRecordField.java
index 7a21412..1d184cd 100644
--- a/src/test/examplesJava16/records/UnusedRecordField.java
+++ b/src/test/examplesJava17/records/UnusedRecordField.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
diff --git a/src/test/examplesJava16/records/UnusedRecordMethod.java b/src/test/examplesJava17/records/UnusedRecordMethod.java
similarity index 86%
rename from src/test/examplesJava16/records/UnusedRecordMethod.java
rename to src/test/examplesJava17/records/UnusedRecordMethod.java
index 31a044f..342b178 100644
--- a/src/test/examplesJava16/records/UnusedRecordMethod.java
+++ b/src/test/examplesJava17/records/UnusedRecordMethod.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
diff --git a/src/test/examplesJava16/records/UnusedRecordReflection.java b/src/test/examplesJava17/records/UnusedRecordReflection.java
similarity index 94%
rename from src/test/examplesJava16/records/UnusedRecordReflection.java
rename to src/test/examplesJava17/records/UnusedRecordReflection.java
index f99cc52..1a4891b 100644
--- a/src/test/examplesJava16/records/UnusedRecordReflection.java
+++ b/src/test/examplesJava17/records/UnusedRecordReflection.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.