From 49ba6cc3b0ef9dee4299102b356e70e280b40ce5 Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@gmail.com>
Date: Fri, 7 Oct 2016 03:17:17 +0900
Subject: [PATCH 1/3] [Mono.Android] update API xml based on current
 class-parse + api-xml-adjuster.

api-24.xml.in was already generated with the almost latest tools,
but it has some new members probably due to android.jar updates.

Others were generated by old tools so they had extraneous generic
constraints.
---
 src/Mono.Android/Profiles/api-10.xml.in | 1715 +++--------------
 src/Mono.Android/Profiles/api-15.xml.in | 1876 +++---------------
 src/Mono.Android/Profiles/api-16.xml.in | 1890 +++----------------
 src/Mono.Android/Profiles/api-17.xml.in | 1890 +++----------------
 src/Mono.Android/Profiles/api-18.xml.in | 1890 +++----------------
 src/Mono.Android/Profiles/api-19.xml.in | 1946 +++----------------
 src/Mono.Android/Profiles/api-20.xml.in | 1946 +++----------------
 src/Mono.Android/Profiles/api-21.xml.in | 2254 ++++------------------
 src/Mono.Android/Profiles/api-22.xml.in | 2261 ++++------------------
 src/Mono.Android/Profiles/api-23.xml.in | 2305 ++++-------------------
 src/Mono.Android/Profiles/api-24.xml.in |   12 +
 11 files changed, 2901 insertions(+), 17084 deletions(-)

diff --git a/src/Mono.Android/Profiles/api-10.xml.in b/src/Mono.Android/Profiles/api-10.xml.in
index 49ec3fea533..ceb8f54802c 100644
--- a/src/Mono.Android/Profiles/api-10.xml.in
+++ b/src/Mono.Android/Profiles/api-10.xml.in
@@ -3046,12 +3046,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -3060,12 +3055,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -14892,12 +14882,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -27686,12 +27671,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -27704,12 +27684,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -27740,12 +27715,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -27760,12 +27730,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -35893,24 +35858,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -37656,24 +37606,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -37824,12 +37764,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -37838,12 +37773,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -38071,12 +38001,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -48395,12 +48320,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -48513,12 +48433,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -48557,12 +48472,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -52450,18 +52360,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -52471,18 +52371,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -52554,12 +52444,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="SparseArray" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -60803,12 +60688,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -62647,12 +62527,7 @@
       <implements name="android.widget.Filterable" name-generic-aware="android.widget.Filterable">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -68239,12 +68114,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -73582,21 +73452,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="clazz" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -74039,12 +73899,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -74481,12 +74336,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -74683,12 +74533,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -77443,12 +77288,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -77699,12 +77539,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -77715,12 +77550,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -77733,12 +77563,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -77759,12 +77584,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -77779,12 +77599,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -78087,12 +77902,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getDeclaringClass" native="false" return="java.lang.Class&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -84006,24 +83816,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -84032,12 +83832,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -84046,12 +83841,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -84062,24 +83852,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -85808,12 +85588,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -85828,12 +85603,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -94877,12 +94647,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -96450,12 +96215,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -96499,12 +96259,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -96514,12 +96269,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -96584,18 +96334,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -96644,18 +96384,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -96682,18 +96412,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -96718,12 +96438,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -96734,12 +96449,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -96756,12 +96466,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -96774,12 +96479,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -96866,12 +96566,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -96901,12 +96596,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -97041,12 +96731,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -97061,12 +96746,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -97125,12 +96805,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -97139,18 +96814,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -97225,12 +96890,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -97241,18 +96901,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -97609,12 +97259,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -97627,12 +97272,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -98090,12 +97730,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -98143,12 +97778,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -98157,12 +97787,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -98171,24 +97796,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -98197,12 +97812,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -98213,12 +97823,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -98227,12 +97832,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -98241,18 +97841,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -98263,12 +97853,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -98277,18 +97862,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -98299,12 +97874,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -98313,12 +97883,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -98333,60 +97898,30 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -98413,12 +97948,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -98439,12 +97969,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -98467,12 +97992,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -98481,12 +98001,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -98495,24 +98010,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -98527,22 +98032,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -98565,42 +98060,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -98621,12 +98096,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -98643,168 +98113,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -98818,12 +98208,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="object1" type="T">
@@ -99004,12 +98389,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="addFirst" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -99062,18 +98442,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -99114,12 +98484,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -99140,12 +98505,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -99663,18 +99023,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -99705,12 +99055,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -99743,18 +99088,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -99831,18 +99166,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -99935,12 +99260,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -99951,18 +99271,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -100001,12 +99311,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -100037,12 +99342,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -100123,12 +99423,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -100222,12 +99517,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -100237,12 +99527,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -100403,18 +99688,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -100463,18 +99738,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -100525,18 +99790,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -100611,12 +99866,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -100713,12 +99963,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -100889,12 +100134,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="element" native="false" return="E" static="false" synchronized="false" visibility="public">
       </method>
@@ -101348,35 +100588,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -101385,12 +100610,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -101402,12 +100622,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -101455,12 +100670,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -101652,18 +100862,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -101690,12 +100890,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -101720,12 +100915,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -101968,18 +101158,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -102096,12 +101276,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -102256,12 +101431,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -102362,18 +101532,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -102403,12 +101563,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -102417,12 +101572,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -102435,12 +101585,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -102451,12 +101596,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -102473,12 +101613,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -102487,12 +101622,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -102503,12 +101633,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -102517,12 +101642,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -102534,12 +101654,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -102618,12 +101733,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -102770,12 +101880,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -102844,12 +101949,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -102866,12 +101966,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -102904,18 +101999,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -102984,12 +102069,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -103014,18 +102094,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -103060,18 +102130,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -103126,18 +102186,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -103280,12 +102330,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -103384,12 +102429,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -103509,12 +102549,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="a" type="T[]">
         </parameter>
@@ -103524,12 +102559,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -103682,12 +102712,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -103738,12 +102763,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -103787,12 +102807,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -103849,24 +102864,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -103895,12 +102900,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -103909,12 +102909,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -103927,12 +102922,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -103943,12 +102933,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -103977,12 +102962,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -103991,12 +102971,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -104004,12 +102979,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -104042,12 +103012,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -104106,12 +103071,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -104286,12 +103246,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -104362,12 +103317,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -104468,12 +103418,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -104484,12 +103429,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -104507,12 +103447,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -104548,12 +103483,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -104585,12 +103515,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -104599,12 +103524,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -104625,12 +103545,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -104750,12 +103665,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -105292,12 +104202,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -105355,12 +104260,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -105524,12 +104424,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -105587,12 +104482,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -105616,12 +104506,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -105674,12 +104559,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -105718,12 +104598,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -105776,18 +104651,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -105817,18 +104682,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -105854,12 +104709,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -115244,12 +114094,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -115258,12 +114103,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -115274,12 +114114,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -115290,12 +114125,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -115324,12 +114154,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -115338,12 +114163,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -120839,12 +119659,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -120857,12 +119672,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -120897,12 +119707,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -120917,12 +119722,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -121028,12 +119828,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ResponseHandler" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="handleResponse" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="response" type="org.apache.http.HttpResponse">
@@ -124359,12 +123154,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -124377,12 +123167,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -124417,12 +123202,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -124437,12 +123217,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-15.xml.in b/src/Mono.Android/Profiles/api-15.xml.in
index e9f7883f60c..7b5c92be4c0 100644
--- a/src/Mono.Android/Profiles/api-15.xml.in
+++ b/src/Mono.Android/Profiles/api-15.xml.in
@@ -4394,12 +4394,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -4408,12 +4403,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -5003,12 +4993,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5027,12 +5012,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5053,18 +5033,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5135,12 +5105,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property">
         </parameter>
@@ -5194,12 +5159,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="TypeEvaluator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="evaluate" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="fraction" type="float">
@@ -9203,24 +9163,14 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="initLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -9231,12 +9181,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="restartLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -9248,12 +9193,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="LoaderManager.LoaderCallbacks" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onCreateLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="id" type="int">
@@ -12387,12 +12327,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.content.Loader" extends-generic-aware="android.content.Loader&lt;D&gt;" final="false" name="AsyncTaskLoader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTaskLoader" static="false" type="android.content.AsyncTaskLoader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -12898,12 +12833,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="openPipeHelper" native="false" return="android.os.ParcelFileDescriptor" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="uri" type="android.net.Uri">
         </parameter>
@@ -12967,12 +12897,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ContentProvider.PipeDataWriter" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="writeDataToPipe" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="output" type="android.os.ParcelFileDescriptor">
@@ -16213,12 +16138,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Loader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Loader" static="false" type="android.content.Loader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -16293,12 +16213,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCompleteListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadComplete" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -20453,12 +20368,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -35379,12 +35289,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -35397,12 +35302,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -35433,12 +35333,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -35453,12 +35348,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -44223,24 +44113,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -46084,24 +45959,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -46252,12 +46117,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -46266,12 +46126,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -46501,12 +46356,7 @@
       <implements name="android.os.Parcelable.Creator" name-generic-aware="android.os.Parcelable.Creator&lt;T&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -46517,12 +46367,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -58267,12 +58112,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="getLoaderResultSynchronously" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="loader" type="android.content.Loader&lt;T&gt;">
         </parameter>
@@ -61591,12 +61431,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -61723,12 +61558,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -61767,12 +61597,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -65948,18 +65773,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="LruCache" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LruCache" static="false" type="android.util.LruCache" visibility="public">
         <parameter name="maxSize" type="int">
@@ -66090,18 +65905,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -66111,18 +65916,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -66194,18 +65989,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Property" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Property" static="false" type="android.util.Property" visibility="public">
         <parameter name="type" type="java.lang.Class&lt;V&gt;">
@@ -66225,18 +66010,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="of" native="false" return="android.util.Property&lt;T, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="hostType" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -66256,12 +66031,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -76635,12 +76405,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -78827,12 +78592,7 @@
       <implements name="android.widget.Filterable" name-generic-aware="android.widget.Filterable">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -85565,12 +85325,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -90990,21 +90745,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="clazz" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -91421,12 +91166,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -91863,12 +91603,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -92065,12 +91800,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -94825,12 +94555,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -95081,12 +94806,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -95097,12 +94817,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -95115,12 +94830,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -95139,12 +94849,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -95159,12 +94864,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -95463,12 +95163,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getAnnotation" native="false" return="A" static="false" synchronized="false" visibility="public">
         <typeParameters>
@@ -101412,24 +101107,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -101438,12 +101123,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -101452,12 +101132,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -101468,24 +101143,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -103196,12 +102861,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -103216,12 +102876,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -112259,12 +111914,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -113832,12 +113482,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -113881,12 +113526,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -113896,12 +113536,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -113966,18 +113601,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -114026,18 +113651,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -114064,18 +113679,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -114100,12 +113705,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -114116,12 +113716,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -114138,12 +113733,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -114156,12 +113746,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -114248,12 +113833,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -114283,12 +113863,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -114423,12 +113998,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -114443,12 +114013,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -114507,12 +114072,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -114521,18 +114081,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -114607,12 +114157,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -114623,18 +114168,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -114991,12 +114526,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -115009,12 +114539,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -115472,12 +114997,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -115525,12 +115045,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -115539,12 +115054,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -115553,24 +115063,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -115579,12 +115079,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -115595,12 +115090,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -115609,12 +115099,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -115623,18 +115108,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -115645,12 +115120,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -115659,18 +115129,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -115681,12 +115141,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -115695,12 +115150,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -115715,60 +115165,30 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -115795,12 +115215,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -115821,12 +115236,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -115849,12 +115259,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -115863,12 +115268,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -115877,24 +115277,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -115909,22 +115299,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -115947,42 +115327,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -116003,12 +115363,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -116025,168 +115380,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -116200,12 +115475,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="lhs" type="T">
@@ -116386,12 +115656,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -116472,18 +115737,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -116524,12 +115779,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -116550,12 +115800,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -117073,18 +116318,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -117115,12 +116350,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -117153,18 +116383,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -117241,18 +116461,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -117345,12 +116555,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -117361,18 +116566,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -117411,12 +116606,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -117447,12 +116637,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -117533,12 +116718,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -117632,12 +116812,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -117647,12 +116822,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -117809,18 +116979,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -117869,18 +117029,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -117931,18 +117081,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -118031,12 +117171,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -118149,12 +117284,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -118325,12 +117455,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -118788,35 +117913,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -118825,12 +117935,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -118842,12 +117947,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -118895,12 +117995,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -119092,18 +118187,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -119130,12 +118215,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -119160,12 +118240,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -119408,18 +118483,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -119536,12 +118601,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -119696,12 +118756,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -119802,18 +118857,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -119843,12 +118888,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -119857,12 +118897,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -119875,12 +118910,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -119891,12 +118921,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -119913,12 +118938,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -119927,12 +118947,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -119943,12 +118958,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -119957,12 +118967,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -119974,12 +118979,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -120058,12 +119058,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -120210,12 +119205,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -120284,12 +119274,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -120306,12 +119291,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -120344,18 +119324,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -120424,12 +119394,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -120454,18 +119419,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -120500,18 +119455,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -120566,18 +119511,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -120720,12 +119655,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -120824,12 +119754,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -120949,12 +119874,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -120964,12 +119884,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -121122,12 +120037,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -121178,12 +120088,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -121227,12 +120132,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -121289,24 +120189,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -121335,12 +120225,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -121349,12 +120234,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -121367,12 +120247,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -121383,12 +120258,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -121417,12 +120287,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -121431,12 +120296,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -121444,12 +120304,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -121482,12 +120337,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -121546,12 +120396,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -121726,12 +120571,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -121802,12 +120642,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -121908,12 +120743,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -121924,12 +120754,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -121947,12 +120772,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -121988,12 +120808,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -122025,12 +120840,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -122039,12 +120849,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -122065,12 +120870,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -122190,12 +120990,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -122732,12 +121527,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -122795,12 +121585,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -122964,12 +121749,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -123027,12 +121807,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -123056,12 +121831,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -123114,12 +121884,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -123158,12 +121923,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -123216,18 +121976,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -123257,18 +122007,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -123294,12 +122034,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -132676,12 +131411,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -132690,12 +131420,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -132706,12 +131431,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -132722,12 +131442,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -132756,12 +131471,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -132770,12 +131480,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -138271,12 +136976,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -138289,12 +136989,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -138329,12 +137024,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -138349,12 +137039,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -138460,12 +137145,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ResponseHandler" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="handleResponse" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="response" type="org.apache.http.HttpResponse">
@@ -141791,12 +140471,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -141809,12 +140484,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -141849,12 +140519,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -141869,12 +140534,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-16.xml.in b/src/Mono.Android/Profiles/api-16.xml.in
index 309691d1269..efed6a337e8 100644
--- a/src/Mono.Android/Profiles/api-16.xml.in
+++ b/src/Mono.Android/Profiles/api-16.xml.in
@@ -4488,12 +4488,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -4502,12 +4497,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -5127,12 +5117,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5151,12 +5136,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5177,18 +5157,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5259,12 +5229,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property">
         </parameter>
@@ -5336,12 +5301,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="TypeEvaluator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="evaluate" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="fraction" type="float">
@@ -9547,24 +9507,14 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="initLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -9575,12 +9525,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="restartLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -9592,12 +9537,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="LoaderManager.LoaderCallbacks" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onCreateLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="id" type="int">
@@ -13061,12 +13001,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.content.Loader" extends-generic-aware="android.content.Loader&lt;D&gt;" final="false" name="AsyncTaskLoader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTaskLoader" static="false" type="android.content.AsyncTaskLoader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -13620,12 +13555,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="openPipeHelper" native="false" return="android.os.ParcelFileDescriptor" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="uri" type="android.net.Uri">
         </parameter>
@@ -13703,12 +13633,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ContentProvider.PipeDataWriter" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="writeDataToPipe" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="output" type="android.os.ParcelFileDescriptor">
@@ -17083,12 +17008,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Loader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Loader" static="false" type="android.content.Loader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -17177,12 +17097,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCanceledListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadCanceled" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -17191,12 +17106,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCompleteListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadComplete" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -21391,12 +21301,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -37713,12 +37618,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -37731,12 +37631,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -37767,12 +37662,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -37787,12 +37677,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -46973,24 +46858,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -48862,24 +48732,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -49030,12 +48890,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -49044,12 +48899,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -49279,12 +49129,7 @@
       <implements name="android.os.Parcelable.Creator" name-generic-aware="android.os.Parcelable.Creator&lt;T&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -49295,12 +49140,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -61242,12 +61082,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="getLoaderResultSynchronously" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="loader" type="android.content.Loader&lt;T&gt;">
         </parameter>
@@ -64598,12 +64433,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -64730,12 +64560,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -64774,12 +64599,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -68959,12 +68779,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LongSparseArray" static="false" type="android.util.LongSparseArray" visibility="public">
       </constructor>
@@ -69037,18 +68852,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="LruCache" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LruCache" static="false" type="android.util.LruCache" visibility="public">
         <parameter name="maxSize" type="int">
@@ -69179,18 +68984,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -69200,18 +68995,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -69283,18 +69068,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Property" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Property" static="false" type="android.util.Property" visibility="public">
         <parameter name="type" type="java.lang.Class&lt;V&gt;">
@@ -69314,18 +69089,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="of" native="false" return="android.util.Property&lt;T, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="hostType" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -69345,12 +69110,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -80190,12 +79950,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -82420,12 +82175,7 @@
       <implements name="android.widget.Filterable" name-generic-aware="android.widget.Filterable">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -89434,12 +89184,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -94859,21 +94604,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="clazz" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -95290,12 +95025,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -95732,12 +95462,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -95934,12 +95659,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -98694,12 +98414,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -98950,12 +98665,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -98966,12 +98676,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -98984,12 +98689,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -99008,12 +98708,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -99028,12 +98723,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -99332,12 +99022,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getAnnotation" native="false" return="A" static="false" synchronized="false" visibility="public">
         <typeParameters>
@@ -105281,24 +104966,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -105307,12 +104982,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -105321,12 +104991,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -105337,24 +105002,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -107065,12 +106720,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -107085,12 +106735,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -116128,12 +115773,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -117701,12 +117341,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -117750,12 +117385,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -117765,12 +117395,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -117835,18 +117460,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -117895,18 +117510,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -117933,18 +117538,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -117969,12 +117564,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -117985,12 +117575,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -118007,12 +117592,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -118025,12 +117605,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -118117,12 +117692,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -118152,12 +117722,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -118292,12 +117857,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -118312,12 +117872,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -118376,12 +117931,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -118390,18 +117940,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -118476,12 +118016,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -118492,18 +118027,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -118860,12 +118385,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -118878,12 +118398,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -119341,12 +118856,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -119394,12 +118904,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -119408,12 +118913,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -119422,24 +118922,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -119448,12 +118938,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -119464,12 +118949,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -119478,12 +118958,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -119492,18 +118967,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -119514,12 +118979,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -119528,18 +118988,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -119550,12 +119000,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -119564,12 +119009,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -119584,60 +119024,30 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -119664,12 +119074,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -119690,12 +119095,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -119718,12 +119118,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -119732,12 +119127,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -119746,24 +119136,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -119778,22 +119158,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -119816,42 +119186,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -119872,12 +119222,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -119894,168 +119239,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -120069,12 +119334,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="lhs" type="T">
@@ -120255,12 +119515,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -120341,18 +119596,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -120393,12 +119638,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -120419,12 +119659,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -120942,18 +120177,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -120984,12 +120209,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -121022,18 +120242,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -121110,18 +120320,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -121214,12 +120414,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -121230,18 +120425,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -121280,12 +120465,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -121316,12 +120496,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -121402,12 +120577,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -121501,12 +120671,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -121516,12 +120681,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -121678,18 +120838,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -121738,18 +120888,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -121800,18 +120940,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -121900,12 +121030,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -122018,12 +121143,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -122194,12 +121314,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -122657,35 +121772,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -122694,12 +121794,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -122711,12 +121806,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -122764,12 +121854,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -122961,18 +122046,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -122999,12 +122074,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -123029,12 +122099,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -123277,18 +122342,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -123405,12 +122460,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -123565,12 +122615,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -123671,18 +122716,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -123712,12 +122747,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -123726,12 +122756,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -123744,12 +122769,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -123760,12 +122780,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -123782,12 +122797,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -123796,12 +122806,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -123812,12 +122817,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -123826,12 +122826,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -123843,12 +122838,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -123927,12 +122917,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -124079,12 +123064,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -124153,12 +123133,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -124175,12 +123150,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -124213,18 +123183,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -124293,12 +123253,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -124323,18 +123278,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -124369,18 +123314,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -124435,18 +123370,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -124589,12 +123514,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -124693,12 +123613,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -124818,12 +123733,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -124833,12 +123743,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -124991,12 +123896,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -125047,12 +123947,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -125096,12 +123991,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -125158,24 +124048,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -125204,12 +124084,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -125218,12 +124093,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -125236,12 +124106,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -125252,12 +124117,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -125286,12 +124146,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -125300,12 +124155,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -125313,12 +124163,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -125351,12 +124196,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -125415,12 +124255,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -125595,12 +124430,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -125671,12 +124501,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -125777,12 +124602,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -125793,12 +124613,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -125816,12 +124631,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -125857,12 +124667,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -125894,12 +124699,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -125908,12 +124708,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -125934,12 +124729,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -126059,12 +124849,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -126601,12 +125386,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -126664,12 +125444,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -126833,12 +125608,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -126896,12 +125666,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -126925,12 +125690,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -126983,12 +125743,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -127027,12 +125782,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -127085,18 +125835,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -127126,18 +125866,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -127163,12 +125893,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -136545,12 +135270,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -136559,12 +135279,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -136575,12 +135290,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -136591,12 +135301,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -136625,12 +135330,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -136639,12 +135339,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -142186,12 +140881,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -142204,12 +140894,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -142244,12 +140929,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -142264,12 +140944,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -142375,12 +141050,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ResponseHandler" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="handleResponse" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="response" type="org.apache.http.HttpResponse">
@@ -145706,12 +144376,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -145724,12 +144389,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -145764,12 +144424,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -145784,12 +144439,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-17.xml.in b/src/Mono.Android/Profiles/api-17.xml.in
index 76a82914229..16abaeded68 100644
--- a/src/Mono.Android/Profiles/api-17.xml.in
+++ b/src/Mono.Android/Profiles/api-17.xml.in
@@ -4596,12 +4596,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -4610,12 +4605,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -5235,12 +5225,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5259,12 +5244,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5285,18 +5265,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5367,12 +5337,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property">
         </parameter>
@@ -5444,12 +5409,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="TypeEvaluator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="evaluate" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="fraction" type="float">
@@ -9671,24 +9631,14 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="initLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -9699,12 +9649,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="restartLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -9716,12 +9661,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="LoaderManager.LoaderCallbacks" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onCreateLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="id" type="int">
@@ -13267,12 +13207,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.content.Loader" extends-generic-aware="android.content.Loader&lt;D&gt;" final="false" name="AsyncTaskLoader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTaskLoader" static="false" type="android.content.AsyncTaskLoader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -13826,12 +13761,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="openPipeHelper" native="false" return="android.os.ParcelFileDescriptor" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="uri" type="android.net.Uri">
         </parameter>
@@ -13909,12 +13839,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ContentProvider.PipeDataWriter" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="writeDataToPipe" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="output" type="android.os.ParcelFileDescriptor">
@@ -17463,12 +17388,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Loader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Loader" static="false" type="android.content.Loader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -17557,12 +17477,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCanceledListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadCanceled" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -17571,12 +17486,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCompleteListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadComplete" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -21841,12 +21751,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -38335,12 +38240,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -38353,12 +38253,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -38389,12 +38284,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -38409,12 +38299,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -48185,24 +48070,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -50080,24 +49950,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -50248,12 +50108,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -50262,12 +50117,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -50497,12 +50347,7 @@
       <implements name="android.os.Parcelable.Creator" name-generic-aware="android.os.Parcelable.Creator&lt;T&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -50513,12 +50358,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -63481,12 +63321,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="getLoaderResultSynchronously" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="loader" type="android.content.Loader&lt;T&gt;">
         </parameter>
@@ -66913,12 +66748,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -67045,12 +66875,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -67089,12 +66914,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -71362,12 +71182,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LongSparseArray" static="false" type="android.util.LongSparseArray" visibility="public">
       </constructor>
@@ -71440,18 +71255,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="LruCache" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LruCache" static="false" type="android.util.LruCache" visibility="public">
         <parameter name="maxSize" type="int">
@@ -71586,18 +71391,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -71607,18 +71402,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -71690,18 +71475,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Property" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Property" static="false" type="android.util.Property" visibility="public">
         <parameter name="type" type="java.lang.Class&lt;V&gt;">
@@ -71721,18 +71496,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="of" native="false" return="android.util.Property&lt;T, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="hostType" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -71752,12 +71517,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -82785,12 +82545,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -84975,12 +84730,7 @@
       <implements name="android.widget.Filterable" name-generic-aware="android.widget.Filterable">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -92103,12 +91853,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -97528,21 +97273,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="clazz" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -97959,12 +97694,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -98401,12 +98131,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -98603,12 +98328,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -101363,12 +101083,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -101619,12 +101334,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -101635,12 +101345,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -101653,12 +101358,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -101677,12 +101377,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -101697,12 +101392,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -102001,12 +101691,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getAnnotation" native="false" return="A" static="false" synchronized="false" visibility="public">
         <typeParameters>
@@ -107950,24 +107635,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -107976,12 +107651,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -107990,12 +107660,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -108006,24 +107671,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -109734,12 +109389,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -109754,12 +109404,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -118797,12 +118442,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -120370,12 +120010,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -120419,12 +120054,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -120434,12 +120064,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -120504,18 +120129,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -120564,18 +120179,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -120602,18 +120207,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -120638,12 +120233,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -120654,12 +120244,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -120676,12 +120261,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -120694,12 +120274,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -120786,12 +120361,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -120821,12 +120391,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -120961,12 +120526,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -120981,12 +120541,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -121045,12 +120600,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -121059,18 +120609,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -121145,12 +120685,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -121161,18 +120696,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -121529,12 +121054,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -121547,12 +121067,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -122010,12 +121525,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -122063,12 +121573,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -122077,12 +121582,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -122091,24 +121591,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -122117,12 +121607,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -122133,12 +121618,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -122147,12 +121627,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -122161,18 +121636,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -122183,12 +121648,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -122197,18 +121657,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -122219,12 +121669,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -122233,12 +121678,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -122253,60 +121693,30 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -122333,12 +121743,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -122359,12 +121764,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -122387,12 +121787,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -122401,12 +121796,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -122415,24 +121805,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -122447,22 +121827,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -122485,42 +121855,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -122541,12 +121891,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -122563,168 +121908,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -122738,12 +122003,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="lhs" type="T">
@@ -122924,12 +122184,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -123010,18 +122265,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -123062,12 +122307,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -123088,12 +122328,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -123611,18 +122846,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -123653,12 +122878,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -123691,18 +122911,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -123779,18 +122989,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -123883,12 +123083,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -123899,18 +123094,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -123949,12 +123134,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -123985,12 +123165,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -124071,12 +123246,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -124170,12 +123340,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -124185,12 +123350,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -124347,18 +123507,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -124407,18 +123557,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -124469,18 +123609,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -124569,12 +123699,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -124687,12 +123812,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -124863,12 +123983,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -125326,35 +124441,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -125363,12 +124463,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -125380,12 +124475,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -125433,12 +124523,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -125630,18 +124715,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -125668,12 +124743,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -125698,12 +124768,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -125946,18 +125011,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -126074,12 +125129,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -126234,12 +125284,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -126340,18 +125385,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -126381,12 +125416,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -126395,12 +125425,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -126413,12 +125438,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -126429,12 +125449,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -126451,12 +125466,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -126465,12 +125475,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -126481,12 +125486,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -126495,12 +125495,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -126512,12 +125507,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -126596,12 +125586,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -126748,12 +125733,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -126822,12 +125802,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -126844,12 +125819,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -126882,18 +125852,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -126962,12 +125922,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -126992,18 +125947,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -127038,18 +125983,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -127104,18 +126039,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -127258,12 +126183,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -127362,12 +126282,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -127487,12 +126402,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -127502,12 +126412,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -127660,12 +126565,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -127716,12 +126616,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -127765,12 +126660,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -127827,24 +126717,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -127873,12 +126753,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -127887,12 +126762,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -127905,12 +126775,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -127921,12 +126786,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -127955,12 +126815,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -127969,12 +126824,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -127982,12 +126832,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -128020,12 +126865,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -128084,12 +126924,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -128264,12 +127099,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -128340,12 +127170,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -128446,12 +127271,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -128462,12 +127282,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -128485,12 +127300,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -128526,12 +127336,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -128563,12 +127368,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -128577,12 +127377,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -128603,12 +127398,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -128728,12 +127518,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -129270,12 +128055,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -129333,12 +128113,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -129502,12 +128277,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -129565,12 +128335,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -129594,12 +128359,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -129652,12 +128412,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -129696,12 +128451,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -129754,18 +128504,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -129795,18 +128535,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -129832,12 +128562,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -139214,12 +137939,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -139228,12 +137948,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -139244,12 +137959,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -139260,12 +137970,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -139294,12 +137999,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -139308,12 +138008,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -144855,12 +143550,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -144873,12 +143563,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -144913,12 +143598,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -144933,12 +143613,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -145044,12 +143719,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ResponseHandler" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="handleResponse" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="response" type="org.apache.http.HttpResponse">
@@ -148375,12 +147045,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -148393,12 +147058,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -148433,12 +147093,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -148453,12 +147108,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-18.xml.in b/src/Mono.Android/Profiles/api-18.xml.in
index b3e2bdb4c6c..f52bc24c08a 100644
--- a/src/Mono.Android/Profiles/api-18.xml.in
+++ b/src/Mono.Android/Profiles/api-18.xml.in
@@ -4692,12 +4692,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -4706,12 +4701,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -5333,12 +5323,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5357,12 +5342,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5383,18 +5363,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5469,12 +5439,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property">
         </parameter>
@@ -5560,12 +5525,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="TypeEvaluator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="evaluate" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="fraction" type="float">
@@ -9829,24 +9789,14 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="initLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -9857,12 +9807,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="restartLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -9874,12 +9819,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="LoaderManager.LoaderCallbacks" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onCreateLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="id" type="int">
@@ -14083,12 +14023,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.content.Loader" extends-generic-aware="android.content.Loader&lt;D&gt;" final="false" name="AsyncTaskLoader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTaskLoader" static="false" type="android.content.AsyncTaskLoader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -14650,12 +14585,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="openPipeHelper" native="false" return="android.os.ParcelFileDescriptor" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="uri" type="android.net.Uri">
         </parameter>
@@ -14733,12 +14663,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ContentProvider.PipeDataWriter" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="writeDataToPipe" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="output" type="android.os.ParcelFileDescriptor">
@@ -18303,12 +18228,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Loader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Loader" static="false" type="android.content.Loader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -18401,12 +18321,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCanceledListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadCanceled" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -18415,12 +18330,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCompleteListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadComplete" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -22819,12 +22729,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -39913,12 +39818,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -39931,12 +39831,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -39967,12 +39862,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -39987,12 +39877,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -52105,24 +51990,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -54016,24 +53886,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -54184,12 +54044,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -54198,12 +54053,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -54433,12 +54283,7 @@
       <implements name="android.os.Parcelable.Creator" name-generic-aware="android.os.Parcelable.Creator&lt;T&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -54449,12 +54294,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -67081,12 +66921,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="getLoaderResultSynchronously" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="loader" type="android.content.Loader&lt;T&gt;">
         </parameter>
@@ -70589,12 +70424,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -70721,12 +70551,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -70765,12 +70590,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -75094,12 +74914,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LongSparseArray" static="false" type="android.util.LongSparseArray" visibility="public">
       </constructor>
@@ -75172,18 +74987,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="LruCache" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LruCache" static="false" type="android.util.LruCache" visibility="public">
         <parameter name="maxSize" type="int">
@@ -75318,18 +75123,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -75339,18 +75134,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -75422,18 +75207,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Property" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Property" static="false" type="android.util.Property" visibility="public">
         <parameter name="type" type="java.lang.Class&lt;V&gt;">
@@ -75453,18 +75228,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="of" native="false" return="android.util.Property&lt;T, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="hostType" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -75484,12 +75249,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -86763,12 +86523,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -88941,12 +88696,7 @@
       <implements name="android.widget.Filterable" name-generic-aware="android.widget.Filterable">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -96101,12 +95851,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -101526,21 +101271,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -101957,12 +101692,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -102399,12 +102129,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -102601,12 +102326,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -105361,12 +105081,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -105617,12 +105332,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -105633,12 +105343,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -105651,12 +105356,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -105675,12 +105375,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -105695,12 +105390,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -105999,12 +105689,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getAnnotation" native="false" return="A" static="false" synchronized="false" visibility="public">
         <typeParameters>
@@ -111948,24 +111633,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -111974,12 +111649,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -111988,12 +111658,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -112004,24 +111669,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -113732,12 +113387,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -113752,12 +113402,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -122795,12 +122440,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -124368,12 +124008,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -124417,12 +124052,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -124432,12 +124062,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -124502,18 +124127,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -124562,18 +124177,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -124600,18 +124205,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -124636,12 +124231,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -124652,12 +124242,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -124674,12 +124259,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -124692,12 +124272,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -124784,12 +124359,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -124819,12 +124389,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -124959,12 +124524,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -124979,12 +124539,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -125043,12 +124598,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -125057,18 +124607,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -125143,12 +124683,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -125159,18 +124694,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -125527,12 +125052,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -125545,12 +125065,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -126008,12 +125523,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -126061,12 +125571,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -126075,12 +125580,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -126089,24 +125589,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -126115,12 +125605,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -126131,12 +125616,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -126145,12 +125625,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -126159,18 +125634,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -126181,12 +125646,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -126195,18 +125655,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -126217,12 +125667,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -126231,12 +125676,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -126251,60 +125691,30 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -126331,12 +125741,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -126357,12 +125762,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -126385,12 +125785,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -126399,12 +125794,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -126413,24 +125803,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -126445,22 +125825,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -126483,42 +125853,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -126539,12 +125889,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -126561,168 +125906,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -126736,12 +126001,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="lhs" type="T">
@@ -126922,12 +126182,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -127008,18 +126263,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -127060,12 +126305,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -127086,12 +126326,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -127609,18 +126844,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -127651,12 +126876,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -127689,18 +126909,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -127777,18 +126987,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -127881,12 +127081,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -127897,18 +127092,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -127947,12 +127132,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -127983,12 +127163,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -128069,12 +127244,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -128168,12 +127338,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -128183,12 +127348,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -128345,18 +127505,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -128405,18 +127555,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -128467,18 +127607,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -128567,12 +127697,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -128685,12 +127810,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -128861,12 +127981,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -129324,35 +128439,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -129361,12 +128461,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -129378,12 +128473,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -129431,12 +128521,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -129628,18 +128713,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -129666,12 +128741,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -129696,12 +128766,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -129944,18 +129009,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -130072,12 +129127,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -130232,12 +129282,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -130338,18 +129383,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -130379,12 +129414,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -130393,12 +129423,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -130411,12 +129436,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -130427,12 +129447,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -130449,12 +129464,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -130463,12 +129473,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -130479,12 +129484,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -130493,12 +129493,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -130510,12 +129505,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -130594,12 +129584,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -130746,12 +129731,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -130820,12 +129800,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -130842,12 +129817,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -130880,18 +129850,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -130960,12 +129920,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -130990,18 +129945,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -131036,18 +129981,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -131102,18 +130037,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -131256,12 +130181,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -131360,12 +130280,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -131485,12 +130400,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -131500,12 +130410,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -131658,12 +130563,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -131714,12 +130614,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -131763,12 +130658,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -131825,24 +130715,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -131871,12 +130751,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -131885,12 +130760,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -131903,12 +130773,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -131919,12 +130784,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -131953,12 +130813,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -131967,12 +130822,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -131980,12 +130830,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -132018,12 +130863,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -132082,12 +130922,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -132262,12 +131097,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -132338,12 +131168,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -132444,12 +131269,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -132460,12 +131280,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -132483,12 +131298,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -132524,12 +131334,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -132561,12 +131366,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -132575,12 +131375,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -132601,12 +131396,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -132726,12 +131516,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -133268,12 +132053,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -133331,12 +132111,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -133500,12 +132275,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -133563,12 +132333,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -133592,12 +132357,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -133650,12 +132410,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -133694,12 +132449,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -133752,18 +132502,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -133793,18 +132533,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -133830,12 +132560,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -143212,12 +141937,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -143226,12 +141946,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -143242,12 +141957,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -143258,12 +141968,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -143292,12 +141997,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -143306,12 +142006,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -148853,12 +147548,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -148871,12 +147561,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -148911,12 +147596,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -148931,12 +147611,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -149042,12 +147717,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ResponseHandler" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="handleResponse" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="response" type="org.apache.http.HttpResponse">
@@ -152373,12 +151043,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -152391,12 +151056,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -152431,12 +151091,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -152451,12 +151106,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-19.xml.in b/src/Mono.Android/Profiles/api-19.xml.in
index 75c996d3009..40a09555af0 100644
--- a/src/Mono.Android/Profiles/api-19.xml.in
+++ b/src/Mono.Android/Profiles/api-19.xml.in
@@ -4768,12 +4768,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -4782,12 +4777,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -5443,12 +5433,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5467,12 +5452,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5493,18 +5473,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5579,12 +5549,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property">
         </parameter>
@@ -5670,12 +5635,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="TypeEvaluator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="evaluate" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="fraction" type="float">
@@ -10069,24 +10029,14 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="initLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -10097,12 +10047,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="restartLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -10114,12 +10059,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="LoaderManager.LoaderCallbacks" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onCreateLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="id" type="int">
@@ -14701,12 +14641,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.content.Loader" extends-generic-aware="android.content.Loader&lt;D&gt;" final="false" name="AsyncTaskLoader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTaskLoader" static="false" type="android.content.AsyncTaskLoader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -15294,12 +15229,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="openPipeHelper" native="false" return="android.os.ParcelFileDescriptor" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="uri" type="android.net.Uri">
         </parameter>
@@ -15393,12 +15323,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ContentProvider.PipeDataWriter" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="writeDataToPipe" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="output" type="android.os.ParcelFileDescriptor">
@@ -19129,12 +19054,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Loader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Loader" static="false" type="android.content.Loader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -19227,12 +19147,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCanceledListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadCanceled" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -19241,12 +19156,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCompleteListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadComplete" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -23785,12 +23695,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -41621,12 +41526,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -41639,12 +41539,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -41675,12 +41570,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -41695,12 +41585,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -53945,24 +53830,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -55856,24 +55726,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -56024,12 +55884,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -56038,12 +55893,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -56273,12 +56123,7 @@
       <implements name="android.os.Parcelable.Creator" name-generic-aware="android.os.Parcelable.Creator&lt;T&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -56289,12 +56134,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -70750,12 +70590,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="getLoaderResultSynchronously" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="loader" type="android.content.Loader&lt;T&gt;">
         </parameter>
@@ -74280,12 +74115,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -74412,12 +74242,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -74456,12 +74281,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -78403,18 +78223,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayMap" static="false" type="android.util.ArrayMap" visibility="public">
       </constructor>
@@ -79267,12 +79077,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LongSparseArray" static="false" type="android.util.LongSparseArray" visibility="public">
       </constructor>
@@ -79345,18 +79150,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="LruCache" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LruCache" static="false" type="android.util.LruCache" visibility="public">
         <parameter name="maxSize" type="int">
@@ -79491,18 +79286,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -79512,18 +79297,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -79595,18 +79370,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Property" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Property" static="false" type="android.util.Property" visibility="public">
         <parameter name="type" type="java.lang.Class&lt;V&gt;">
@@ -79626,18 +79391,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="of" native="false" return="android.util.Property&lt;T, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="hostType" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -79657,12 +79412,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -91356,12 +91106,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -93564,12 +93309,7 @@
       <implements name="android.widget.Filterable" name-generic-aware="android.widget.Filterable">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -100774,12 +100514,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -106427,21 +106162,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -106858,12 +106583,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -107300,12 +107020,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -107508,12 +107223,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -110310,12 +110020,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -110582,12 +110287,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -110598,12 +110298,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -110616,12 +110311,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -110640,12 +110330,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -110660,12 +110345,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -110964,12 +110644,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getAnnotation" native="false" return="A" static="false" synchronized="false" visibility="public">
         <typeParameters>
@@ -116969,24 +116644,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -116995,12 +116660,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -117009,12 +116669,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -117025,24 +116680,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -118753,12 +118398,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -118773,12 +118413,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -127822,12 +127457,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -129395,12 +129025,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -129444,12 +129069,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -129459,12 +129079,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -129529,18 +129144,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -129589,18 +129194,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -129627,18 +129222,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -129663,12 +129248,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -129679,12 +129259,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -129701,12 +129276,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -129719,12 +129289,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -129811,12 +129376,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -129846,12 +129406,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -129986,12 +129541,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -130006,12 +129556,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -130070,12 +129615,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -130084,18 +129624,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -130170,12 +129700,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -130186,18 +129711,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -130554,12 +130069,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -130572,12 +130082,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -131063,12 +130568,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -131116,12 +130616,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -131130,12 +130625,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -131144,24 +130634,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -131170,12 +130650,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -131186,12 +130661,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -131200,12 +130670,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -131214,18 +130679,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -131236,12 +130691,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -131250,18 +130700,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -131272,12 +130712,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -131286,12 +130721,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -131306,90 +130736,45 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyEnumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyIterator" native="false" return="java.util.Iterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyListIterator" native="false" return="java.util.ListIterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -131416,12 +130801,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -131442,12 +130822,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -131470,12 +130845,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -131484,12 +130854,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -131498,24 +130863,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -131530,22 +130885,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -131568,42 +130913,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -131624,12 +130949,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -131646,168 +130966,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -131821,12 +131061,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="lhs" type="T">
@@ -132025,12 +131260,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -132111,18 +131341,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -132163,12 +131383,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -132189,12 +131404,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -132712,18 +131922,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -132754,12 +131954,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -132792,18 +131987,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -132880,18 +132065,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -132984,12 +132159,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -133000,18 +132170,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -133050,12 +132210,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -133086,12 +132241,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -133172,12 +132322,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -133271,12 +132416,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -133286,12 +132426,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -133448,18 +132583,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -133508,18 +132633,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -133570,18 +132685,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -133670,12 +132775,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -133751,12 +132851,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="Objects" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="a" type="T">
         </parameter>
@@ -133787,24 +132882,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
@@ -133862,12 +132947,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -134038,12 +133118,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -134503,35 +133578,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -134540,12 +133600,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -134557,12 +133612,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -134610,12 +133660,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -134807,18 +133852,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -134845,12 +133880,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -134875,12 +133905,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -135123,18 +134148,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -135251,12 +134266,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -135411,12 +134421,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -135517,18 +134522,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -135558,12 +134553,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -135572,12 +134562,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -135590,12 +134575,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -135606,12 +134586,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -135628,12 +134603,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -135642,12 +134612,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -135658,12 +134623,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -135672,12 +134632,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -135689,12 +134644,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -135773,12 +134723,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -135925,12 +134870,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -135999,12 +134939,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -136021,12 +134956,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -136059,18 +134989,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -136139,12 +135059,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -136169,18 +135084,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -136215,18 +135120,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -136281,18 +135176,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -136435,12 +135320,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -136539,12 +135419,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -136664,12 +135539,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -136679,12 +135549,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -136837,12 +135702,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -136893,12 +135753,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -136942,12 +135797,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -137004,24 +135854,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -137050,12 +135890,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -137064,12 +135899,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -137082,12 +135912,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -137098,12 +135923,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -137132,12 +135952,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -137146,12 +135961,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -137159,12 +135969,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -137197,12 +136002,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -137261,12 +136061,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -137441,12 +136236,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -137517,12 +136307,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -137623,12 +136408,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -137639,12 +136419,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -137662,12 +136437,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -137703,12 +136473,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -137740,12 +136505,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -137754,12 +136514,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -137780,12 +136535,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -137905,12 +136655,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -138447,12 +137192,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -138510,12 +137250,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -138679,12 +137414,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -138742,12 +137472,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -138771,12 +137496,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -138829,12 +137549,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -138873,12 +137588,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -138931,18 +137641,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -138972,18 +137672,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -139009,12 +137699,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -148515,12 +147200,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -148529,12 +147209,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -148545,12 +147220,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -148561,12 +147231,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -148595,12 +147260,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -148609,12 +147269,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -154156,12 +152811,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -154174,12 +152824,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -154214,12 +152859,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -154234,12 +152874,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -154345,12 +152980,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ResponseHandler" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="handleResponse" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="response" type="org.apache.http.HttpResponse">
@@ -157676,12 +156306,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -157694,12 +156319,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -157734,12 +156354,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -157754,12 +156369,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-20.xml.in b/src/Mono.Android/Profiles/api-20.xml.in
index b606175b882..50ee21f2b7f 100644
--- a/src/Mono.Android/Profiles/api-20.xml.in
+++ b/src/Mono.Android/Profiles/api-20.xml.in
@@ -4774,12 +4774,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -4788,12 +4783,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -5449,12 +5439,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5473,12 +5458,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5499,18 +5479,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -5585,12 +5555,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property">
         </parameter>
@@ -5676,12 +5641,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="TypeEvaluator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="evaluate" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="fraction" type="float">
@@ -10075,24 +10035,14 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="initLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -10103,12 +10053,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="restartLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -10120,12 +10065,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="LoaderManager.LoaderCallbacks" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onCreateLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="id" type="int">
@@ -15005,12 +14945,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.content.Loader" extends-generic-aware="android.content.Loader&lt;D&gt;" final="false" name="AsyncTaskLoader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTaskLoader" static="false" type="android.content.AsyncTaskLoader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -15598,12 +15533,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="openPipeHelper" native="false" return="android.os.ParcelFileDescriptor" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="uri" type="android.net.Uri">
         </parameter>
@@ -15697,12 +15627,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ContentProvider.PipeDataWriter" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="writeDataToPipe" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="output" type="android.os.ParcelFileDescriptor">
@@ -19433,12 +19358,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Loader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Loader" static="false" type="android.content.Loader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -19531,12 +19451,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCanceledListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadCanceled" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -19545,12 +19460,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCompleteListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadComplete" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -24133,12 +24043,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -42025,12 +41930,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -42043,12 +41943,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -42079,12 +41974,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -42099,12 +41989,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -54349,24 +54234,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -56262,24 +56132,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -56430,12 +56290,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -56444,12 +56299,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -56679,12 +56529,7 @@
       <implements name="android.os.Parcelable.Creator" name-generic-aware="android.os.Parcelable.Creator&lt;T&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -56695,12 +56540,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -71184,12 +71024,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="getLoaderResultSynchronously" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="loader" type="android.content.Loader&lt;T&gt;">
         </parameter>
@@ -74736,12 +74571,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -74868,12 +74698,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -74912,12 +74737,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -78859,18 +78679,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayMap" static="false" type="android.util.ArrayMap" visibility="public">
       </constructor>
@@ -79723,12 +79533,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LongSparseArray" static="false" type="android.util.LongSparseArray" visibility="public">
       </constructor>
@@ -79801,18 +79606,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="LruCache" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LruCache" static="false" type="android.util.LruCache" visibility="public">
         <parameter name="maxSize" type="int">
@@ -79947,18 +79742,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -79968,18 +79753,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -80051,18 +79826,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Property" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Property" static="false" type="android.util.Property" visibility="public">
         <parameter name="type" type="java.lang.Class&lt;V&gt;">
@@ -80082,18 +79847,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="of" native="false" return="android.util.Property&lt;T, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="hostType" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -80113,12 +79868,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -91876,12 +91626,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -94084,12 +93829,7 @@
       <implements name="android.widget.Filterable" name-generic-aware="android.widget.Filterable">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -101294,12 +101034,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -106947,21 +106682,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -107378,12 +107103,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -107820,12 +107540,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -108028,12 +107743,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -110830,12 +110540,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -111102,12 +110807,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -111118,12 +110818,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -111136,12 +110831,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -111160,12 +110850,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -111180,12 +110865,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -111484,12 +111164,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getAnnotation" native="false" return="A" static="false" synchronized="false" visibility="public">
         <typeParameters>
@@ -117489,24 +117164,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -117515,12 +117180,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -117529,12 +117189,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -117545,24 +117200,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -119273,12 +118918,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -119293,12 +118933,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -128342,12 +127977,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -129915,12 +129545,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -129964,12 +129589,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -129979,12 +129599,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -130049,18 +129664,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -130109,18 +129714,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -130147,18 +129742,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -130183,12 +129768,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -130199,12 +129779,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -130221,12 +129796,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -130239,12 +129809,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -130331,12 +129896,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -130366,12 +129926,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -130506,12 +130061,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -130526,12 +130076,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -130590,12 +130135,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -130604,18 +130144,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -130690,12 +130220,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -130706,18 +130231,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -131074,12 +130589,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -131092,12 +130602,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -131583,12 +131088,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -131636,12 +131136,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -131650,12 +131145,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -131664,24 +131154,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -131690,12 +131170,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -131706,12 +131181,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -131720,12 +131190,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -131734,18 +131199,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -131756,12 +131211,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -131770,18 +131220,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -131792,12 +131232,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -131806,12 +131241,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -131826,90 +131256,45 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyEnumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyIterator" native="false" return="java.util.Iterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyListIterator" native="false" return="java.util.ListIterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -131936,12 +131321,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -131962,12 +131342,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -131990,12 +131365,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -132004,12 +131374,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -132018,24 +131383,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -132050,22 +131405,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -132088,42 +131433,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -132144,12 +131469,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -132166,168 +131486,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -132341,12 +131581,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="lhs" type="T">
@@ -132545,12 +131780,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -132631,18 +131861,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -132683,12 +131903,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -132709,12 +131924,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -133232,18 +132442,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -133274,12 +132474,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -133312,18 +132507,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -133400,18 +132585,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -133504,12 +132679,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -133520,18 +132690,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -133570,12 +132730,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -133606,12 +132761,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -133692,12 +132842,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -133791,12 +132936,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -133806,12 +132946,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -133968,18 +133103,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -134028,18 +133153,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -134090,18 +133205,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -134190,12 +133295,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -134271,12 +133371,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="Objects" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="a" type="T">
         </parameter>
@@ -134307,24 +133402,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
@@ -134382,12 +133467,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -134558,12 +133638,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -135023,35 +134098,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -135060,12 +134120,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -135077,12 +134132,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -135130,12 +134180,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -135327,18 +134372,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -135365,12 +134400,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -135395,12 +134425,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -135643,18 +134668,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -135771,12 +134786,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -135931,12 +134941,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -136037,18 +135042,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -136078,12 +135073,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -136092,12 +135082,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -136110,12 +135095,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -136126,12 +135106,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -136148,12 +135123,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -136162,12 +135132,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -136178,12 +135143,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -136192,12 +135152,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -136209,12 +135164,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -136293,12 +135243,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -136445,12 +135390,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -136519,12 +135459,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -136541,12 +135476,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -136579,18 +135509,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -136659,12 +135579,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -136689,18 +135604,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -136735,18 +135640,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -136801,18 +135696,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -136955,12 +135840,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -137059,12 +135939,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -137184,12 +136059,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -137199,12 +136069,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -137357,12 +136222,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -137413,12 +136273,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -137462,12 +136317,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -137524,24 +136374,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -137570,12 +136410,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -137584,12 +136419,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -137602,12 +136432,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -137618,12 +136443,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -137652,12 +136472,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -137666,12 +136481,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -137679,12 +136489,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -137717,12 +136522,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -137781,12 +136581,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -137961,12 +136756,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -138037,12 +136827,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -138143,12 +136928,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -138159,12 +136939,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -138182,12 +136957,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -138223,12 +136993,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -138260,12 +137025,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -138274,12 +137034,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -138300,12 +137055,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -138425,12 +137175,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -138967,12 +137712,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -139030,12 +137770,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -139199,12 +137934,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -139262,12 +137992,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -139291,12 +138016,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -139349,12 +138069,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -139393,12 +138108,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -139451,18 +138161,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -139492,18 +138192,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -139529,12 +138219,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -149035,12 +147720,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -149049,12 +147729,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -149065,12 +147740,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -149081,12 +147751,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -149115,12 +147780,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -149129,12 +147789,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -154676,12 +153331,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -154694,12 +153344,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -154734,12 +153379,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -154754,12 +153394,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -154865,12 +153500,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ResponseHandler" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="handleResponse" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="response" type="org.apache.http.HttpResponse">
@@ -158196,12 +156826,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -158214,12 +156839,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -158254,12 +156874,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -158274,12 +156889,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-21.xml.in b/src/Mono.Android/Profiles/api-21.xml.in
index b9182dfe371..1d744279dbe 100644
--- a/src/Mono.Android/Profiles/api-21.xml.in
+++ b/src/Mono.Android/Profiles/api-21.xml.in
@@ -5686,12 +5686,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -5700,12 +5695,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -6106,18 +6096,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.animation.TypeConverter" extends-generic-aware="android.animation.TypeConverter&lt;T, V&gt;" final="false" name="BidirectionalTypeConverter" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="BidirectionalTypeConverter" static="false" type="android.animation.BidirectionalTypeConverter" visibility="public">
         <parameter name="fromClass" type="java.lang.Class&lt;T&gt;">
@@ -6433,12 +6413,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofArgb" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6467,12 +6442,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6485,12 +6455,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6519,12 +6484,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6537,12 +6497,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6553,12 +6508,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="java.lang.Object">
         </parameter>
@@ -6589,12 +6539,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="java.lang.Object">
         </parameter>
@@ -6645,24 +6590,9 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="P">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
+          <typeParameter name="P"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6677,18 +6607,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6701,18 +6621,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6805,12 +6715,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiFloat" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6823,12 +6728,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiFloat" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6853,12 +6753,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiInt" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6871,12 +6766,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiInt" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6901,12 +6791,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property">
         </parameter>
@@ -6917,12 +6802,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property&lt;?, V&gt;">
         </parameter>
@@ -6933,18 +6813,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property&lt;?, V&gt;">
         </parameter>
@@ -7060,18 +6930,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="TypeConverter" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TypeConverter" static="false" type="android.animation.TypeConverter" visibility="public">
         <parameter name="fromClass" type="java.lang.Class&lt;T&gt;">
@@ -7086,12 +6946,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="TypeEvaluator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="evaluate" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="fraction" type="float">
@@ -11839,24 +11694,14 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="initLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -11867,12 +11712,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="restartLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -11884,12 +11724,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="LoaderManager.LoaderCallbacks" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onCreateLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="id" type="int">
@@ -18173,12 +18008,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.content.Loader" extends-generic-aware="android.content.Loader&lt;D&gt;" final="false" name="AsyncTaskLoader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTaskLoader" static="false" type="android.content.AsyncTaskLoader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -18766,12 +18596,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="openPipeHelper" native="false" return="android.os.ParcelFileDescriptor" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="uri" type="android.net.Uri">
         </parameter>
@@ -18865,12 +18690,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ContentProvider.PipeDataWriter" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="writeDataToPipe" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="output" type="android.os.ParcelFileDescriptor">
@@ -22667,12 +22487,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Loader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Loader" static="false" type="android.content.Loader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -22765,12 +22580,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCanceledListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadCanceled" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -22779,12 +22589,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCompleteListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadComplete" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -28005,12 +27810,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -37437,12 +37237,7 @@
     <class abstract="false" deprecated="not deprecated" extends="android.hardware.camera2.CameraMetadata" extends-generic-aware="android.hardware.camera2.CameraMetadata&lt;android.hardware.camera2.CameraCharacteristics.Key&lt;?&gt;&gt;" final="true" name="CameraCharacteristics" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CameraCharacteristics.Key&lt;T&gt;">
         </parameter>
@@ -37582,12 +37377,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="CameraCharacteristics.Key" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="true" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="o" type="java.lang.Object">
@@ -37712,12 +37502,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="CameraMetadata" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="TKey">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="TKey"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getKeys" native="false" return="java.util.List&lt;TKey&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -38095,12 +37880,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureRequest.Key&lt;T&gt;">
         </parameter>
@@ -38223,12 +38003,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureRequest.Key&lt;T&gt;">
         </parameter>
@@ -38239,12 +38014,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="set" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureRequest.Key&lt;T&gt;">
         </parameter>
@@ -38258,12 +38028,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="CaptureRequest.Key" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="true" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="o" type="java.lang.Object">
@@ -38277,12 +38042,7 @@
     <class abstract="false" deprecated="not deprecated" extends="android.hardware.camera2.CameraMetadata" extends-generic-aware="android.hardware.camera2.CameraMetadata&lt;android.hardware.camera2.CaptureResult.Key&lt;?&gt;&gt;" final="false" name="CaptureResult" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureResult.Key&lt;T&gt;">
         </parameter>
@@ -38426,12 +38186,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="CaptureResult.Key" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="true" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="o" type="java.lang.Object">
@@ -38725,12 +38480,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getOutputMinFrameDuration" native="false" return="long" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -38743,12 +38493,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getOutputSizes" native="false" return="android.util.Size[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -38761,12 +38506,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getOutputStallDuration" native="false" return="long" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -38783,12 +38523,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="isOutputSupportedFor" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -50879,12 +50614,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -50897,12 +50627,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -50933,12 +50658,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -50953,12 +50673,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -65543,24 +65258,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -67534,24 +67234,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -67708,12 +67398,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -67722,12 +67407,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -67969,12 +67649,7 @@
       <implements name="android.os.Parcelable.Creator" name-generic-aware="android.os.Parcelable.Creator&lt;T&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -67985,12 +67660,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -80777,12 +80447,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="MediaBrowserService.Result" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="detach" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -86050,12 +85715,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="getLoaderResultSynchronously" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="loader" type="android.content.Loader&lt;T&gt;">
         </parameter>
@@ -89646,12 +89306,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -89778,12 +89433,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -89822,12 +89472,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -94761,18 +94406,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayMap" static="false" type="android.util.ArrayMap" visibility="public">
       </constructor>
@@ -95631,12 +95266,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LongSparseArray" static="false" type="android.util.LongSparseArray" visibility="public">
       </constructor>
@@ -95709,18 +95339,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="LruCache" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LruCache" static="false" type="android.util.LruCache" visibility="public">
         <parameter name="maxSize" type="int">
@@ -95923,18 +95543,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -95944,18 +95554,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -96027,18 +95627,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Property" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Property" static="false" type="android.util.Property" visibility="public">
         <parameter name="type" type="java.lang.Class&lt;V&gt;">
@@ -96058,18 +95648,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="of" native="false" return="android.util.Property&lt;T, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="hostType" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -96243,12 +95823,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -109100,12 +108675,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -111634,12 +111204,7 @@
       <implements name="android.widget.Filterable" name-generic-aware="android.widget.Filterable">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -119700,12 +119265,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -125353,21 +124913,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -125784,12 +125334,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -126226,12 +125771,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -126434,12 +125974,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -129236,12 +128771,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -129508,12 +129038,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -129524,12 +129049,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -129542,12 +129062,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -129566,12 +129081,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -129586,12 +129096,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -129890,12 +129395,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getAnnotation" native="false" return="A" static="false" synchronized="false" visibility="public">
         <typeParameters>
@@ -135895,24 +135395,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -135921,12 +135411,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -135935,12 +135420,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -135951,24 +135431,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -137679,12 +137149,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -137699,12 +137164,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -146748,12 +146208,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -148321,12 +147776,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -148370,12 +147820,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -148385,12 +147830,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -148455,18 +147895,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -148515,18 +147945,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -148553,18 +147973,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -148589,12 +147999,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -148605,12 +148010,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -148627,12 +148027,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -148645,12 +148040,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -148737,12 +148127,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -148772,12 +148157,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -148912,12 +148292,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -148932,12 +148307,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -148996,12 +148366,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -149010,18 +148375,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -149096,12 +148451,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -149112,18 +148462,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -149480,12 +148820,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -149498,12 +148833,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -149989,12 +149319,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -150042,12 +149367,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -150056,12 +149376,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -150070,24 +149385,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -150096,12 +149401,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -150112,12 +149412,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -150126,12 +149421,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -150140,18 +149430,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -150162,12 +149442,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -150176,18 +149451,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -150198,12 +149463,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -150212,12 +149472,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -150232,90 +149487,45 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyEnumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyIterator" native="false" return="java.util.Iterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyListIterator" native="false" return="java.util.ListIterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -150342,12 +149552,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -150368,12 +149573,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -150396,12 +149596,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -150410,12 +149605,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -150424,24 +149614,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -150456,22 +149636,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -150494,42 +149664,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -150550,12 +149700,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -150572,168 +149717,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -150747,12 +149812,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="lhs" type="T">
@@ -150951,12 +150011,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -151037,18 +150092,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -151089,12 +150134,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -151115,12 +150155,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -151638,18 +150673,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -151680,12 +150705,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -151718,18 +150738,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -151806,18 +150816,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -151926,12 +150926,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -151942,18 +150937,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -151992,12 +150977,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -152028,12 +151008,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -152114,12 +151089,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -152213,12 +151183,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -152228,12 +151193,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -152476,18 +151436,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -152536,18 +151486,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -152598,18 +151538,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -152698,12 +151628,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -152779,12 +151704,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="Objects" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="a" type="T">
         </parameter>
@@ -152815,24 +151735,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
@@ -152890,12 +151800,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -153066,12 +151971,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -153531,35 +152431,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -153568,12 +152453,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -153585,12 +152465,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -153638,12 +152513,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -153835,18 +152705,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -153873,12 +152733,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -153903,12 +152758,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -154151,18 +153001,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -154279,12 +153119,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -154439,12 +153274,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -154545,18 +153375,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -154586,12 +153406,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -154600,12 +153415,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -154618,12 +153428,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -154634,12 +153439,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -154656,12 +153456,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -154670,12 +153465,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -154686,12 +153476,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -154700,12 +153485,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -154717,12 +153497,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -154801,12 +153576,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -154953,12 +153723,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -155027,12 +153792,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -155049,12 +153809,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -155087,18 +153842,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -155167,12 +153912,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedDeque" static="false" type="java.util.concurrent.ConcurrentLinkedDeque" visibility="public">
       </constructor>
@@ -155251,12 +153991,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -155281,18 +154016,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -155327,18 +154052,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -155393,18 +154108,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -155547,12 +154252,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -155651,12 +154351,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -155776,12 +154471,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -155791,12 +154481,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -155949,12 +154634,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -156005,12 +154685,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -156054,12 +154729,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -156116,24 +154786,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -156162,12 +154822,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -156176,12 +154831,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -156194,12 +154844,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -156210,12 +154855,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -156244,12 +154884,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -156258,12 +154893,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -156336,12 +154966,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invoke" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.ForkJoinTask&lt;T&gt;">
         </parameter>
@@ -156368,12 +154993,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.ForkJoinTask&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.ForkJoinTask&lt;T&gt;">
         </parameter>
@@ -156401,12 +155021,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ForkJoinTask" static="false" type="java.util.concurrent.ForkJoinTask" visibility="public">
       </constructor>
@@ -156416,12 +155031,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="adapt" native="false" return="java.util.concurrent.ForkJoinTask&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -156430,12 +155040,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="adapt" native="false" return="java.util.concurrent.ForkJoinTask&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;? extends T&gt;">
         </parameter>
@@ -156559,12 +155164,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -156597,12 +155197,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -156661,12 +155256,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -156841,12 +155431,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -156917,12 +155502,7 @@
       <implements name="java.util.concurrent.TransferQueue" name-generic-aware="java.util.concurrent.TransferQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedTransferQueue" static="false" type="java.util.concurrent.LinkedTransferQueue" visibility="public">
       </constructor>
@@ -157083,12 +155663,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -157173,12 +155748,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.concurrent.ForkJoinTask" extends-generic-aware="java.util.concurrent.ForkJoinTask&lt;V&gt;" final="false" name="RecursiveTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="RecursiveTask" static="false" type="java.util.concurrent.RecursiveTask" visibility="public">
       </constructor>
@@ -157225,12 +155795,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -157241,12 +155806,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -157264,12 +155824,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -157305,12 +155860,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -157342,12 +155892,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -157356,12 +155901,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -157384,12 +155924,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -157513,12 +156048,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -157909,12 +156439,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="getWaitingConsumerCount" native="false" return="int" static="false" synchronized="false" visibility="public">
       </method>
@@ -158121,12 +156646,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -158184,12 +156704,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -158353,12 +156868,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -158416,12 +156926,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -158445,12 +156950,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -158503,12 +157003,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -158547,12 +157042,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -158605,18 +157095,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -158646,18 +157126,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -158683,12 +157153,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -168513,12 +166978,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -168527,12 +166987,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -168543,12 +166998,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -168559,12 +167009,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -168593,12 +167038,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -168607,12 +167047,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -174154,12 +172589,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -174172,12 +172602,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -174212,12 +172637,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -174232,12 +172652,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -174343,12 +172758,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ResponseHandler" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="handleResponse" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="response" type="org.apache.http.HttpResponse">
@@ -177674,12 +176084,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -177692,12 +176097,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -177732,12 +176132,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -177752,12 +176147,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-22.xml.in b/src/Mono.Android/Profiles/api-22.xml.in
index 970dc7637d9..11f9dfc63d7 100644
--- a/src/Mono.Android/Profiles/api-22.xml.in
+++ b/src/Mono.Android/Profiles/api-22.xml.in
@@ -5720,12 +5720,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -5734,12 +5729,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -6140,18 +6130,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.animation.TypeConverter" extends-generic-aware="android.animation.TypeConverter&lt;T, V&gt;" final="false" name="BidirectionalTypeConverter" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="BidirectionalTypeConverter" static="false" type="android.animation.BidirectionalTypeConverter" visibility="public">
         <parameter name="fromClass" type="java.lang.Class&lt;T&gt;">
@@ -6467,12 +6447,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofArgb" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6501,12 +6476,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6519,12 +6489,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6553,12 +6518,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6571,12 +6531,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6587,12 +6542,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="java.lang.Object">
         </parameter>
@@ -6623,12 +6573,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="java.lang.Object">
         </parameter>
@@ -6679,24 +6624,9 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="P">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
+          <typeParameter name="P"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6711,18 +6641,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6735,18 +6655,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6839,12 +6749,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiFloat" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6857,12 +6762,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiFloat" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6887,12 +6787,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiInt" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6905,12 +6800,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiInt" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6935,12 +6825,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property">
         </parameter>
@@ -6951,12 +6836,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property&lt;?, V&gt;">
         </parameter>
@@ -6967,18 +6847,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property&lt;?, V&gt;">
         </parameter>
@@ -7098,18 +6968,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="TypeConverter" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TypeConverter" static="false" type="android.animation.TypeConverter" visibility="public">
         <parameter name="fromClass" type="java.lang.Class&lt;T&gt;">
@@ -7124,12 +6984,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="TypeEvaluator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="evaluate" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="fraction" type="float">
@@ -11885,24 +11740,14 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="initLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -11913,12 +11758,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="restartLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -11930,12 +11770,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="LoaderManager.LoaderCallbacks" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onCreateLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="id" type="int">
@@ -18265,12 +18100,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.content.Loader" extends-generic-aware="android.content.Loader&lt;D&gt;" final="false" name="AsyncTaskLoader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTaskLoader" static="false" type="android.content.AsyncTaskLoader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -18858,12 +18688,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="openPipeHelper" native="false" return="android.os.ParcelFileDescriptor" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="uri" type="android.net.Uri">
         </parameter>
@@ -18957,12 +18782,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ContentProvider.PipeDataWriter" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="writeDataToPipe" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="output" type="android.os.ParcelFileDescriptor">
@@ -22781,12 +22601,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Loader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Loader" static="false" type="android.content.Loader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -22879,12 +22694,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCanceledListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadCanceled" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -22893,12 +22703,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCompleteListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadComplete" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -28131,12 +27936,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -37569,12 +37369,7 @@
     <class abstract="false" deprecated="not deprecated" extends="android.hardware.camera2.CameraMetadata" extends-generic-aware="android.hardware.camera2.CameraMetadata&lt;android.hardware.camera2.CameraCharacteristics.Key&lt;?&gt;&gt;" final="true" name="CameraCharacteristics" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CameraCharacteristics.Key&lt;T&gt;">
         </parameter>
@@ -37714,12 +37509,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="CameraCharacteristics.Key" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="true" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="o" type="java.lang.Object">
@@ -37844,12 +37634,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="CameraMetadata" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="TKey">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="TKey"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getKeys" native="false" return="java.util.List&lt;TKey&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -38233,12 +38018,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureRequest.Key&lt;T&gt;">
         </parameter>
@@ -38361,12 +38141,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureRequest.Key&lt;T&gt;">
         </parameter>
@@ -38377,12 +38152,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="set" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureRequest.Key&lt;T&gt;">
         </parameter>
@@ -38396,12 +38166,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="CaptureRequest.Key" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="true" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="o" type="java.lang.Object">
@@ -38415,12 +38180,7 @@
     <class abstract="false" deprecated="not deprecated" extends="android.hardware.camera2.CameraMetadata" extends-generic-aware="android.hardware.camera2.CameraMetadata&lt;android.hardware.camera2.CaptureResult.Key&lt;?&gt;&gt;" final="false" name="CaptureResult" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureResult.Key&lt;T&gt;">
         </parameter>
@@ -38564,12 +38324,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="CaptureResult.Key" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="true" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="o" type="java.lang.Object">
@@ -38863,12 +38618,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getOutputMinFrameDuration" native="false" return="long" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -38881,12 +38631,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getOutputSizes" native="false" return="android.util.Size[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -38899,12 +38644,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getOutputStallDuration" native="false" return="long" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -38921,12 +38661,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="isOutputSupportedFor" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -51073,12 +50808,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -51091,12 +50821,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -51127,12 +50852,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -51147,12 +50867,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -65737,24 +65452,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -67736,24 +67436,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -67910,12 +67600,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -67924,12 +67609,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -68171,12 +67851,7 @@
       <implements name="android.os.Parcelable.Creator" name-generic-aware="android.os.Parcelable.Creator&lt;T&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -68187,12 +67862,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -80867,12 +80537,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CarrierMessagingService.ResultCallback" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveResult" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="result" type="T">
@@ -81155,12 +80820,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="MediaBrowserService.Result" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="detach" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -86554,12 +86214,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="getLoaderResultSynchronously" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="loader" type="android.content.Loader&lt;T&gt;">
         </parameter>
@@ -90150,12 +89805,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -90282,12 +89932,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -90326,12 +89971,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -95241,18 +94881,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayMap" static="false" type="android.util.ArrayMap" visibility="public">
       </constructor>
@@ -96113,12 +95743,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LongSparseArray" static="false" type="android.util.LongSparseArray" visibility="public">
       </constructor>
@@ -96191,18 +95816,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="LruCache" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LruCache" static="false" type="android.util.LruCache" visibility="public">
         <parameter name="maxSize" type="int">
@@ -96405,18 +96020,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -96426,18 +96031,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -96509,18 +96104,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Property" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Property" static="false" type="android.util.Property" visibility="public">
         <parameter name="type" type="java.lang.Class&lt;V&gt;">
@@ -96540,18 +96125,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="of" native="false" return="android.util.Property&lt;T, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="hostType" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -96725,12 +96300,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -109658,12 +109228,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -112206,12 +111771,7 @@
       <implements name="android.widget.Filterable" name-generic-aware="android.widget.Filterable">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -120302,12 +119862,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -125955,21 +125510,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -126386,12 +125931,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -126828,12 +126368,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -127036,12 +126571,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -129838,12 +129368,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -130110,12 +129635,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -130126,12 +129646,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -130144,12 +129659,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -130168,12 +129678,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -130188,12 +129693,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -130492,12 +129992,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getAnnotation" native="false" return="A" static="false" synchronized="false" visibility="public">
         <typeParameters>
@@ -136497,24 +135992,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -136523,12 +136008,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -136537,12 +136017,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -136553,24 +136028,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -138281,12 +137746,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -138301,12 +137761,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -147350,12 +146805,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -148923,12 +148373,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -148972,12 +148417,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -148987,12 +148427,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -149057,18 +148492,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -149117,18 +148542,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -149155,18 +148570,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -149191,12 +148596,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -149207,12 +148607,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -149229,12 +148624,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -149247,12 +148637,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -149339,12 +148724,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -149374,12 +148754,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -149514,12 +148889,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -149534,12 +148904,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -149598,12 +148963,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -149612,18 +148972,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -149698,12 +149048,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -149714,18 +149059,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -150082,12 +149417,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -150100,12 +149430,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -150591,12 +149916,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -150644,12 +149964,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -150658,12 +149973,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -150672,24 +149982,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -150698,12 +149998,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -150714,12 +150009,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -150728,12 +150018,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -150742,18 +150027,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -150764,12 +150039,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -150778,18 +150048,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -150800,12 +150060,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -150814,12 +150069,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -150834,90 +150084,45 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyEnumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyIterator" native="false" return="java.util.Iterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyListIterator" native="false" return="java.util.ListIterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -150944,12 +150149,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -150970,12 +150170,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -150998,12 +150193,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -151012,12 +150202,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -151026,24 +150211,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -151058,22 +150233,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -151096,42 +150261,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -151152,12 +150297,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -151174,168 +150314,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -151349,12 +150409,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="lhs" type="T">
@@ -151553,12 +150608,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -151639,18 +150689,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -151691,12 +150731,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -151717,12 +150752,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -152240,18 +151270,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -152282,12 +151302,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -152320,18 +151335,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -152408,18 +151413,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -152528,12 +151523,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -152544,18 +151534,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -152594,12 +151574,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -152630,12 +151605,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -152716,12 +151686,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -152815,12 +151780,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -152830,12 +151790,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -153078,18 +152033,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -153138,18 +152083,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -153200,18 +152135,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -153300,12 +152225,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -153381,12 +152301,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="Objects" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="a" type="T">
         </parameter>
@@ -153417,24 +152332,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
@@ -153492,12 +152397,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -153668,12 +152568,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -154133,35 +153028,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -154170,12 +153050,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -154187,12 +153062,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -154240,12 +153110,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -154437,18 +153302,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -154475,12 +153330,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -154505,12 +153355,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -154753,18 +153598,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -154881,12 +153716,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -155041,12 +153871,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -155147,18 +153972,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -155188,12 +154003,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -155202,12 +154012,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -155220,12 +154025,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -155236,12 +154036,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -155258,12 +154053,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -155272,12 +154062,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -155288,12 +154073,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -155302,12 +154082,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -155319,12 +154094,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -155403,12 +154173,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -155555,12 +154320,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -155629,12 +154389,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -155651,12 +154406,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -155689,18 +154439,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -155769,12 +154509,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedDeque" static="false" type="java.util.concurrent.ConcurrentLinkedDeque" visibility="public">
       </constructor>
@@ -155853,12 +154588,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -155883,18 +154613,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -155929,18 +154649,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -155995,18 +154705,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -156149,12 +154849,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -156253,12 +154948,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -156378,12 +155068,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -156393,12 +155078,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -156551,12 +155231,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -156607,12 +155282,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -156656,12 +155326,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -156718,24 +155383,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -156764,12 +155419,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -156778,12 +155428,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -156796,12 +155441,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -156812,12 +155452,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -156846,12 +155481,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -156860,12 +155490,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -156938,12 +155563,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invoke" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.ForkJoinTask&lt;T&gt;">
         </parameter>
@@ -156970,12 +155590,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.ForkJoinTask&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.ForkJoinTask&lt;T&gt;">
         </parameter>
@@ -157003,12 +155618,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ForkJoinTask" static="false" type="java.util.concurrent.ForkJoinTask" visibility="public">
       </constructor>
@@ -157018,12 +155628,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="adapt" native="false" return="java.util.concurrent.ForkJoinTask&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -157032,12 +155637,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="adapt" native="false" return="java.util.concurrent.ForkJoinTask&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;? extends T&gt;">
         </parameter>
@@ -157161,12 +155761,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -157199,12 +155794,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -157263,12 +155853,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -157443,12 +156028,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -157519,12 +156099,7 @@
       <implements name="java.util.concurrent.TransferQueue" name-generic-aware="java.util.concurrent.TransferQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedTransferQueue" static="false" type="java.util.concurrent.LinkedTransferQueue" visibility="public">
       </constructor>
@@ -157685,12 +156260,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -157775,12 +156345,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.concurrent.ForkJoinTask" extends-generic-aware="java.util.concurrent.ForkJoinTask&lt;V&gt;" final="false" name="RecursiveTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="RecursiveTask" static="false" type="java.util.concurrent.RecursiveTask" visibility="public">
       </constructor>
@@ -157827,12 +156392,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -157843,12 +156403,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -157866,12 +156421,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -157907,12 +156457,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -157944,12 +156489,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -157958,12 +156498,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -157986,12 +156521,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -158115,12 +156645,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -158511,12 +157036,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="getWaitingConsumerCount" native="false" return="int" static="false" synchronized="false" visibility="public">
       </method>
@@ -158723,12 +157243,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -158786,12 +157301,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -158955,12 +157465,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -159018,12 +157523,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -159047,12 +157547,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -159105,12 +157600,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -159149,12 +157639,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -159207,18 +157692,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -159248,18 +157723,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -159285,12 +157750,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -169115,12 +167575,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -169129,12 +167584,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -169145,12 +167595,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -169161,12 +167606,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -169195,12 +167635,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -169209,12 +167644,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -174756,12 +173186,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -174774,12 +173199,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -174814,12 +173234,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -174834,12 +173249,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -174945,12 +173355,7 @@
     </interface>
     <interface abstract="true" deprecated="deprecated" final="false" name="ResponseHandler" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="handleResponse" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="response" type="org.apache.http.HttpResponse">
@@ -178276,12 +176681,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -178294,12 +176694,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
         </parameter>
@@ -178334,12 +176729,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
@@ -178354,12 +176744,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="execute" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="org.apache.http.HttpHost">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-23.xml.in b/src/Mono.Android/Profiles/api-23.xml.in
index 9baef9d9824..86b4ae05c27 100644
--- a/src/Mono.Android/Profiles/api-23.xml.in
+++ b/src/Mono.Android/Profiles/api-23.xml.in
@@ -5758,12 +5758,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
@@ -5772,12 +5767,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="AccountManagerFuture" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -6178,18 +6168,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.animation.TypeConverter" extends-generic-aware="android.animation.TypeConverter&lt;T, V&gt;" final="false" name="BidirectionalTypeConverter" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="BidirectionalTypeConverter" static="false" type="android.animation.BidirectionalTypeConverter" visibility="public">
         <parameter name="fromClass" type="java.lang.Class&lt;T&gt;">
@@ -6505,12 +6485,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofArgb" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6539,12 +6514,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6557,12 +6527,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6591,12 +6556,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6609,12 +6569,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6625,12 +6580,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiFloat" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="java.lang.Object">
         </parameter>
@@ -6661,12 +6611,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiInt" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="target" type="java.lang.Object">
         </parameter>
@@ -6717,24 +6662,9 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="P">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
+          <typeParameter name="P"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6749,18 +6679,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6773,18 +6693,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.ObjectAnimator" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="target" type="T">
         </parameter>
@@ -6877,12 +6787,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiFloat" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6895,12 +6800,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiFloat" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6925,12 +6825,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiInt" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6943,12 +6838,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofMultiInt" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="propertyName" type="java.lang.String">
         </parameter>
@@ -6973,12 +6863,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property">
         </parameter>
@@ -6989,12 +6874,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property&lt;?, V&gt;">
         </parameter>
@@ -7005,18 +6885,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ofObject" native="false" return="android.animation.PropertyValuesHolder" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="property" type="android.util.Property&lt;?, V&gt;">
         </parameter>
@@ -7136,18 +7006,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="TypeConverter" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TypeConverter" static="false" type="android.animation.TypeConverter" visibility="public">
         <parameter name="fromClass" type="java.lang.Class&lt;T&gt;">
@@ -7162,12 +7022,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="TypeEvaluator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="evaluate" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="fraction" type="float">
@@ -11474,12 +11329,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.app.FragmentContainer" extends-generic-aware="android.app.FragmentContainer" final="false" name="FragmentHostCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FragmentHostCallback" static="false" type="android.app.FragmentHostCallback" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -12355,24 +12205,14 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="initLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -12383,12 +12223,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="restartLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="D">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="D"></typeParameter>
       </typeParameters>
         <parameter name="id" type="int">
         </parameter>
@@ -12400,12 +12235,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="LoaderManager.LoaderCallbacks" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onCreateLoader" native="false" return="android.content.Loader&lt;D&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="id" type="int">
@@ -16368,7 +16198,7 @@
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="writeNewStateDescription" native="false" return="void" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="android.os.ParcelFileDescriptor">
+        <parameter name="fd" type="android.os.ParcelFileDescriptor">
         </parameter>
       </method>
     </class>
@@ -16419,7 +16249,7 @@
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="writeNewStateDescription" native="false" return="void" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="android.os.ParcelFileDescriptor">
+        <parameter name="fd" type="android.os.ParcelFileDescriptor">
         </parameter>
       </method>
     </class>
@@ -19687,12 +19517,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="android.content.Loader" extends-generic-aware="android.content.Loader&lt;D&gt;" final="false" name="AsyncTaskLoader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTaskLoader" static="false" type="android.content.AsyncTaskLoader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -20292,12 +20117,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="openPipeHelper" native="false" return="android.os.ParcelFileDescriptor" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="uri" type="android.net.Uri">
         </parameter>
@@ -20391,12 +20211,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ContentProvider.PipeDataWriter" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="writeDataToPipe" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="output" type="android.os.ParcelFileDescriptor">
@@ -21588,12 +21403,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="getSystemService" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="serviceClass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -24285,12 +24095,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Loader" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Loader" static="false" type="android.content.Loader" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -24383,12 +24188,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCanceledListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadCanceled" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -24397,12 +24197,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Loader.OnLoadCompleteListener" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="D">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="D"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onLoadComplete" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="loader" type="android.content.Loader&lt;D&gt;">
@@ -29743,12 +29538,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Observable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Observable" static="false" type="android.database.Observable" visibility="public">
       </constructor>
@@ -39531,12 +39321,7 @@
     <class abstract="false" deprecated="not deprecated" extends="android.hardware.camera2.CameraMetadata" extends-generic-aware="android.hardware.camera2.CameraMetadata&lt;android.hardware.camera2.CameraCharacteristics.Key&lt;?&gt;&gt;" final="true" name="CameraCharacteristics" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CameraCharacteristics.Key&lt;T&gt;">
         </parameter>
@@ -39704,12 +39489,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="CameraCharacteristics.Key" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="true" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="o" type="java.lang.Object">
@@ -39904,12 +39684,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="CameraMetadata" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="TKey">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="TKey"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getKeys" native="false" return="java.util.List&lt;TKey&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -40319,12 +40094,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureRequest.Key&lt;T&gt;">
         </parameter>
@@ -40455,12 +40225,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureRequest.Key&lt;T&gt;">
         </parameter>
@@ -40471,12 +40236,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="set" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureRequest.Key&lt;T&gt;">
         </parameter>
@@ -40490,12 +40250,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="CaptureRequest.Key" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="true" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="o" type="java.lang.Object">
@@ -40509,12 +40264,7 @@
     <class abstract="false" deprecated="not deprecated" extends="android.hardware.camera2.CameraMetadata" extends-generic-aware="android.hardware.camera2.CameraMetadata&lt;android.hardware.camera2.CaptureResult.Key&lt;?&gt;&gt;" final="false" name="CaptureResult" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="get" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="key" type="android.hardware.camera2.CaptureResult.Key&lt;T&gt;">
         </parameter>
@@ -40672,12 +40422,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="CaptureResult.Key" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="true" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="o" type="java.lang.Object">
@@ -40997,12 +40742,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getOutputMinFrameDuration" native="false" return="long" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -41015,12 +40755,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getOutputSizes" native="false" return="android.util.Size[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -41033,12 +40768,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getOutputStallDuration" native="false" return="long" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -41059,12 +40789,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="isOutputSupportedFor" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="klass" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -69199,24 +68924,9 @@
   <package name="android.os">
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AsyncTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="Params">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Progress">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="Result">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="Params"></typeParameter>
+        <typeParameter name="Progress"></typeParameter>
+        <typeParameter name="Result"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AsyncTask" static="false" type="android.os.AsyncTask" visibility="public">
       </constructor>
@@ -71260,24 +70970,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="createTypedArrayList" native="false" return="java.util.ArrayList&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -71434,12 +71134,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedArray" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="val" type="T[]">
         </parameter>
@@ -71448,12 +71143,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedList" native="false" return="void" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -71462,12 +71152,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="readTypedObject" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="android.os.Parcelable.Creator&lt;T&gt;">
         </parameter>
@@ -71721,12 +71406,7 @@
       <implements name="android.os.Parcelable.Creator" name-generic-aware="android.os.Parcelable.Creator&lt;T&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -71737,12 +71417,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Parcelable.Creator" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="createFromParcel" native="false" return="T" static="false" synchronized="false" visibility="public">
         <parameter name="source" type="android.os.Parcel">
@@ -86720,12 +86395,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CarrierMessagingService.ResultCallback" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveResult" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="result" type="T">
@@ -87114,12 +86784,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="MediaBrowserService.Result" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="detach" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -94832,12 +94497,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="getLoaderResultSynchronously" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="loader" type="android.content.Loader&lt;T&gt;">
         </parameter>
@@ -98325,37 +97985,37 @@
         </parameter>
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.Object">
+        <parameter name="o" type="java.lang.Object">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpanEnd" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.Object">
+        <parameter name="what" type="java.lang.Object">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpanFlags" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.Object">
+        <parameter name="what" type="java.lang.Object">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpanStart" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.Object">
+        <parameter name="what" type="java.lang.Object">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="java.lang.Object[]" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="p0" type="int">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="p1" type="int">
         </parameter>
-        <parameter name="x2" type="java.lang.Class">
+        <parameter name="p2" type="java.lang.Class">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="hashCode" native="false" return="int" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nextSpanTransition" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="start" type="int">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="limit" type="int">
         </parameter>
-        <parameter name="x2" type="java.lang.Class">
+        <parameter name="kind" type="java.lang.Class">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="removeSpan" native="false" return="void" static="false" synchronized="false" visibility="public">
@@ -98472,12 +98132,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -98606,12 +98261,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="queryStart" type="int">
         </parameter>
@@ -98650,12 +98300,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="getSpans" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="start" type="int">
         </parameter>
@@ -98717,37 +98362,37 @@
         </parameter>
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.Object">
+        <parameter name="o" type="java.lang.Object">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpanEnd" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.Object">
+        <parameter name="what" type="java.lang.Object">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpanFlags" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.Object">
+        <parameter name="what" type="java.lang.Object">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpanStart" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.Object">
+        <parameter name="what" type="java.lang.Object">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getSpans" native="false" return="java.lang.Object[]" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="p0" type="int">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="p1" type="int">
         </parameter>
-        <parameter name="x2" type="java.lang.Class">
+        <parameter name="p2" type="java.lang.Class">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="hashCode" native="false" return="int" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nextSpanTransition" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="start" type="int">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="limit" type="int">
         </parameter>
-        <parameter name="x2" type="java.lang.Class">
+        <parameter name="kind" type="java.lang.Class">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="subSequence" native="false" return="java.lang.CharSequence" static="false" synchronized="false" visibility="public">
@@ -103657,18 +103302,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayMap" static="false" type="android.util.ArrayMap" visibility="public">
       </constructor>
@@ -103767,12 +103402,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArraySet" static="false" type="android.util.ArraySet" visibility="public">
       </constructor>
@@ -103844,12 +103474,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -104600,12 +104225,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LongSparseArray" static="false" type="android.util.LongSparseArray" visibility="public">
       </constructor>
@@ -104678,18 +104298,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="LruCache" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LruCache" static="false" type="android.util.LruCache" visibility="public">
         <parameter name="maxSize" type="int">
@@ -104892,18 +104502,8 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Pair" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="F">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="F"></typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Pair" static="false" type="android.util.Pair" visibility="public">
         <parameter name="first" type="F">
@@ -104913,18 +104513,8 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="create" native="false" return="android.util.Pair&lt;A, B&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="A">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="B">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="A"></typeParameter>
+          <typeParameter name="B"></typeParameter>
       </typeParameters>
         <parameter name="a" type="A">
         </parameter>
@@ -104996,18 +104586,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Property" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Property" static="false" type="android.util.Property" visibility="public">
         <parameter name="type" type="java.lang.Class&lt;V&gt;">
@@ -105027,18 +104607,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="of" native="false" return="android.util.Property&lt;T, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="hostType" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -105212,12 +104782,7 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SparseArray" static="false" type="android.util.SparseArray" visibility="public">
       </constructor>
@@ -118633,12 +118198,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="ValueCallback" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="onReceiveValue" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="value" type="T">
@@ -121289,12 +120849,7 @@
       <implements name="android.widget.ThemedSpinnerAdapter" name-generic-aware="android.widget.ThemedSpinnerAdapter">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayAdapter" static="false" type="android.widget.ArrayAdapter" visibility="public">
         <parameter name="context" type="android.content.Context">
@@ -129543,12 +129098,7 @@
   <package name="com.android.internal.util">
     <interface abstract="true" deprecated="not deprecated" final="false" name="Predicate" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="apply" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="p0" type="T">
@@ -135196,21 +134746,11 @@
       <implements name="java.lang.reflect.Type" name-generic-aware="java.lang.reflect.Type">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="asSubclass" native="false" return="java.lang.Class&lt;? extends U&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -135627,12 +135167,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="another" type="T">
@@ -136069,12 +135604,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ThreadLocal" extends-generic-aware="java.lang.ThreadLocal&lt;T&gt;" final="false" name="InheritableThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="InheritableThreadLocal" static="false" type="java.lang.InheritableThreadLocal" visibility="public">
       </constructor>
@@ -136277,12 +135807,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;T&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -138229,7 +137754,7 @@
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="indexOf" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.String">
+        <parameter name="string" type="java.lang.String">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="indexOf" native="false" return="int" static="false" synchronized="true" visibility="public">
@@ -138319,7 +137844,7 @@
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="lastIndexOf" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.String">
+        <parameter name="string" type="java.lang.String">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="lastIndexOf" native="false" return="int" static="false" synchronized="true" visibility="public">
@@ -138465,21 +137990,21 @@
       <method abstract="false" deprecated="not deprecated" final="false" name="capacity" native="false" return="int" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="charAt" native="false" return="char" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="index" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="codePointAt" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="index" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="codePointBefore" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="index" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="codePointCount" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="start" type="int">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="end" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="delete" native="false" return="java.lang.StringBuilder" static="false" synchronized="false" visibility="public">
@@ -138493,27 +138018,27 @@
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="ensureCapacity" native="false" return="void" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="min" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getChars" native="false" return="void" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="start" type="int">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="end" type="int">
         </parameter>
-        <parameter name="x2" type="char[]">
+        <parameter name="dst" type="char[]">
         </parameter>
-        <parameter name="x3" type="int">
+        <parameter name="dstStart" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="indexOf" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.String">
+        <parameter name="string" type="java.lang.String">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="indexOf" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.String">
+        <parameter name="subString" type="java.lang.String">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="start" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="insert" native="false" return="java.lang.StringBuilder" static="false" synchronized="false" visibility="public">
@@ -138597,21 +138122,21 @@
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="lastIndexOf" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.String">
+        <parameter name="string" type="java.lang.String">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="lastIndexOf" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="java.lang.String">
+        <parameter name="subString" type="java.lang.String">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="start" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="length" native="false" return="int" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="offsetByCodePoints" native="false" return="int" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="index" type="int">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="codePointOffset" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replace" native="false" return="java.lang.StringBuilder" static="false" synchronized="false" visibility="public">
@@ -138625,29 +138150,29 @@
       <method abstract="false" deprecated="not deprecated" final="false" name="reverse" native="false" return="java.lang.StringBuilder" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="setCharAt" native="false" return="void" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="index" type="int">
         </parameter>
-        <parameter name="x1" type="char">
+        <parameter name="ch" type="char">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="setLength" native="false" return="void" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="length" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="subSequence" native="false" return="java.lang.CharSequence" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="start" type="int">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="end" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="substring" native="false" return="java.lang.String" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="start" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="substring" native="false" return="java.lang.String" static="false" synchronized="false" visibility="public">
-        <parameter name="x0" type="int">
+        <parameter name="start" type="int">
         </parameter>
-        <parameter name="x1" type="int">
+        <parameter name="end" type="int">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toString" native="false" return="java.lang.String" static="false" synchronized="false" visibility="public">
@@ -139079,12 +138604,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ThreadLocal" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ThreadLocal" static="false" type="java.lang.ThreadLocal" visibility="public">
       </constructor>
@@ -139351,12 +138871,7 @@
   <package name="java.lang.ref">
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="PhantomReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PhantomReference" static="false" type="java.lang.ref.PhantomReference" visibility="public">
         <parameter name="r" type="T">
@@ -139367,12 +138882,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Reference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -139385,12 +138895,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="ReferenceQueue" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ReferenceQueue" static="false" type="java.lang.ref.ReferenceQueue" visibility="public">
       </constructor>
@@ -139409,12 +138914,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="SoftReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SoftReference" static="false" type="java.lang.ref.SoftReference" visibility="public">
         <parameter name="r" type="T">
@@ -139429,12 +138929,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.ref.Reference" extends-generic-aware="java.lang.ref.Reference&lt;T&gt;" final="false" name="WeakReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakReference" static="false" type="java.lang.ref.WeakReference" visibility="public">
         <parameter name="r" type="T">
@@ -139733,12 +139228,7 @@
       <implements name="java.lang.reflect.Member" name-generic-aware="java.lang.reflect.Member">
       </implements>
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="getAnnotation" native="false" return="A" static="false" synchronized="false" visibility="public">
         <typeParameters>
@@ -145738,24 +145228,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
@@ -145764,12 +145244,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -145778,12 +145253,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -145794,24 +145264,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedAction&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doPrivilegedWithCombiner" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="action" type="java.security.PrivilegedExceptionAction&lt;T&gt;">
         </parameter>
@@ -147522,12 +146982,7 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
       </method>
@@ -147542,12 +146997,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="PrivilegedExceptionAction" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="T" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -156591,12 +156041,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="unwrap" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="iface" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -158164,12 +157609,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractCollection" static="false" type="java.util.AbstractCollection" visibility="protected">
       </constructor>
@@ -158213,12 +157653,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -158228,12 +157663,7 @@
       <implements name="java.util.List" name-generic-aware="java.util.List&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractList" static="false" type="java.util.AbstractList" visibility="protected">
       </constructor>
@@ -158298,18 +157728,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap" static="false" type="java.util.AbstractMap" visibility="protected">
       </constructor>
@@ -158358,18 +157778,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleEntry" static="false" type="java.util.AbstractMap.SimpleEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -158396,18 +157806,8 @@
       <implements name="java.util.Map.Entry" name-generic-aware="java.util.Map.Entry&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractMap.SimpleImmutableEntry" static="false" type="java.util.AbstractMap.SimpleImmutableEntry" visibility="public">
         <parameter name="copyFrom" type="java.util.Map.Entry&lt;? extends K, ? extends V&gt;">
@@ -158432,12 +157832,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractQueue" static="false" type="java.util.AbstractQueue" visibility="protected">
       </constructor>
@@ -158448,12 +157843,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractList" extends-generic-aware="java.util.AbstractList&lt;E&gt;" final="false" name="AbstractSequentialList" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSequentialList" static="false" type="java.util.AbstractSequentialList" visibility="protected">
       </constructor>
@@ -158470,12 +157860,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AbstractSet" static="false" type="java.util.AbstractSet" visibility="protected">
       </constructor>
@@ -158488,12 +157873,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayDeque" static="false" type="java.util.ArrayDeque" visibility="public">
       </constructor>
@@ -158580,12 +157960,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayList" static="false" type="java.util.ArrayList" visibility="public">
       </constructor>
@@ -158615,12 +157990,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Arrays" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="asList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T...">
         </parameter>
@@ -158755,12 +158125,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -158775,12 +158140,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -158839,12 +158199,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -158853,18 +158208,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOf" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -158939,12 +158284,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="original" type="T[]">
         </parameter>
@@ -158955,18 +158295,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copyOfRange" native="false" return="T[]" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="original" type="U[]">
         </parameter>
@@ -159323,12 +158653,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -159341,12 +158666,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -159832,12 +159152,7 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -159885,12 +159200,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -159899,12 +159209,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Collections" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="addAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;? super T&gt;">
         </parameter>
@@ -159913,24 +159218,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="asLifoQueue" native="false" return="java.util.Queue&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="deque" type="java.util.Deque&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;">
         </parameter>
@@ -159939,12 +159234,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="binarySearch" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends T&gt;">
         </parameter>
@@ -159955,12 +159245,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Collection&lt;E&gt;">
         </parameter>
@@ -159969,12 +159254,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;E&gt;">
         </parameter>
@@ -159983,18 +159263,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.Map&lt;K, V&gt;">
         </parameter>
@@ -160005,12 +159275,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.Set&lt;E&gt;">
         </parameter>
@@ -160019,18 +159284,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="m" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
@@ -160041,12 +159296,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="checkedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="s" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -160055,12 +159305,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="copy" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="destination" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -160075,90 +159320,45 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyEnumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyIterator" native="false" return="java.util.Iterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="emptyListIterator" native="false" return="java.util.ListIterator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptyMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="true" name="emptySet" native="false" return="java.util.Set&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="enumeration" native="false" return="java.util.Enumeration&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="fill" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? super T&gt;">
         </parameter>
@@ -160185,12 +159385,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="list" native="false" return="java.util.ArrayList&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="enumeration" type="java.util.Enumeration&lt;T&gt;">
         </parameter>
@@ -160211,12 +159406,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="max" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -160239,12 +159429,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="min" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends T&gt;">
         </parameter>
@@ -160253,12 +159438,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="nCopies" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="length" type="int">
         </parameter>
@@ -160267,24 +159447,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newSetFromMap" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;E, java.lang.Boolean&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="replaceAll" native="false" return="boolean" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -160299,22 +159469,12 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reverseOrder" native="false" return="java.util.Comparator&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.util.Comparator&lt;T&gt;">
         </parameter>
@@ -160337,42 +159497,22 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singleton" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="object" type="E">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="singletonMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="key" type="K">
         </parameter>
@@ -160393,12 +159533,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="sort" native="false" return="void" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
@@ -160415,168 +159550,88 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedCollection" native="false" return="java.util.Collection&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedList" native="false" return="java.util.List&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="synchronizedSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableCollection" native="false" return="java.util.Collection&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="collection" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableList" native="false" return="java.util.List&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="list" type="java.util.List&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableMap" native="false" return="java.util.Map&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.Map&lt;? extends K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSet" native="false" return="java.util.Set&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.Set&lt;? extends E&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedMap" native="false" return="java.util.SortedMap&lt;K, V&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="K">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="K"></typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="map" type="java.util.SortedMap&lt;K, ? extends V&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="unmodifiableSortedSet" native="false" return="java.util.SortedSet&lt;E&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="E">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="E"></typeParameter>
       </typeParameters>
         <parameter name="set" type="java.util.SortedSet&lt;E&gt;">
         </parameter>
@@ -160590,12 +159645,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Comparator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="lhs" type="T">
@@ -160794,12 +159844,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -160880,18 +159925,8 @@
     </interface>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Dictionary" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Dictionary" static="false" type="java.util.Dictionary" visibility="public">
       </constructor>
@@ -160932,12 +159967,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Enumeration" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasMoreElements" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -160958,12 +159988,7 @@
             </genericConstraint>
           </genericConstraints>
         </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="EnumMap" static="false" type="java.util.EnumMap" visibility="public">
         <parameter name="keyType" type="java.lang.Class&lt;K&gt;">
@@ -161481,18 +160506,8 @@
       <implements name="java.lang.Cloneable" name-generic-aware="java.lang.Cloneable">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashMap" static="false" type="java.util.HashMap" visibility="public">
       </constructor>
@@ -161523,12 +160538,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="HashSet" static="false" type="java.util.HashSet" visibility="public">
       </constructor>
@@ -161561,18 +160571,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Hashtable" static="false" type="java.util.Hashtable" visibility="public">
       </constructor>
@@ -161649,18 +160649,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="IdentityHashMap" static="false" type="java.util.IdentityHashMap" visibility="public">
       </constructor>
@@ -161769,12 +160759,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Iterator" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="hasNext" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -161785,18 +160770,8 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.HashMap" extends-generic-aware="java.util.HashMap&lt;K, V&gt;" final="false" name="LinkedHashMap" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashMap" static="false" type="java.util.LinkedHashMap" visibility="public">
       </constructor>
@@ -161835,12 +160810,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedHashSet" static="false" type="java.util.LinkedHashSet" visibility="public">
       </constructor>
@@ -161871,12 +160841,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedList" static="false" type="java.util.LinkedList" visibility="public">
       </constructor>
@@ -161957,12 +160922,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -162056,12 +161016,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -162071,12 +161026,7 @@
       <implements name="java.util.Iterator" name-generic-aware="java.util.Iterator&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="void" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -162319,18 +161269,8 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="clear" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -162379,18 +161319,8 @@
     </interface>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Map.Entry" static="true" visibility="public">
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="equals" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="java.lang.Object">
@@ -162441,18 +161371,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceilingEntry" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -162541,12 +161461,7 @@
       <implements name="java.util.SortedSet" name-generic-aware="java.util.SortedSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="ceiling" native="false" return="E" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -162622,12 +161537,7 @@
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="Objects" static="false" visibility="public">
       <method abstract="false" deprecated="not deprecated" final="false" name="compare" native="false" return="int" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="a" type="T">
         </parameter>
@@ -162658,24 +161568,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="requireNonNull" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="o" type="T">
         </parameter>
@@ -162733,12 +161633,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityQueue" static="false" type="java.util.PriorityQueue" visibility="public">
       </constructor>
@@ -162909,12 +161804,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -163374,35 +162264,20 @@
       <implements name="java.lang.Iterable" name-generic-aware="java.lang.Iterable&lt;S&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="S">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="S"></typeParameter>
       </typeParameters>
       <method abstract="false" deprecated="not deprecated" final="false" name="iterator" native="false" return="java.util.Iterator&lt;S&gt;" static="false" synchronized="false" visibility="public">
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="load" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -163411,12 +162286,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="loadInstalled" native="false" return="java.util.ServiceLoader&lt;S&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="S">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="S"></typeParameter>
       </typeParameters>
         <parameter name="service" type="java.lang.Class&lt;S&gt;">
         </parameter>
@@ -163428,12 +162298,7 @@
       <implements name="java.util.Collection" name-generic-aware="java.util.Collection&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="object" type="E">
@@ -163481,12 +162346,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="array" type="T[]">
         </parameter>
@@ -163678,18 +162538,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -163716,12 +162566,7 @@
       <implements name="java.util.Set" name-generic-aware="java.util.Set&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="comparator" native="false" return="java.util.Comparator&lt;? super E&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -163746,12 +162591,7 @@
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.Vector" extends-generic-aware="java.util.Vector&lt;E&gt;" final="false" name="Stack" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Stack" static="false" type="java.util.Stack" visibility="public">
       </constructor>
@@ -163994,18 +162834,8 @@
       <implements name="java.util.SortedMap" name-generic-aware="java.util.SortedMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeMap" static="false" type="java.util.TreeMap" visibility="public">
       </constructor>
@@ -164122,12 +162952,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="TreeSet" static="false" type="java.util.TreeSet" visibility="public">
       </constructor>
@@ -164282,12 +163107,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Vector" static="false" type="java.util.Vector" visibility="public">
       </constructor>
@@ -164388,18 +163208,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="WeakHashMap" static="false" type="java.util.WeakHashMap" visibility="public">
       </constructor>
@@ -164429,12 +163239,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -164443,12 +163248,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -164461,12 +163261,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -164477,12 +163272,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -164499,12 +163289,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -164513,12 +163298,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newTaskFor" native="false" return="java.util.concurrent.RunnableFuture&lt;T&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -164529,12 +163309,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -164543,12 +163318,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -164560,12 +163330,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ArrayBlockingQueue" static="false" type="java.util.concurrent.ArrayBlockingQueue" visibility="public">
         <parameter name="capacity" type="int">
@@ -164644,12 +163409,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -164796,12 +163556,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="e" type="E">
@@ -164870,12 +163625,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Callable" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="call" native="false" return="V" static="false" synchronized="false" visibility="public">
         <exception name="Exception" type="java.lang.Exception">
@@ -164892,12 +163642,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="CompletionService" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="poll" native="false" return="java.util.concurrent.Future&lt;V&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -164930,18 +163675,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentHashMap" static="false" type="java.util.concurrent.ConcurrentHashMap" visibility="public">
       </constructor>
@@ -165010,12 +163745,7 @@
       <implements name="java.util.Deque" name-generic-aware="java.util.Deque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedDeque" static="false" type="java.util.concurrent.ConcurrentLinkedDeque" visibility="public">
       </constructor>
@@ -165094,12 +163824,7 @@
       <implements name="java.util.Queue" name-generic-aware="java.util.Queue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentLinkedQueue" static="false" type="java.util.concurrent.ConcurrentLinkedQueue" visibility="public">
       </constructor>
@@ -165124,18 +163849,8 @@
       <implements name="java.util.Map" name-generic-aware="java.util.Map&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="putIfAbsent" native="false" return="V" static="false" synchronized="false" visibility="public">
         <parameter name="key" type="K">
@@ -165170,18 +163885,8 @@
       <implements name="java.util.concurrent.ConcurrentMap" name-generic-aware="java.util.concurrent.ConcurrentMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="descendingKeySet" native="false" return="java.util.NavigableSet&lt;K&gt;" static="false" synchronized="false" visibility="public">
       </method>
@@ -165236,18 +163941,8 @@
       <implements name="java.util.concurrent.ConcurrentNavigableMap" name-generic-aware="java.util.concurrent.ConcurrentNavigableMap&lt;K, V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="K">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="K"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListMap" static="false" type="java.util.concurrent.ConcurrentSkipListMap" visibility="public">
       </constructor>
@@ -165390,12 +164085,7 @@
       <implements name="java.util.NavigableSet" name-generic-aware="java.util.NavigableSet&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ConcurrentSkipListSet" static="false" type="java.util.concurrent.ConcurrentSkipListSet" visibility="public">
       </constructor>
@@ -165494,12 +164184,7 @@
       <implements name="java.util.RandomAccess" name-generic-aware="java.util.RandomAccess">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArrayList" static="false" type="java.util.concurrent.CopyOnWriteArrayList" visibility="public">
       </constructor>
@@ -165619,12 +164304,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="toArray" native="false" return="T[]" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="contents" type="T[]">
         </parameter>
@@ -165634,12 +164314,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="CopyOnWriteArraySet" static="false" type="java.util.concurrent.CopyOnWriteArraySet" visibility="public">
       </constructor>
@@ -165792,12 +164467,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="Exchanger" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="Exchanger" static="false" type="java.util.concurrent.Exchanger" visibility="public">
       </constructor>
@@ -165848,12 +164518,7 @@
       <implements name="java.util.concurrent.CompletionService" name-generic-aware="java.util.concurrent.CompletionService&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ExecutorCompletionService" static="false" type="java.util.concurrent.ExecutorCompletionService" visibility="public">
         <parameter name="executor" type="java.util.concurrent.Executor">
@@ -165897,12 +164562,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="callable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -165959,24 +164619,14 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallable" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="privilegedCallableUsingCurrentClassLoader" native="false" return="java.util.concurrent.Callable&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -166005,12 +164655,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -166019,12 +164664,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAll" native="false" return="java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -166037,12 +164677,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -166053,12 +164688,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="invokeAny" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="tasks" type="java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;">
         </parameter>
@@ -166087,12 +164717,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.lang.Runnable">
         </parameter>
@@ -166101,12 +164726,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.Future&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.Callable&lt;T&gt;">
         </parameter>
@@ -166179,12 +164799,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="invoke" native="false" return="T" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.ForkJoinTask&lt;T&gt;">
         </parameter>
@@ -166211,12 +164826,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="submit" native="false" return="java.util.concurrent.ForkJoinTask&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="task" type="java.util.concurrent.ForkJoinTask&lt;T&gt;">
         </parameter>
@@ -166244,12 +164854,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="ForkJoinTask" static="false" type="java.util.concurrent.ForkJoinTask" visibility="public">
       </constructor>
@@ -166259,12 +164864,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="adapt" native="false" return="java.util.concurrent.ForkJoinTask&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -166273,12 +164873,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="adapt" native="false" return="java.util.concurrent.ForkJoinTask&lt;T&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;? extends T&gt;">
         </parameter>
@@ -166402,12 +164997,7 @@
     </class>
     <interface abstract="true" deprecated="not deprecated" final="false" name="Future" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="cancel" native="false" return="boolean" static="false" synchronized="false" visibility="public">
         <parameter name="mayInterruptIfRunning" type="boolean">
@@ -166440,12 +165030,7 @@
       <implements name="java.util.concurrent.RunnableFuture" name-generic-aware="java.util.concurrent.RunnableFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="FutureTask" static="false" type="java.util.concurrent.FutureTask" visibility="public">
         <parameter name="runnable" type="java.lang.Runnable">
@@ -166504,12 +165089,7 @@
       <implements name="java.util.concurrent.BlockingDeque" name-generic-aware="java.util.concurrent.BlockingDeque&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingDeque" static="false" type="java.util.concurrent.LinkedBlockingDeque" visibility="public">
       </constructor>
@@ -166684,12 +165264,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedBlockingQueue" static="false" type="java.util.concurrent.LinkedBlockingQueue" visibility="public">
       </constructor>
@@ -166760,12 +165335,7 @@
       <implements name="java.util.concurrent.TransferQueue" name-generic-aware="java.util.concurrent.TransferQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="LinkedTransferQueue" static="false" type="java.util.concurrent.LinkedTransferQueue" visibility="public">
       </constructor>
@@ -166926,12 +165496,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="PriorityBlockingQueue" static="false" type="java.util.concurrent.PriorityBlockingQueue" visibility="public">
       </constructor>
@@ -167016,12 +165581,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.concurrent.ForkJoinTask" extends-generic-aware="java.util.concurrent.ForkJoinTask&lt;V&gt;" final="false" name="RecursiveTask" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="RecursiveTask" static="false" type="java.util.concurrent.RecursiveTask" visibility="public">
       </constructor>
@@ -167068,12 +165628,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="run" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
@@ -167084,12 +165639,7 @@
       <implements name="java.util.concurrent.ScheduledFuture" name-generic-aware="java.util.concurrent.ScheduledFuture&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="isPeriodic" native="false" return="boolean" static="false" synchronized="false" visibility="public">
       </method>
@@ -167107,12 +165657,7 @@
       </method>
       <method abstract="true" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -167148,12 +165693,7 @@
       <implements name="java.util.concurrent.Future" name-generic-aware="java.util.concurrent.Future&lt;V&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
     </interface>
     <class abstract="false" deprecated="not deprecated" extends="java.util.concurrent.ThreadPoolExecutor" extends-generic-aware="java.util.concurrent.ThreadPoolExecutor" final="false" name="ScheduledThreadPoolExecutor" static="false" visibility="public">
@@ -167185,12 +165725,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="runnable" type="java.lang.Runnable">
         </parameter>
@@ -167199,12 +165734,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="decorateTask" native="false" return="java.util.concurrent.RunnableScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="protected">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -167227,12 +165757,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="schedule" native="false" return="java.util.concurrent.ScheduledFuture&lt;V&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="V">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="V"></typeParameter>
       </typeParameters>
         <parameter name="callable" type="java.util.concurrent.Callable&lt;V&gt;">
         </parameter>
@@ -167356,12 +165881,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="SynchronousQueue" static="false" type="java.util.concurrent.SynchronousQueue" visibility="public">
       </constructor>
@@ -167752,12 +166272,7 @@
       <implements name="java.util.concurrent.BlockingQueue" name-generic-aware="java.util.concurrent.BlockingQueue&lt;E&gt;">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <method abstract="true" deprecated="not deprecated" final="false" name="getWaitingConsumerCount" native="false" return="int" static="false" synchronized="false" visibility="public">
       </method>
@@ -167964,12 +166479,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicIntegerFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicIntegerFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicIntegerFieldUpdater" visibility="protected">
       </constructor>
@@ -168027,12 +166537,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicIntegerFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -168196,12 +166701,7 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicLongFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicLongFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicLongFieldUpdater" visibility="protected">
       </constructor>
@@ -168259,12 +166759,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicLongFieldUpdater&lt;U&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -168288,12 +166783,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicMarkableReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicMarkableReference" static="false" type="java.util.concurrent.atomic.AtomicMarkableReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -168346,12 +166836,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReference" static="false" type="java.util.concurrent.atomic.AtomicReference" visibility="public">
       </constructor>
@@ -168390,12 +166875,7 @@
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
       </implements>
       <typeParameters>
-        <typeParameter name="E">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="E"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceArray" static="false" type="java.util.concurrent.atomic.AtomicReferenceArray" visibility="public">
         <parameter name="array" type="E[]">
@@ -168448,18 +166928,8 @@
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicReferenceFieldUpdater" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="T">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="T"></typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicReferenceFieldUpdater" static="false" type="java.util.concurrent.atomic.AtomicReferenceFieldUpdater" visibility="protected">
       </constructor>
@@ -168489,18 +166959,8 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="newUpdater" native="false" return="java.util.concurrent.atomic.AtomicReferenceFieldUpdater&lt;U, W&gt;" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="U">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
-          <typeParameter name="W">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="U"></typeParameter>
+          <typeParameter name="W"></typeParameter>
       </typeParameters>
         <parameter name="tclass" type="java.lang.Class&lt;U&gt;">
         </parameter>
@@ -168526,12 +166986,7 @@
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="AtomicStampedReference" static="false" visibility="public">
       <typeParameters>
-        <typeParameter name="V">
-          <genericConstraints>
-            <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-          </genericConstraints>
-        </typeParameter>
+        <typeParameter name="V"></typeParameter>
       </typeParameters>
       <constructor deprecated="not deprecated" final="false" name="AtomicStampedReference" static="false" type="java.util.concurrent.atomic.AtomicStampedReference" visibility="public">
         <parameter name="initialRef" type="V">
@@ -178356,12 +176811,7 @@
       </constructor>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -178370,12 +176820,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAs" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -178386,12 +176831,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -178402,12 +176842,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="doAsPrivileged" native="false" return="T" static="true" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="subject" type="javax.security.auth.Subject">
         </parameter>
@@ -178436,12 +176871,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPrivateCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
@@ -178450,12 +176880,7 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="getPublicCredentials" native="false" return="java.util.Set&lt;T&gt;" static="false" synchronized="false" visibility="public">
         <typeParameters>
-          <typeParameter name="T">
-            <genericConstraints>
-              <genericConstraint type="java.lang.Object">
-            </genericConstraint>
-            </genericConstraints>
-          </typeParameter>
+          <typeParameter name="T"></typeParameter>
       </typeParameters>
         <parameter name="c" type="java.lang.Class&lt;T&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-24.xml.in b/src/Mono.Android/Profiles/api-24.xml.in
index 33239a07ba1..c284b3cc909 100644
--- a/src/Mono.Android/Profiles/api-24.xml.in
+++ b/src/Mono.Android/Profiles/api-24.xml.in
@@ -123433,8 +123433,20 @@
       </field>
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="DragAndDropPermissions" static="false" visibility="public">
+      <implements name="android.os.Parcelable" name-generic-aware="android.os.Parcelable">
+      </implements>
+      <method abstract="false" deprecated="not deprecated" final="false" name="describeContents" native="false" return="int" static="false" synchronized="false" visibility="public">
+      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="release" native="false" return="void" static="false" synchronized="false" visibility="public">
       </method>
+      <method abstract="false" deprecated="not deprecated" final="false" name="writeToParcel" native="false" return="void" static="false" synchronized="false" visibility="public">
+        <parameter name="destination" type="android.os.Parcel">
+        </parameter>
+        <parameter name="flags" type="int">
+        </parameter>
+      </method>
+      <field deprecated="not deprecated" final="true" name="CREATOR" static="true" transient="false" type="android.os.Parcelable.Creator" type-generic-aware="android.os.Parcelable.Creator&lt;android.view.DragAndDropPermissions&gt;" visibility="public" volatile="false">
+      </field>
     </class>
     <class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="false" name="DragEvent" static="false" visibility="public">
       <implements name="android.os.Parcelable" name-generic-aware="android.os.Parcelable">

From 5847c2dd6a6c4f5af2605ede58c77114ecbe966a Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@gmail.com>
Date: Tue, 11 Oct 2016 16:51:20 +0900
Subject: [PATCH 2/3] [Mono.Android] update API XML definition from the latest
 api-xml-adjuster.

There were non-breaking API definition files changes caused by
https://github.com/xamarin/java.interop/pull/94

This update reflects the changes.
---
 src/Mono.Android/Profiles/api-10.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-15.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-16.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-17.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-18.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-19.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-20.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-21.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-22.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-23.xml.in | 10 ----------
 src/Mono.Android/Profiles/api-24.xml.in | 16 ++++++----------
 11 files changed, 6 insertions(+), 110 deletions(-)

diff --git a/src/Mono.Android/Profiles/api-10.xml.in b/src/Mono.Android/Profiles/api-10.xml.in
index ceb8f54802c..487482312a9 100644
--- a/src/Mono.Android/Profiles/api-10.xml.in
+++ b/src/Mono.Android/Profiles/api-10.xml.in
@@ -98523,12 +98523,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -102657,10 +102651,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-15.xml.in b/src/Mono.Android/Profiles/api-15.xml.in
index 7b5c92be4c0..597b611cfcd 100644
--- a/src/Mono.Android/Profiles/api-15.xml.in
+++ b/src/Mono.Android/Profiles/api-15.xml.in
@@ -115818,12 +115818,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -119982,10 +119976,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-16.xml.in b/src/Mono.Android/Profiles/api-16.xml.in
index efed6a337e8..57d96be0627 100644
--- a/src/Mono.Android/Profiles/api-16.xml.in
+++ b/src/Mono.Android/Profiles/api-16.xml.in
@@ -119677,12 +119677,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -123841,10 +123835,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-17.xml.in b/src/Mono.Android/Profiles/api-17.xml.in
index 16abaeded68..8dbdea4fb40 100644
--- a/src/Mono.Android/Profiles/api-17.xml.in
+++ b/src/Mono.Android/Profiles/api-17.xml.in
@@ -122346,12 +122346,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -126510,10 +126504,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-18.xml.in b/src/Mono.Android/Profiles/api-18.xml.in
index f52bc24c08a..de928ca1edf 100644
--- a/src/Mono.Android/Profiles/api-18.xml.in
+++ b/src/Mono.Android/Profiles/api-18.xml.in
@@ -126344,12 +126344,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -130508,10 +130502,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-19.xml.in b/src/Mono.Android/Profiles/api-19.xml.in
index 40a09555af0..a7a9be15c20 100644
--- a/src/Mono.Android/Profiles/api-19.xml.in
+++ b/src/Mono.Android/Profiles/api-19.xml.in
@@ -131422,12 +131422,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -135647,10 +135641,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-20.xml.in b/src/Mono.Android/Profiles/api-20.xml.in
index 50ee21f2b7f..b03336de9a1 100644
--- a/src/Mono.Android/Profiles/api-20.xml.in
+++ b/src/Mono.Android/Profiles/api-20.xml.in
@@ -131942,12 +131942,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -136167,10 +136161,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-21.xml.in b/src/Mono.Android/Profiles/api-21.xml.in
index 1d744279dbe..20b54f36c02 100644
--- a/src/Mono.Android/Profiles/api-21.xml.in
+++ b/src/Mono.Android/Profiles/api-21.xml.in
@@ -150173,12 +150173,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -154579,10 +154573,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-22.xml.in b/src/Mono.Android/Profiles/api-22.xml.in
index 11f9dfc63d7..5b0e9849d24 100644
--- a/src/Mono.Android/Profiles/api-22.xml.in
+++ b/src/Mono.Android/Profiles/api-22.xml.in
@@ -150770,12 +150770,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -155176,10 +155170,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-23.xml.in b/src/Mono.Android/Profiles/api-23.xml.in
index 86b4ae05c27..51b3503f141 100644
--- a/src/Mono.Android/Profiles/api-23.xml.in
+++ b/src/Mono.Android/Profiles/api-23.xml.in
@@ -160006,12 +160006,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -164412,10 +164406,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>
diff --git a/src/Mono.Android/Profiles/api-24.xml.in b/src/Mono.Android/Profiles/api-24.xml.in
index c284b3cc909..7672c45a6b4 100644
--- a/src/Mono.Android/Profiles/api-24.xml.in
+++ b/src/Mono.Android/Profiles/api-24.xml.in
@@ -180265,12 +180265,6 @@
       </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
       </method>
-      <method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
-        <parameter name="key" type="K">
-        </parameter>
-        <parameter name="value" type="V">
-        </parameter>
-      </method>
     </class>
     <class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
       <implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@@ -185955,6 +185949,12 @@
         <parameter name="reducer" type="java.util.function.BiFunction&lt;? super U, ? super U, ? extends U&gt;">
         </parameter>
       </method>
+      <method abstract="false" deprecated="not deprecated" final="false" name="reduceEntries" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
+        <parameter name="parallelismThreshold" type="long">
+        </parameter>
+        <parameter name="reducer" type="java.util.function.BiFunction&lt;java.util.Map.Entry&lt;K, V&gt;, java.util.Map.Entry&lt;K, V&gt;, ? extends java.util.Map.Entry&lt;K, V&gt;&gt;">
+        </parameter>
+      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="reduceEntries" native="false" return="U" static="false" synchronized="false" visibility="public">
         <typeParameters>
           <typeParameter name="U"></typeParameter>
@@ -187129,10 +187129,6 @@
         <parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
         </parameter>
       </constructor>
-      <method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
-        <parameter name="e" type="E">
-        </parameter>
-      </method>
       <method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
         <parameter name="c" type="java.util.Collection&lt;? super E&gt;">
         </parameter>

From c7bc1474c3f3fc4f4da183d3036ee88da1be17e0 Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@gmail.com>
Date: Fri, 14 Oct 2016 13:58:08 +0900
Subject: [PATCH 3/3] bump Java.Interop (to include api-xml-adjuster fix
 8dac926)

---
 external/Java.Interop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/Java.Interop b/external/Java.Interop
index 40b75e9c4b7..8dac926ea20 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 40b75e9c4b7b986f3bb31254a4aab3d60e0ef74e
+Subproject commit 8dac926ea20027ad4ad8b18f1eba0c87f68c8394