8197531: Miscellaneous changes imported from jsr166 CVS 2018-04

Reviewed-by: martin, psandoz

src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java

@@ -1671,7 +1671,7 @@ public class ConcurrentLinkedDeque<E>
             NEXT = l.findVarHandle(Node.class, "next", Node.class);
             ITEM = l.findVarHandle(Node.class, "item", Object.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }