diff --git a/api/4.xml b/api/4.xml
index c8a2e83fd1368..cac3ae82fc80f 100644
--- a/api/4.xml
+++ b/api/4.xml
@@ -256713,7 +256713,7 @@
  extends="java.lang.Enum"
  abstract="false"
  static="false"
- final="true"
+ final="false"
  deprecated="not deprecated"
  visibility="public"
 >
@@ -258766,7 +258766,7 @@
 <package name="java.util.concurrent.locks"
 >
 <class name="AbstractQueuedSynchronizer"
- extends="java.lang.Object"
+ extends="java.util.concurrent.locks.AbstractOwnableSynchronizer"
  abstract="true"
  static="false"
  final="false"
diff --git a/api/current.xml b/api/current.xml
index 6242beb01081c..b1e9c83eee00e 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -189520,17 +189520,6 @@
 <parameter name="stopAtPrivileged" type="boolean">
 </parameter>
 </method>
-<method name="getStackClass2"
- return="java.lang.Class&lt;?&gt;"
- abstract="false"
- native="true"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="getThreadStackTrace"
  return="java.lang.StackTraceElement[]"
  abstract="false"
@@ -279833,7 +279822,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="action" type="java.security.PrivilegedAction&lt;?&gt;">
+<parameter name="action" type="java.security.PrivilegedAction">
 </parameter>
 </method>
 <method name="callable"
@@ -279846,7 +279835,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="action" type="java.security.PrivilegedExceptionAction&lt;?&gt;">
+<parameter name="action" type="java.security.PrivilegedExceptionAction">
 </parameter>
 </method>
 <method name="defaultThreadFactory"