diff --git a/sdk/api-versions.xml b/sdk/api-versions.xml
index 7592bd6af..0f67df38a 100644
--- a/sdk/api-versions.xml
+++ b/sdk/api-versions.xml
@@ -2056,34 +2056,34 @@
 	</class>
 	<class name="android/accounts/AccountManager" since="5">
 		<extends name="java/lang/Object" />
-		<method name="addAccount(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/os/Bundle;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback&lt;android/os/Bundle>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;android/os/Bundle>;" />
+		<method name="addAccount(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/os/Bundle;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" />
 		<method name="addAccountExplicitly(Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;)Z" />
 		<method name="addOnAccountsUpdatedListener(Landroid/accounts/OnAccountsUpdateListener;Landroid/os/Handler;Z)V" />
 		<method name="blockingGetAuthToken(Landroid/accounts/Account;Ljava/lang/String;Z)Ljava/lang/String;" />
 		<method name="clearPassword(Landroid/accounts/Account;)V" />
-		<method name="confirmCredentials(Landroid/accounts/Account;Landroid/os/Bundle;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback&lt;android/os/Bundle>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;android/os/Bundle>;" />
-		<method name="editProperties(Ljava/lang/String;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback&lt;android/os/Bundle>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;android/os/Bundle>;" />
+		<method name="confirmCredentials(Landroid/accounts/Account;Landroid/os/Bundle;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" />
+		<method name="editProperties(Ljava/lang/String;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" />
 		<method name="get(Landroid/content/Context;)Landroid/accounts/AccountManager;" />
 		<method name="getAccounts()[Landroid/accounts/Account;" />
 		<method name="getAccountsByType(Ljava/lang/String;)[Landroid/accounts/Account;" />
-		<method name="getAccountsByTypeAndFeatures(Ljava/lang/String;[Ljava/lang/String;Landroid/accounts/AccountManagerCallback&lt;android/accounts/Account[]>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;android/accounts/Account[]>;" />
-		<method name="getAuthToken(Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback&lt;android/os/Bundle>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;android/os/Bundle>;" />
-		<method name="getAuthToken(Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;ZLandroid/accounts/AccountManagerCallback&lt;android/os/Bundle>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;android/os/Bundle>;" since="14" />
-		<method name="getAuthToken(Landroid/accounts/Account;Ljava/lang/String;ZLandroid/accounts/AccountManagerCallback&lt;android/os/Bundle>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;android/os/Bundle>;" />
-		<method name="getAuthTokenByFeatures(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/app/Activity;Landroid/os/Bundle;Landroid/os/Bundle;Landroid/accounts/AccountManagerCallback&lt;android/os/Bundle>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;android/os/Bundle>;" />
+		<method name="getAccountsByTypeAndFeatures(Ljava/lang/String;[Ljava/lang/String;Landroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" />
+		<method name="getAuthToken(Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" />
+		<method name="getAuthToken(Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;ZLandroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" since="14" />
+		<method name="getAuthToken(Landroid/accounts/Account;Ljava/lang/String;ZLandroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" />
+		<method name="getAuthTokenByFeatures(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/app/Activity;Landroid/os/Bundle;Landroid/os/Bundle;Landroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" />
 		<method name="getAuthenticatorTypes()[Landroid/accounts/AuthenticatorDescription;" />
 		<method name="getPassword(Landroid/accounts/Account;)Ljava/lang/String;" />
 		<method name="getUserData(Landroid/accounts/Account;Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="hasFeatures(Landroid/accounts/Account;[Ljava/lang/String;Landroid/accounts/AccountManagerCallback&lt;java/lang/Boolean>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;java/lang/Boolean>;" since="8" />
+		<method name="hasFeatures(Landroid/accounts/Account;[Ljava/lang/String;Landroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" since="8" />
 		<method name="invalidateAuthToken(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="newChooseAccountIntent(Landroid/accounts/Account;Ljava/util/ArrayList&lt;android/accounts/Account>;[Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/os/Bundle;)Landroid/content/Intent;" since="14" />
+		<method name="newChooseAccountIntent(Landroid/accounts/Account;Ljava/util/ArrayList;[Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/os/Bundle;)Landroid/content/Intent;" since="14" />
 		<method name="peekAuthToken(Landroid/accounts/Account;Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="removeAccount(Landroid/accounts/Account;Landroid/accounts/AccountManagerCallback&lt;java/lang/Boolean>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;java/lang/Boolean>;" />
+		<method name="removeAccount(Landroid/accounts/Account;Landroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" />
 		<method name="removeOnAccountsUpdatedListener(Landroid/accounts/OnAccountsUpdateListener;)V" />
 		<method name="setAuthToken(Landroid/accounts/Account;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="setPassword(Landroid/accounts/Account;Ljava/lang/String;)V" />
 		<method name="setUserData(Landroid/accounts/Account;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="updateCredentials(Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback&lt;android/os/Bundle>;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture&lt;android/os/Bundle>;" />
+		<method name="updateCredentials(Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;Landroid/app/Activity;Landroid/accounts/AccountManagerCallback;Landroid/os/Handler;)Landroid/accounts/AccountManagerFuture;" />
 		<field name="ACTION_AUTHENTICATOR_INTENT" />
 		<field name="AUTHENTICATOR_ATTRIBUTES_NAME" />
 		<field name="AUTHENTICATOR_META_DATA_NAME" />
@@ -2115,7 +2115,7 @@
 		<field name="LOGIN_ACCOUNTS_CHANGED_ACTION" />
 	</class>
 	<class name="android/accounts/AccountManagerCallback" since="5">
-		<method name="run(Landroid/accounts/AccountManagerFuture&lt;V>;)V" />
+		<method name="run(Landroid/accounts/AccountManagerFuture;)V" />
 	</class>
 	<class name="android/accounts/AccountManagerFuture" since="5">
 		<method name="cancel(Z)Z" />
@@ -2181,7 +2181,7 @@
 		<method name="clone()Landroid/animation/Animator;" />
 		<method name="end()V" />
 		<method name="getDuration()J" />
-		<method name="getListeners()Ljava/util/ArrayList&lt;android/animation/Animator$AnimatorListener>;" />
+		<method name="getListeners()Ljava/util/ArrayList;" />
 		<method name="getStartDelay()J" />
 		<method name="isRunning()Z" />
 		<method name="isStarted()Z" since="14" />
@@ -2218,14 +2218,14 @@
 	<class name="android/animation/AnimatorSet" since="11">
 		<extends name="android/animation/Animator" />
 		<method name="&lt;init>()V" />
-		<method name="getChildAnimations()Ljava/util/ArrayList&lt;android/animation/Animator>;" />
+		<method name="getChildAnimations()Ljava/util/ArrayList;" />
 		<method name="getDuration()J" />
 		<method name="getStartDelay()J" />
 		<method name="isRunning()Z" />
 		<method name="play(Landroid/animation/Animator;)Landroid/animation/AnimatorSet$Builder;" />
-		<method name="playSequentially(Ljava/util/List&lt;android/animation/Animator>;)V" />
+		<method name="playSequentially(Ljava/util/List;)V" />
 		<method name="playSequentially([Landroid/animation/Animator;)V" />
-		<method name="playTogether(Ljava/util/Collection&lt;android/animation/Animator>;)V" />
+		<method name="playTogether(Ljava/util/Collection;)V" />
 		<method name="playTogether([Landroid/animation/Animator;)V" />
 		<method name="setDuration(J)Landroid/animation/AnimatorSet;" />
 		<method name="setInterpolator(Landroid/animation/TimeInterpolator;)V" />
@@ -2288,7 +2288,7 @@
 		<method name="getInterpolator(I)Landroid/animation/TimeInterpolator;" />
 		<method name="getStagger(I)J" />
 		<method name="getStartDelay(I)J" />
-		<method name="getTransitionListeners()Ljava/util/List&lt;android/animation/LayoutTransition$TransitionListener>;" />
+		<method name="getTransitionListeners()Ljava/util/List;" />
 		<method name="hideChild(Landroid/view/ViewGroup;Landroid/view/View;)V" />
 		<method name="isChangingLayout()Z" />
 		<method name="isRunning()Z" />
@@ -2316,11 +2316,11 @@
 		<method name="&lt;init>()V" />
 		<method name="getPropertyName()Ljava/lang/String;" />
 		<method name="getTarget()Ljava/lang/Object;" />
-		<method name="ofFloat(LT;Landroid/util/Property&lt;T, java$lang/Float>;[F)Landroid/animation/ObjectAnimator;" since="14" />
+		<method name="ofFloat(LT;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;" since="14" />
 		<method name="ofFloat(Ljava/lang/Object;Ljava/lang/String;[F)Landroid/animation/ObjectAnimator;" />
-		<method name="ofInt(LT;Landroid/util/Property&lt;T, java$lang/Integer>;[I)Landroid/animation/ObjectAnimator;" since="14" />
+		<method name="ofInt(LT;Landroid/util/Property;[I)Landroid/animation/ObjectAnimator;" since="14" />
 		<method name="ofInt(Ljava/lang/Object;Ljava/lang/String;[I)Landroid/animation/ObjectAnimator;" />
-		<method name="ofObject(LT;Landroid/util/Property&lt;T, V>;Landroid/animation/TypeEvaluator&lt;V>;[LV;)Landroid/animation/ObjectAnimator;" since="14" />
+		<method name="ofObject(LT;Landroid/util/Property;Landroid/animation/TypeEvaluator;[LV;)Landroid/animation/ObjectAnimator;" since="14" />
 		<method name="ofObject(Ljava/lang/Object;Ljava/lang/String;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)Landroid/animation/ObjectAnimator;" />
 		<method name="ofPropertyValuesHolder(Ljava/lang/Object;[Landroid/animation/PropertyValuesHolder;)Landroid/animation/ObjectAnimator;" />
 		<method name="setProperty(Landroid/util/Property;)V" since="14" />
@@ -2331,13 +2331,13 @@
 		<implements name="java/lang/Cloneable" />
 		<method name="clone()Landroid/animation/PropertyValuesHolder;" />
 		<method name="getPropertyName()Ljava/lang/String;" />
-		<method name="ofFloat(Landroid/util/Property&lt;?, java/lang/Float>;[F)Landroid/animation/PropertyValuesHolder;" since="14" />
+		<method name="ofFloat(Landroid/util/Property;[F)Landroid/animation/PropertyValuesHolder;" since="14" />
 		<method name="ofFloat(Ljava/lang/String;[F)Landroid/animation/PropertyValuesHolder;" />
-		<method name="ofInt(Landroid/util/Property&lt;?, java/lang/Integer>;[I)Landroid/animation/PropertyValuesHolder;" since="14" />
+		<method name="ofInt(Landroid/util/Property;[I)Landroid/animation/PropertyValuesHolder;" since="14" />
 		<method name="ofInt(Ljava/lang/String;[I)Landroid/animation/PropertyValuesHolder;" />
 		<method name="ofKeyframe(Landroid/util/Property;[Landroid/animation/Keyframe;)Landroid/animation/PropertyValuesHolder;" since="14" />
 		<method name="ofKeyframe(Ljava/lang/String;[Landroid/animation/Keyframe;)Landroid/animation/PropertyValuesHolder;" />
-		<method name="ofObject(Landroid/util/Property;Landroid/animation/TypeEvaluator&lt;V>;[LV;)Landroid/animation/PropertyValuesHolder;" since="14" />
+		<method name="ofObject(Landroid/util/Property;Landroid/animation/TypeEvaluator;[LV;)Landroid/animation/PropertyValuesHolder;" since="14" />
 		<method name="ofObject(Ljava/lang/String;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)Landroid/animation/PropertyValuesHolder;" />
 		<method name="setEvaluator(Landroid/animation/TypeEvaluator;)V" />
 		<method name="setFloatValues([F)V" />
@@ -2696,12 +2696,12 @@
 		<method name="getMemoryClass()I" since="5" />
 		<method name="getMemoryInfo(Landroid/app/ActivityManager$MemoryInfo;)V" />
 		<method name="getProcessMemoryInfo([I)[Landroid/os/Debug$MemoryInfo;" since="5" />
-		<method name="getProcessesInErrorState()Ljava/util/List&lt;android/app/ActivityManager$ProcessErrorStateInfo>;" />
-		<method name="getRecentTasks(II)Ljava/util/List&lt;android/app/ActivityManager$RecentTaskInfo>;" />
-		<method name="getRunningAppProcesses()Ljava/util/List&lt;android/app/ActivityManager$RunningAppProcessInfo>;" since="3" />
+		<method name="getProcessesInErrorState()Ljava/util/List;" />
+		<method name="getRecentTasks(II)Ljava/util/List;" />
+		<method name="getRunningAppProcesses()Ljava/util/List;" since="3" />
 		<method name="getRunningServiceControlPanel(Landroid/content/ComponentName;)Landroid/app/PendingIntent;" since="5" />
-		<method name="getRunningServices(I)Ljava/util/List&lt;android/app/ActivityManager$RunningServiceInfo>;" />
-		<method name="getRunningTasks(I)Ljava/util/List&lt;android/app/ActivityManager$RunningTaskInfo>;" />
+		<method name="getRunningServices(I)Ljava/util/List;" />
+		<method name="getRunningTasks(I)Ljava/util/List;" />
 		<method name="isRunningInTestHarness()Z" since="11" />
 		<method name="isUserAMonkey()Z" since="8" />
 		<method name="killBackgroundProcesses(Ljava/lang/String;)V" since="8" />
@@ -3438,9 +3438,9 @@
 		<method name="invokeContextMenuAction(Landroid/app/Activity;II)Z" />
 		<method name="invokeMenuActionSync(Landroid/app/Activity;II)Z" />
 		<method name="isProfiling()Z" />
-		<method name="newActivity(Ljava/lang/Class&lt;?>;Landroid/content/Context;Landroid/os/IBinder;Landroid/app/Application;Landroid/content/Intent;Landroid/content/pm/ActivityInfo;Ljava/lang/CharSequence;Landroid/app/Activity;Ljava/lang/String;Ljava/lang/Object;)Landroid/app/Activity;" />
+		<method name="newActivity(Ljava/lang/Class;Landroid/content/Context;Landroid/os/IBinder;Landroid/app/Application;Landroid/content/Intent;Landroid/content/pm/ActivityInfo;Ljava/lang/CharSequence;Landroid/app/Activity;Ljava/lang/String;Ljava/lang/Object;)Landroid/app/Activity;" />
 		<method name="newActivity(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Intent;)Landroid/app/Activity;" />
-		<method name="newApplication(Ljava/lang/Class&lt;?>;Landroid/content/Context;)Landroid/app/Application;" />
+		<method name="newApplication(Ljava/lang/Class;Landroid/content/Context;)Landroid/app/Application;" />
 		<method name="newApplication(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Context;)Landroid/app/Application;" />
 		<method name="onCreate(Landroid/os/Bundle;)V" />
 		<method name="onDestroy()V" />
@@ -3516,8 +3516,8 @@
 		<method name="getTargetIntent()Landroid/content/Intent;" />
 		<method name="intentForPosition(I)Landroid/content/Intent;" since="3" />
 		<method name="itemForPosition(I)Landroid/app/LauncherActivity$ListItem;" since="4" />
-		<method name="makeListItems()Ljava/util/List&lt;android/app/LauncherActivity$ListItem>;" since="3" />
-		<method name="onQueryPackageManager(Landroid/content/Intent;)Ljava/util/List&lt;android/content/pm/ResolveInfo>;" since="5" />
+		<method name="makeListItems()Ljava/util/List;" since="3" />
+		<method name="onQueryPackageManager(Landroid/content/Intent;)Ljava/util/List;" since="5" />
 		<method name="onSetContentView()V" since="5" />
 	</class>
 	<class name="android/app/LauncherActivity$IconResizer" since="3">
@@ -3566,14 +3566,14 @@
 		<method name="destroyLoader(I)V" />
 		<method name="dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V" />
 		<method name="enableDebugLogging(Z)V" />
-		<method name="getLoader(I)Landroid/content/Loader&lt;D>;" />
-		<method name="initLoader(ILandroid/os/Bundle;Landroid/app/LoaderManager$LoaderCallbacks&lt;D>;)Landroid/content/Loader&lt;D>;" />
-		<method name="restartLoader(ILandroid/os/Bundle;Landroid/app/LoaderManager$LoaderCallbacks&lt;D>;)Landroid/content/Loader&lt;D>;" />
+		<method name="getLoader(I)Landroid/content/Loader;" />
+		<method name="initLoader(ILandroid/os/Bundle;Landroid/app/LoaderManager$LoaderCallbacks;)Landroid/content/Loader;" />
+		<method name="restartLoader(ILandroid/os/Bundle;Landroid/app/LoaderManager$LoaderCallbacks;)Landroid/content/Loader;" />
 	</class>
 	<class name="android/app/LoaderManager$LoaderCallbacks" since="11">
-		<method name="onCreateLoader(ILandroid/os/Bundle;)Landroid/content/Loader&lt;D>;" />
-		<method name="onLoadFinished(Landroid/content/Loader&lt;D>;LD;)V" />
-		<method name="onLoaderReset(Landroid/content/Loader&lt;D>;)V" />
+		<method name="onCreateLoader(ILandroid/os/Bundle;)Landroid/content/Loader;" />
+		<method name="onLoadFinished(Landroid/content/Loader;LD;)V" />
+		<method name="onLoaderReset(Landroid/content/Loader;)V" />
 	</class>
 	<class name="android/app/LocalActivityManager" since="1">
 		<extends name="java/lang/Object" />
@@ -3754,7 +3754,7 @@
 		<implements name="android/content/DialogInterface$OnCancelListener" />
 		<implements name="android/content/DialogInterface$OnDismissListener" />
 		<method name="getSearchableInfo(Landroid/content/ComponentName;)Landroid/app/SearchableInfo;" since="8" />
-		<method name="getSearchablesInGlobalSearch()Ljava/util/List&lt;android/app/SearchableInfo>;" since="8" />
+		<method name="getSearchablesInGlobalSearch()Ljava/util/List;" since="8" />
 		<method name="onCancel(Landroid/content/DialogInterface;)V" />
 		<method name="onDismiss(Landroid/content/DialogInterface;)V" />
 		<method name="setOnCancelListener(Landroid/app/SearchManager$OnCancelListener;)V" />
@@ -4006,7 +4006,7 @@
 	</class>
 	<class name="android/app/admin/DevicePolicyManager" since="8">
 		<extends name="java/lang/Object" />
-		<method name="getActiveAdmins()Ljava/util/List&lt;android/content/ComponentName>;" />
+		<method name="getActiveAdmins()Ljava/util/List;" />
 		<method name="getCameraDisabled(Landroid/content/ComponentName;)Z" since="14" />
 		<method name="getCurrentFailedPasswordAttempts()I" />
 		<method name="getMaximumFailedPasswordsForWipe(Landroid/content/ComponentName;)I" />
@@ -4175,7 +4175,7 @@
 		<method name="bindAppWidgetId(ILandroid/content/ComponentName;)V" />
 		<method name="getAppWidgetIds(Landroid/content/ComponentName;)[I" />
 		<method name="getAppWidgetInfo(I)Landroid/appwidget/AppWidgetProviderInfo;" />
-		<method name="getInstalledProviders()Ljava/util/List&lt;android/appwidget/AppWidgetProviderInfo>;" />
+		<method name="getInstalledProviders()Ljava/util/List;" />
 		<method name="getInstance(Landroid/content/Context;)Landroid/appwidget/AppWidgetManager;" />
 		<method name="notifyAppWidgetViewDataChanged(II)V" since="11" />
 		<method name="notifyAppWidgetViewDataChanged([II)V" since="11" />
@@ -4235,9 +4235,9 @@
 	<class name="android/bluetooth/BluetoothA2dp" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/bluetooth/BluetoothProfile" />
-		<method name="getConnectedDevices()Ljava/util/List&lt;android/bluetooth/BluetoothDevice>;" />
+		<method name="getConnectedDevices()Ljava/util/List;" />
 		<method name="getConnectionState(Landroid/bluetooth/BluetoothDevice;)I" />
-		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List&lt;android/bluetooth/BluetoothDevice>;" />
+		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List;" />
 		<method name="isA2dpPlaying(Landroid/bluetooth/BluetoothDevice;)Z" />
 		<field name="ACTION_CONNECTION_STATE_CHANGED" />
 		<field name="ACTION_PLAYING_STATE_CHANGED" />
@@ -4252,7 +4252,7 @@
 		<method name="disable()Z" />
 		<method name="enable()Z" />
 		<method name="getAddress()Ljava/lang/String;" />
-		<method name="getBondedDevices()Ljava/util/Set&lt;android/bluetooth/BluetoothDevice>;" />
+		<method name="getBondedDevices()Ljava/util/Set;" />
 		<method name="getDefaultAdapter()Landroid/bluetooth/BluetoothAdapter;" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getProfileConnectionState(I)I" since="14" />
@@ -4524,9 +4524,9 @@
 	<class name="android/bluetooth/BluetoothHeadset" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/bluetooth/BluetoothProfile" />
-		<method name="getConnectedDevices()Ljava/util/List&lt;android/bluetooth/BluetoothDevice>;" />
+		<method name="getConnectedDevices()Ljava/util/List;" />
 		<method name="getConnectionState(Landroid/bluetooth/BluetoothDevice;)I" />
-		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List&lt;android/bluetooth/BluetoothDevice>;" />
+		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List;" />
 		<method name="isAudioConnected(Landroid/bluetooth/BluetoothDevice;)Z" />
 		<method name="startVoiceRecognition(Landroid/bluetooth/BluetoothDevice;)Z" />
 		<method name="stopVoiceRecognition(Landroid/bluetooth/BluetoothDevice;)Z" />
@@ -4550,9 +4550,9 @@
 		<implements name="android/bluetooth/BluetoothProfile" />
 		<method name="connectChannelToSource(Landroid/bluetooth/BluetoothDevice;Landroid/bluetooth/BluetoothHealthAppConfiguration;)Z" />
 		<method name="disconnectChannel(Landroid/bluetooth/BluetoothDevice;Landroid/bluetooth/BluetoothHealthAppConfiguration;I)Z" />
-		<method name="getConnectedDevices()Ljava/util/List&lt;android/bluetooth/BluetoothDevice>;" />
+		<method name="getConnectedDevices()Ljava/util/List;" />
 		<method name="getConnectionState(Landroid/bluetooth/BluetoothDevice;)I" />
-		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List&lt;android/bluetooth/BluetoothDevice>;" />
+		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List;" />
 		<method name="getMainChannelFd(Landroid/bluetooth/BluetoothDevice;Landroid/bluetooth/BluetoothHealthAppConfiguration;)Landroid/os/ParcelFileDescriptor;" />
 		<method name="registerSinkAppConfiguration(Ljava/lang/String;ILandroid/bluetooth/BluetoothHealthCallback;)Z" />
 		<method name="unregisterAppConfiguration(Landroid/bluetooth/BluetoothHealthAppConfiguration;)Z" />
@@ -4584,9 +4584,9 @@
 		<method name="onHealthChannelStateChange(Landroid/bluetooth/BluetoothHealthAppConfiguration;Landroid/bluetooth/BluetoothDevice;IILandroid/os/ParcelFileDescriptor;I)V" />
 	</class>
 	<class name="android/bluetooth/BluetoothProfile" since="11">
-		<method name="getConnectedDevices()Ljava/util/List&lt;android/bluetooth/BluetoothDevice>;" />
+		<method name="getConnectedDevices()Ljava/util/List;" />
 		<method name="getConnectionState(Landroid/bluetooth/BluetoothDevice;)I" />
-		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List&lt;android/bluetooth/BluetoothDevice>;" />
+		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List;" />
 		<field name="A2DP" />
 		<field name="EXTRA_PREVIOUS_STATE" />
 		<field name="EXTRA_STATE" />
@@ -4788,7 +4788,7 @@
 		<implements name="android/os/Parcelable" />
 		<implements name="java/lang/Comparable" since="4" />
 		<implements name="java/lang/Cloneable" since="8" />
-		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/Class&lt;?>;)V" />
+		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/Class;)V" />
 		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
@@ -4812,7 +4812,7 @@
 		<implements name="android/content/ComponentCallbacks" />
 		<implements name="android/content/ComponentCallbacks2" since="14" />
 		<method name="&lt;init>()V" />
-		<method name="applyBatch(Ljava/util/ArrayList&lt;android/content/ContentProviderOperation>;)[Landroid/content/ContentProviderResult;" since="5" />
+		<method name="applyBatch(Ljava/util/ArrayList;)[Landroid/content/ContentProviderResult;" since="5" />
 		<method name="attachInfo(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V" />
 		<method name="bulkInsert(Landroid/net/Uri;[Landroid/content/ContentValues;)I" />
 		<method name="call(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;" since="11" />
@@ -4832,7 +4832,7 @@
 		<method name="openAssetFile(Landroid/net/Uri;Ljava/lang/String;)Landroid/content/res/AssetFileDescriptor;" since="3" />
 		<method name="openFile(Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;" />
 		<method name="openFileHelper(Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;" />
-		<method name="openPipeHelper(Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;LT;Landroid/content/ContentProvider$PipeDataWriter&lt;T>;)Landroid/os/ParcelFileDescriptor;" since="11" />
+		<method name="openPipeHelper(Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;LT;Landroid/content/ContentProvider$PipeDataWriter;)Landroid/os/ParcelFileDescriptor;" since="11" />
 		<method name="openTypedAssetFile(Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;)Landroid/content/res/AssetFileDescriptor;" since="11" />
 		<method name="query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;" />
 		<method name="setPathPermissions([Landroid/content/pm/PathPermission;)V" since="4" />
@@ -4846,7 +4846,7 @@
 	</class>
 	<class name="android/content/ContentProviderClient" since="5">
 		<extends name="java/lang/Object" />
-		<method name="applyBatch(Ljava/util/ArrayList&lt;android/content/ContentProviderOperation>;)[Landroid/content/ContentProviderResult;" />
+		<method name="applyBatch(Ljava/util/ArrayList;)[Landroid/content/ContentProviderResult;" />
 		<method name="bulkInsert(Landroid/net/Uri;[Landroid/content/ContentValues;)I" />
 		<method name="delete(Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I" />
 		<method name="getLocalContentProvider()Landroid/content/ContentProvider;" />
@@ -4906,7 +4906,7 @@
 		<extends name="java/util/Observable" />
 		<method name="&lt;init>(Landroid/database/Cursor;Ljava/lang/String;ZLandroid/os/Handler;)V" />
 		<method name="close()V" />
-		<method name="getRows()Ljava/util/Map&lt;java/lang/String, android$content/ContentValues>;" />
+		<method name="getRows()Ljava/util/Map;" />
 		<method name="getValues(Ljava/lang/String;)Landroid/content/ContentValues;" />
 		<method name="requery()V" />
 		<method name="setKeepUpdated(Z)V" />
@@ -4918,17 +4918,17 @@
 		<method name="acquireContentProviderClient(Ljava/lang/String;)Landroid/content/ContentProviderClient;" since="5" />
 		<method name="addPeriodicSync(Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;J)V" since="8" />
 		<method name="addStatusChangeListener(ILandroid/content/SyncStatusObserver;)Ljava/lang/Object;" since="5" />
-		<method name="applyBatch(Ljava/lang/String;Ljava/util/ArrayList&lt;android/content/ContentProviderOperation>;)[Landroid/content/ContentProviderResult;" since="5" />
+		<method name="applyBatch(Ljava/lang/String;Ljava/util/ArrayList;)[Landroid/content/ContentProviderResult;" since="5" />
 		<method name="bulkInsert(Landroid/net/Uri;[Landroid/content/ContentValues;)I" />
 		<method name="call(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;" since="11" />
 		<method name="cancelSync(Landroid/accounts/Account;Ljava/lang/String;)V" since="5" />
 		<method name="cancelSync(Landroid/net/Uri;)V" />
 		<method name="delete(Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I" />
 		<method name="getCurrentSync()Landroid/content/SyncInfo;" since="8" />
-		<method name="getCurrentSyncs()Ljava/util/List&lt;android/content/SyncInfo>;" since="11" />
+		<method name="getCurrentSyncs()Ljava/util/List;" since="11" />
 		<method name="getIsSyncable(Landroid/accounts/Account;Ljava/lang/String;)I" since="5" />
 		<method name="getMasterSyncAutomatically()Z" since="5" />
-		<method name="getPeriodicSyncs(Landroid/accounts/Account;Ljava/lang/String;)Ljava/util/List&lt;android/content/PeriodicSync>;" since="8" />
+		<method name="getPeriodicSyncs(Landroid/accounts/Account;Ljava/lang/String;)Ljava/util/List;" since="8" />
 		<method name="getStreamTypes(Landroid/net/Uri;Ljava/lang/String;)[Ljava/lang/String;" since="11" />
 		<method name="getSyncAdapterTypes()[Landroid/content/SyncAdapterType;" since="5" />
 		<method name="getSyncAutomatically(Landroid/accounts/Account;Ljava/lang/String;)Z" since="5" />
@@ -5002,7 +5002,7 @@
 		<method name="getAsLong(Ljava/lang/String;)Ljava/lang/Long;" />
 		<method name="getAsShort(Ljava/lang/String;)Ljava/lang/Short;" />
 		<method name="getAsString(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="keySet()Ljava/util/Set&lt;java/lang/String>;" since="11" />
+		<method name="keySet()Ljava/util/Set;" since="11" />
 		<method name="put(Ljava/lang/String;Ljava/lang/Boolean;)V" />
 		<method name="put(Ljava/lang/String;Ljava/lang/Byte;)V" />
 		<method name="put(Ljava/lang/String;Ljava/lang/Double;)V" />
@@ -5016,7 +5016,7 @@
 		<method name="putNull(Ljava/lang/String;)V" />
 		<method name="remove(Ljava/lang/String;)V" />
 		<method name="size()I" />
-		<method name="valueSet()Ljava/util/Set&lt;java/util/Map$Entry&lt;java/lang/String, java$lang/Object>>;" />
+		<method name="valueSet()Ljava/util/Set;" />
 		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="TAG" />
@@ -5283,7 +5283,7 @@
 		<method name="&lt;init>(Landroid/content/ContentValues;)V" />
 		<method name="addSubValue(Landroid/net/Uri;Landroid/content/ContentValues;)V" />
 		<method name="getEntityValues()Landroid/content/ContentValues;" />
-		<method name="getSubValues()Ljava/util/ArrayList&lt;android/content/Entity$NamedContentValues>;" />
+		<method name="getSubValues()Ljava/util/ArrayList;" />
 	</class>
 	<class name="android/content/Entity$NamedContentValues" since="8">
 		<extends name="java/lang/Object" />
@@ -5301,11 +5301,11 @@
 		<implements name="android/os/Parcelable" />
 		<implements name="java/lang/Cloneable" since="8" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/Class&lt;?>;)V" />
+		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/Class;)V" />
 		<method name="&lt;init>(Landroid/content/Intent;)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Landroid/net/Uri;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Landroid/net/Uri;Landroid/content/Context;Ljava/lang/Class&lt;?>;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Landroid/net/Uri;Landroid/content/Context;Ljava/lang/Class;)V" />
 		<method name="addCategory(Ljava/lang/String;)Landroid/content/Intent;" />
 		<method name="addFlags(I)Landroid/content/Intent;" />
 		<method name="clone()Ljava/lang/Object;" />
@@ -5321,11 +5321,11 @@
 		<method name="getBundleExtra(Ljava/lang/String;)Landroid/os/Bundle;" />
 		<method name="getByteArrayExtra(Ljava/lang/String;)[B" />
 		<method name="getByteExtra(Ljava/lang/String;B)B" />
-		<method name="getCategories()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getCategories()Ljava/util/Set;" />
 		<method name="getCharArrayExtra(Ljava/lang/String;)[C" />
 		<method name="getCharExtra(Ljava/lang/String;C)C" />
 		<method name="getCharSequenceArrayExtra(Ljava/lang/String;)[Ljava/lang/CharSequence;" since="8" />
-		<method name="getCharSequenceArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList&lt;java/lang/CharSequence>;" since="8" />
+		<method name="getCharSequenceArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList;" since="8" />
 		<method name="getCharSequenceExtra(Ljava/lang/String;)Ljava/lang/CharSequence;" />
 		<method name="getComponent()Landroid/content/ComponentName;" />
 		<method name="getData()Landroid/net/Uri;" />
@@ -5338,14 +5338,14 @@
 		<method name="getFloatExtra(Ljava/lang/String;F)F" />
 		<method name="getIntArrayExtra(Ljava/lang/String;)[I" />
 		<method name="getIntExtra(Ljava/lang/String;I)I" />
-		<method name="getIntegerArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList&lt;java/lang/Integer>;" />
+		<method name="getIntegerArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getIntent(Ljava/lang/String;)Landroid/content/Intent;" />
 		<method name="getIntentOld(Ljava/lang/String;)Landroid/content/Intent;" />
 		<method name="getLongArrayExtra(Ljava/lang/String;)[J" />
 		<method name="getLongExtra(Ljava/lang/String;J)J" />
 		<method name="getPackage()Ljava/lang/String;" since="4" />
 		<method name="getParcelableArrayExtra(Ljava/lang/String;)[Landroid/os/Parcelable;" />
-		<method name="getParcelableArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList&lt;T>;" />
+		<method name="getParcelableArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getParcelableExtra(Ljava/lang/String;)LT;" />
 		<method name="getScheme()Ljava/lang/String;" />
 		<method name="getSelector()Landroid/content/Intent;" since="15" />
@@ -5354,7 +5354,7 @@
 		<method name="getShortExtra(Ljava/lang/String;S)S" />
 		<method name="getSourceBounds()Landroid/graphics/Rect;" since="7" />
 		<method name="getStringArrayExtra(Ljava/lang/String;)[Ljava/lang/String;" />
-		<method name="getStringArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList&lt;java/lang/String>;" />
+		<method name="getStringArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getStringExtra(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getType()Ljava/lang/String;" />
 		<method name="hasCategory(Ljava/lang/String;)Z" />
@@ -5365,7 +5365,7 @@
 		<method name="makeRestartActivityTask(Landroid/content/ComponentName;)Landroid/content/Intent;" since="11" />
 		<method name="parseIntent(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;)Landroid/content/Intent;" />
 		<method name="parseUri(Ljava/lang/String;I)Landroid/content/Intent;" since="4" />
-		<method name="putCharSequenceArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList&lt;java/lang/CharSequence>;)Landroid/content/Intent;" since="8" />
+		<method name="putCharSequenceArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList;)Landroid/content/Intent;" since="8" />
 		<method name="putExtra(Ljava/lang/String;B)Landroid/content/Intent;" />
 		<method name="putExtra(Ljava/lang/String;C)Landroid/content/Intent;" />
 		<method name="putExtra(Ljava/lang/String;D)Landroid/content/Intent;" />
@@ -5392,9 +5392,9 @@
 		<method name="putExtra(Ljava/lang/String;[Z)Landroid/content/Intent;" />
 		<method name="putExtras(Landroid/content/Intent;)Landroid/content/Intent;" />
 		<method name="putExtras(Landroid/os/Bundle;)Landroid/content/Intent;" />
-		<method name="putIntegerArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList&lt;java/lang/Integer>;)Landroid/content/Intent;" />
-		<method name="putParcelableArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList&lt;? extends android/os/Parcelable>;)Landroid/content/Intent;" />
-		<method name="putStringArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList&lt;java/lang/String>;)Landroid/content/Intent;" />
+		<method name="putIntegerArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList;)Landroid/content/Intent;" />
+		<method name="putParcelableArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList;)Landroid/content/Intent;" />
+		<method name="putStringArrayListExtra(Ljava/lang/String;Ljava/util/ArrayList;)Landroid/content/Intent;" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
 		<method name="removeCategory(Ljava/lang/String;)V" />
 		<method name="removeExtra(Ljava/lang/String;)V" />
@@ -5406,7 +5406,7 @@
 		<method name="resolveType(Landroid/content/Context;)Ljava/lang/String;" />
 		<method name="resolveTypeIfNeeded(Landroid/content/ContentResolver;)Ljava/lang/String;" />
 		<method name="setAction(Ljava/lang/String;)Landroid/content/Intent;" />
-		<method name="setClass(Landroid/content/Context;Ljava/lang/Class&lt;?>;)Landroid/content/Intent;" />
+		<method name="setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;" />
 		<method name="setClassName(Landroid/content/Context;Ljava/lang/String;)Landroid/content/Intent;" />
 		<method name="setClassName(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;" />
 		<method name="setComponent(Landroid/content/ComponentName;)Landroid/content/Intent;" />
@@ -5648,15 +5648,15 @@
 		<method name="&lt;init>(Landroid/content/IntentFilter;)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="actionsIterator()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="actionsIterator()Ljava/util/Iterator;" />
 		<method name="addAction(Ljava/lang/String;)V" />
 		<method name="addCategory(Ljava/lang/String;)V" />
 		<method name="addDataAuthority(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="addDataPath(Ljava/lang/String;I)V" />
 		<method name="addDataScheme(Ljava/lang/String;)V" />
 		<method name="addDataType(Ljava/lang/String;)V" />
-		<method name="authoritiesIterator()Ljava/util/Iterator&lt;android/content/IntentFilter$AuthorityEntry>;" />
-		<method name="categoriesIterator()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="authoritiesIterator()Ljava/util/Iterator;" />
+		<method name="categoriesIterator()Ljava/util/Iterator;" />
 		<method name="countActions()I" />
 		<method name="countCategories()I" />
 		<method name="countDataAuthorities()I" />
@@ -5680,16 +5680,16 @@
 		<method name="hasDataScheme(Ljava/lang/String;)Z" />
 		<method name="hasDataType(Ljava/lang/String;)Z" />
 		<method name="match(Landroid/content/ContentResolver;Landroid/content/Intent;ZLjava/lang/String;)I" />
-		<method name="match(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/Uri;Ljava/util/Set&lt;java/lang/String>;Ljava/lang/String;)I" />
+		<method name="match(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/Uri;Ljava/util/Set;Ljava/lang/String;)I" />
 		<method name="matchAction(Ljava/lang/String;)Z" />
-		<method name="matchCategories(Ljava/util/Set&lt;java/lang/String>;)Ljava/lang/String;" />
+		<method name="matchCategories(Ljava/util/Set;)Ljava/lang/String;" />
 		<method name="matchData(Ljava/lang/String;Ljava/lang/String;Landroid/net/Uri;)I" />
 		<method name="matchDataAuthority(Landroid/net/Uri;)I" />
-		<method name="pathsIterator()Ljava/util/Iterator&lt;android/os/PatternMatcher>;" />
+		<method name="pathsIterator()Ljava/util/Iterator;" />
 		<method name="readFromXml(Lorg/xmlpull/v1/XmlPullParser;)V" />
-		<method name="schemesIterator()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="schemesIterator()Ljava/util/Iterator;" />
 		<method name="setPriority(I)V" />
-		<method name="typesIterator()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="typesIterator()Ljava/util/Iterator;" />
 		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<method name="writeToXml(Lorg/xmlpull/v1/XmlSerializer;)V" />
 		<field name="CREATOR" />
@@ -5761,19 +5761,19 @@
 		<method name="onReset()V" />
 		<method name="onStartLoading()V" />
 		<method name="onStopLoading()V" />
-		<method name="registerListener(ILandroid/content/Loader$OnLoadCompleteListener&lt;D>;)V" />
+		<method name="registerListener(ILandroid/content/Loader$OnLoadCompleteListener;)V" />
 		<method name="reset()V" />
 		<method name="startLoading()V" />
 		<method name="stopLoading()V" />
 		<method name="takeContentChanged()Z" />
-		<method name="unregisterListener(Landroid/content/Loader$OnLoadCompleteListener&lt;D>;)V" />
+		<method name="unregisterListener(Landroid/content/Loader$OnLoadCompleteListener;)V" />
 	</class>
 	<class name="android/content/Loader$ForceLoadContentObserver" since="11">
 		<extends name="android/database/ContentObserver" />
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/content/Loader$OnLoadCompleteListener" since="11">
-		<method name="onLoadComplete(Landroid/content/Loader&lt;D>;LD;)V" />
+		<method name="onLoadComplete(Landroid/content/Loader;LD;)V" />
 	</class>
 	<class name="android/content/MutableContextWrapper" since="1">
 		<extends name="android/content/ContextWrapper" />
@@ -5826,13 +5826,13 @@
 	<class name="android/content/SharedPreferences" since="1">
 		<method name="contains(Ljava/lang/String;)Z" />
 		<method name="edit()Landroid/content/SharedPreferences$Editor;" />
-		<method name="getAll()Ljava/util/Map&lt;java/lang/String, ?>;" />
+		<method name="getAll()Ljava/util/Map;" />
 		<method name="getBoolean(Ljava/lang/String;Z)Z" />
 		<method name="getFloat(Ljava/lang/String;F)F" />
 		<method name="getInt(Ljava/lang/String;I)I" />
 		<method name="getLong(Ljava/lang/String;J)J" />
 		<method name="getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getStringSet(Ljava/lang/String;Ljava/util/Set&lt;java/lang/String>;)Ljava/util/Set&lt;java/lang/String>;" since="11" />
+		<method name="getStringSet(Ljava/lang/String;Ljava/util/Set;)Ljava/util/Set;" since="11" />
 		<method name="registerOnSharedPreferenceChangeListener(Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;)V" />
 		<method name="unregisterOnSharedPreferenceChangeListener(Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;)V" />
 	</class>
@@ -5845,7 +5845,7 @@
 		<method name="putInt(Ljava/lang/String;I)Landroid/content/SharedPreferences$Editor;" />
 		<method name="putLong(Ljava/lang/String;J)Landroid/content/SharedPreferences$Editor;" />
 		<method name="putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;" />
-		<method name="putStringSet(Ljava/lang/String;Ljava/util/Set&lt;java/lang/String>;)Landroid/content/SharedPreferences$Editor;" since="11" />
+		<method name="putStringSet(Ljava/lang/String;Ljava/util/Set;)Landroid/content/SharedPreferences$Editor;" since="11" />
 		<method name="remove(Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;" />
 	</class>
 	<class name="android/content/SharedPreferences$OnSharedPreferenceChangeListener" since="1">
@@ -6212,7 +6212,7 @@
 		<method name="getActivityInfo(Landroid/content/ComponentName;I)Landroid/content/pm/ActivityInfo;" />
 		<method name="getActivityLogo(Landroid/content/ComponentName;)Landroid/graphics/drawable/Drawable;" since="9" />
 		<method name="getActivityLogo(Landroid/content/Intent;)Landroid/graphics/drawable/Drawable;" since="9" />
-		<method name="getAllPermissionGroups(I)Ljava/util/List&lt;android/content/pm/PermissionGroupInfo>;" />
+		<method name="getAllPermissionGroups(I)Ljava/util/List;" />
 		<method name="getApplicationEnabledSetting(Ljava/lang/String;)I" />
 		<method name="getApplicationIcon(Landroid/content/pm/ApplicationInfo;)Landroid/graphics/drawable/Drawable;" />
 		<method name="getApplicationIcon(Ljava/lang/String;)Landroid/graphics/drawable/Drawable;" />
@@ -6223,8 +6223,8 @@
 		<method name="getComponentEnabledSetting(Landroid/content/ComponentName;)I" />
 		<method name="getDefaultActivityIcon()Landroid/graphics/drawable/Drawable;" />
 		<method name="getDrawable(Ljava/lang/String;ILandroid/content/pm/ApplicationInfo;)Landroid/graphics/drawable/Drawable;" />
-		<method name="getInstalledApplications(I)Ljava/util/List&lt;android/content/pm/ApplicationInfo>;" />
-		<method name="getInstalledPackages(I)Ljava/util/List&lt;android/content/pm/PackageInfo>;" />
+		<method name="getInstalledApplications(I)Ljava/util/List;" />
+		<method name="getInstalledPackages(I)Ljava/util/List;" />
 		<method name="getInstallerPackageName(Ljava/lang/String;)Ljava/lang/String;" since="5" />
 		<method name="getInstrumentationInfo(Landroid/content/ComponentName;I)Landroid/content/pm/InstrumentationInfo;" />
 		<method name="getLaunchIntentForPackage(Ljava/lang/String;)Landroid/content/Intent;" since="3" />
@@ -6235,8 +6235,8 @@
 		<method name="getPackagesForUid(I)[Ljava/lang/String;" />
 		<method name="getPermissionGroupInfo(Ljava/lang/String;I)Landroid/content/pm/PermissionGroupInfo;" />
 		<method name="getPermissionInfo(Ljava/lang/String;I)Landroid/content/pm/PermissionInfo;" />
-		<method name="getPreferredActivities(Ljava/util/List&lt;android/content/IntentFilter>;Ljava/util/List&lt;android/content/ComponentName>;Ljava/lang/String;)I" />
-		<method name="getPreferredPackages(I)Ljava/util/List&lt;android/content/pm/PackageInfo>;" />
+		<method name="getPreferredActivities(Ljava/util/List;Ljava/util/List;Ljava/lang/String;)I" />
+		<method name="getPreferredPackages(I)Ljava/util/List;" />
 		<method name="getProviderInfo(Landroid/content/ComponentName;I)Landroid/content/pm/ProviderInfo;" since="9" />
 		<method name="getReceiverInfo(Landroid/content/ComponentName;I)Landroid/content/pm/ActivityInfo;" />
 		<method name="getResourcesForActivity(Landroid/content/ComponentName;)Landroid/content/res/Resources;" />
@@ -6251,13 +6251,13 @@
 		<method name="installPackage(Landroid/net/Uri;)V" />
 		<method name="installPackage(Landroid/net/Uri;Landroid/content/pm/IPackageInstallObserver;I)V" />
 		<method name="isSafeMode()Z" since="3" />
-		<method name="queryBroadcastReceivers(Landroid/content/Intent;I)Ljava/util/List&lt;android/content/pm/ResolveInfo>;" />
-		<method name="queryContentProviders(Ljava/lang/String;II)Ljava/util/List&lt;android/content/pm/ProviderInfo>;" />
-		<method name="queryInstrumentation(Ljava/lang/String;I)Ljava/util/List&lt;android/content/pm/InstrumentationInfo>;" />
-		<method name="queryIntentActivities(Landroid/content/Intent;I)Ljava/util/List&lt;android/content/pm/ResolveInfo>;" />
-		<method name="queryIntentActivityOptions(Landroid/content/ComponentName;[Landroid/content/Intent;Landroid/content/Intent;I)Ljava/util/List&lt;android/content/pm/ResolveInfo>;" />
-		<method name="queryIntentServices(Landroid/content/Intent;I)Ljava/util/List&lt;android/content/pm/ResolveInfo>;" />
-		<method name="queryPermissionsByGroup(Ljava/lang/String;I)Ljava/util/List&lt;android/content/pm/PermissionInfo>;" />
+		<method name="queryBroadcastReceivers(Landroid/content/Intent;I)Ljava/util/List;" />
+		<method name="queryContentProviders(Ljava/lang/String;II)Ljava/util/List;" />
+		<method name="queryInstrumentation(Ljava/lang/String;I)Ljava/util/List;" />
+		<method name="queryIntentActivities(Landroid/content/Intent;I)Ljava/util/List;" />
+		<method name="queryIntentActivityOptions(Landroid/content/ComponentName;[Landroid/content/Intent;Landroid/content/Intent;I)Ljava/util/List;" />
+		<method name="queryIntentServices(Landroid/content/Intent;I)Ljava/util/List;" />
+		<method name="queryPermissionsByGroup(Ljava/lang/String;I)Ljava/util/List;" />
 		<method name="removePackageFromPreferred(Ljava/lang/String;)V" />
 		<method name="removePermission(Ljava/lang/String;)V" />
 		<method name="resolveActivity(Landroid/content/Intent;I)Landroid/content/pm/ResolveInfo;" />
@@ -6939,7 +6939,7 @@
 		<implements name="java/util/Iterator" />
 		<method name="&lt;init>(Landroid/database/Cursor;[Ljava/lang/String;Landroid/database/Cursor;[Ljava/lang/String;)V" />
 		<method name="hasNext()Z" />
-		<method name="iterator()Ljava/util/Iterator&lt;android/database/CursorJoiner$Result>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="next()Landroid/database/CursorJoiner$Result;" />
 		<method name="remove()V" />
 	</class>
@@ -6947,9 +6947,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/database/CursorJoiner$Result;" />
 		<method name="values()[Landroid/database/CursorJoiner$Result;" />
-		<field name="BOTH" />
-		<field name="LEFT" />
-		<field name="RIGHT" />
+		<field name="BOTH" since="14" />
+		<field name="LEFT" since="14" />
+		<field name="RIGHT" since="14" />
 	</class>
 	<class name="android/database/CursorWindow" since="1">
 		<extends name="android/database/sqlite/SQLiteClosable" />
@@ -7140,7 +7140,7 @@
 		<extends name="android/database/AbstractCursor" />
 		<method name="&lt;init>([Ljava/lang/String;)V" />
 		<method name="&lt;init>([Ljava/lang/String;I)V" />
-		<method name="addRow(Ljava/lang/Iterable&lt;?>;)V" />
+		<method name="addRow(Ljava/lang/Iterable;)V" />
 		<method name="addRow([Ljava/lang/Object;)V" />
 		<method name="getColumnNames()[Ljava/lang/String;" />
 		<method name="getCount()I" />
@@ -7258,11 +7258,11 @@
 		<method name="execSQL(Ljava/lang/String;)V" />
 		<method name="execSQL(Ljava/lang/String;[Ljava/lang/Object;)V" />
 		<method name="findEditTable(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getAttachedDbs()Ljava/util/List&lt;android/util/Pair&lt;java/lang/String, java$lang/String>>;" since="11" />
+		<method name="getAttachedDbs()Ljava/util/List;" since="11" />
 		<method name="getMaximumSize()J" />
 		<method name="getPageSize()J" />
 		<method name="getPath()Ljava/lang/String;" />
-		<method name="getSyncedTables()Ljava/util/Map&lt;java/lang/String, java$lang/String>;" />
+		<method name="getSyncedTables()Ljava/util/Map;" />
 		<method name="getVersion()I" />
 		<method name="inTransaction()Z" />
 		<method name="insert(Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)J" />
@@ -7414,14 +7414,14 @@
 		<method name="buildQuery([Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="buildQueryString(ZLjava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="buildUnionQuery([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="buildUnionSubQuery(Ljava/lang/String;[Ljava/lang/String;Ljava/util/Set&lt;java/lang/String>;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" since="11" />
-		<method name="buildUnionSubQuery(Ljava/lang/String;[Ljava/lang/String;Ljava/util/Set&lt;java/lang/String>;ILjava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
+		<method name="buildUnionSubQuery(Ljava/lang/String;[Ljava/lang/String;Ljava/util/Set;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" since="11" />
+		<method name="buildUnionSubQuery(Ljava/lang/String;[Ljava/lang/String;Ljava/util/Set;ILjava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getTables()Ljava/lang/String;" />
 		<method name="query(Landroid/database/sqlite/SQLiteDatabase;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;" />
 		<method name="query(Landroid/database/sqlite/SQLiteDatabase;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;" />
 		<method name="setCursorFactory(Landroid/database/sqlite/SQLiteDatabase$CursorFactory;)V" />
 		<method name="setDistinct(Z)V" />
-		<method name="setProjectionMap(Ljava/util/Map&lt;java/lang/String, java$lang/String>;)V" />
+		<method name="setProjectionMap(Ljava/util/Map;)V" />
 		<method name="setStrict(Z)V" since="14" />
 		<method name="setTables(Ljava/lang/String;)V" />
 	</class>
@@ -7462,7 +7462,7 @@
 	<class name="android/drm/DrmErrorEvent" since="11">
 		<extends name="android/drm/DrmEvent" />
 		<method name="&lt;init>(IILjava/lang/String;)V" />
-		<method name="&lt;init>(IILjava/lang/String;Ljava/util/HashMap&lt;java/lang/String, java$lang/Object>;)V" since="12" />
+		<method name="&lt;init>(IILjava/lang/String;Ljava/util/HashMap;)V" since="12" />
 		<field name="TYPE_ACQUIRE_DRM_INFO_FAILED" since="12" />
 		<field name="TYPE_NOT_SUPPORTED" />
 		<field name="TYPE_NO_INTERNET_CONNECTION" />
@@ -7475,7 +7475,7 @@
 	<class name="android/drm/DrmEvent" since="11">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(IILjava/lang/String;)V" />
-		<method name="&lt;init>(IILjava/lang/String;Ljava/util/HashMap&lt;java/lang/String, java$lang/Object>;)V" since="12" />
+		<method name="&lt;init>(IILjava/lang/String;Ljava/util/HashMap;)V" since="12" />
 		<method name="getAttribute(Ljava/lang/String;)Ljava/lang/Object;" since="12" />
 		<method name="getMessage()Ljava/lang/String;" />
 		<method name="getType()I" />
@@ -7493,14 +7493,14 @@
 		<method name="getData()[B" />
 		<method name="getInfoType()I" />
 		<method name="getMimeType()Ljava/lang/String;" />
-		<method name="iterator()Ljava/util/Iterator&lt;java/lang/Object>;" />
-		<method name="keyIterator()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
+		<method name="keyIterator()Ljava/util/Iterator;" />
 		<method name="put(Ljava/lang/String;Ljava/lang/Object;)V" />
 	</class>
 	<class name="android/drm/DrmInfoEvent" since="11">
 		<extends name="android/drm/DrmEvent" />
 		<method name="&lt;init>(IILjava/lang/String;)V" />
-		<method name="&lt;init>(IILjava/lang/String;Ljava/util/HashMap&lt;java/lang/String, java$lang/Object>;)V" since="12" />
+		<method name="&lt;init>(IILjava/lang/String;Ljava/util/HashMap;)V" since="12" />
 		<field name="TYPE_ACCOUNT_ALREADY_REGISTERED" />
 		<field name="TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT" />
 		<field name="TYPE_REMOVE_RIGHTS" />
@@ -7514,8 +7514,8 @@
 		<method name="get(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="getInfoType()I" />
 		<method name="getMimeType()Ljava/lang/String;" />
-		<method name="iterator()Ljava/util/Iterator&lt;java/lang/Object>;" />
-		<method name="keyIterator()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
+		<method name="keyIterator()Ljava/util/Iterator;" />
 		<method name="put(Ljava/lang/String;Ljava/lang/Object;)V" />
 		<field name="ACCOUNT_ID" />
 		<field name="SUBSCRIPTION_ID" />
@@ -7573,7 +7573,7 @@
 	</class>
 	<class name="android/drm/DrmManagerClient$OnEventListener" since="11">
 		<method name="onEvent(Landroid/drm/DrmManagerClient;Landroid/drm/DrmEvent;)V" since="12" />
-		<method name="onEvent(Landroid/drm/DrmManagerClient;Landroid/drm/DrmEvent;Ljava/util/HashMap&lt;java/lang/String, java$lang/Object>;)V" />
+		<method name="onEvent(Landroid/drm/DrmManagerClient;Landroid/drm/DrmEvent;Ljava/util/HashMap;)V" />
 	</class>
 	<class name="android/drm/DrmManagerClient$OnInfoListener" since="11">
 		<method name="onInfo(Landroid/drm/DrmManagerClient;Landroid/drm/DrmInfoEvent;)V" />
@@ -7644,8 +7644,8 @@
 		<method name="addFileSuffix(Ljava/lang/String;)V" />
 		<method name="addMimeType(Ljava/lang/String;)V" />
 		<method name="getDescriprition()Ljava/lang/String;" />
-		<method name="getFileSuffixIterator()Ljava/util/Iterator&lt;java/lang/String>;" />
-		<method name="getMimeTypeIterator()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="getFileSuffixIterator()Ljava/util/Iterator;" />
+		<method name="getMimeTypeIterator()Ljava/util/Iterator;" />
 		<method name="setDescription(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/drm/DrmUtils" since="11">
@@ -7656,8 +7656,8 @@
 	<class name="android/drm/DrmUtils$ExtendedMetadataParser" since="11">
 		<extends name="java/lang/Object" />
 		<method name="get(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="iterator()Ljava/util/Iterator&lt;java/lang/String>;" />
-		<method name="keyIterator()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
+		<method name="keyIterator()Ljava/util/Iterator;" />
 	</class>
 	<class name="android/drm/ProcessedData" since="11">
 		<extends name="java/lang/Object" />
@@ -7675,7 +7675,7 @@
 		<method name="getBoundingBox()Landroid/graphics/RectF;" />
 		<method name="getID()J" />
 		<method name="getLength()F" />
-		<method name="getStrokes()Ljava/util/ArrayList&lt;android/gesture/GestureStroke>;" />
+		<method name="getStrokes()Ljava/util/ArrayList;" />
 		<method name="getStrokesCount()I" />
 		<method name="toBitmap(IIII)Landroid/graphics/Bitmap;" />
 		<method name="toBitmap(IIIII)Landroid/graphics/Bitmap;" />
@@ -7697,13 +7697,13 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="addGesture(Ljava/lang/String;Landroid/gesture/Gesture;)V" />
-		<method name="getGestureEntries()Ljava/util/Set&lt;java/lang/String>;" />
-		<method name="getGestures(Ljava/lang/String;)Ljava/util/ArrayList&lt;android/gesture/Gesture>;" />
+		<method name="getGestureEntries()Ljava/util/Set;" />
+		<method name="getGestures(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getOrientationStyle()I" />
 		<method name="getSequenceType()I" />
 		<method name="isReadOnly()Z" />
 		<method name="load()Z" />
-		<method name="recognize(Landroid/gesture/Gesture;)Ljava/util/ArrayList&lt;android/gesture/Prediction>;" />
+		<method name="recognize(Landroid/gesture/Gesture;)Ljava/util/ArrayList;" />
 		<method name="removeEntry(Ljava/lang/String;)V" />
 		<method name="removeGesture(Ljava/lang/String;Landroid/gesture/Gesture;)V" />
 		<method name="save()Z" />
@@ -7722,7 +7722,7 @@
 		<method name="cancelClearAnimation()V" />
 		<method name="cancelGesture()V" />
 		<method name="clear(Z)V" />
-		<method name="getCurrentStroke()Ljava/util/ArrayList&lt;android/gesture/GesturePoint>;" />
+		<method name="getCurrentStroke()Ljava/util/ArrayList;" />
 		<method name="getFadeOffset()J" />
 		<method name="getGesture()Landroid/gesture/Gesture;" />
 		<method name="getGestureColor()I" />
@@ -7788,14 +7788,14 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="addGesture(Ljava/lang/String;Landroid/gesture/Gesture;)V" />
-		<method name="getGestureEntries()Ljava/util/Set&lt;java/lang/String>;" />
-		<method name="getGestures(Ljava/lang/String;)Ljava/util/ArrayList&lt;android/gesture/Gesture>;" />
+		<method name="getGestureEntries()Ljava/util/Set;" />
+		<method name="getGestures(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getOrientationStyle()I" />
 		<method name="getSequenceType()I" />
 		<method name="hasChanged()Z" />
 		<method name="load(Ljava/io/InputStream;)V" />
 		<method name="load(Ljava/io/InputStream;Z)V" />
-		<method name="recognize(Landroid/gesture/Gesture;)Ljava/util/ArrayList&lt;android/gesture/Prediction>;" />
+		<method name="recognize(Landroid/gesture/Gesture;)Ljava/util/ArrayList;" />
 		<method name="removeEntry(Ljava/lang/String;)V" />
 		<method name="removeGesture(Ljava/lang/String;Landroid/gesture/Gesture;)V" />
 		<method name="save(Ljava/io/OutputStream;)V" />
@@ -7809,7 +7809,7 @@
 	</class>
 	<class name="android/gesture/GestureStroke" since="4">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(Ljava/util/ArrayList&lt;android/gesture/GesturePoint>;)V" />
+		<method name="&lt;init>(Ljava/util/ArrayList;)V" />
 		<method name="clearPath()V" />
 		<method name="clone()Ljava/lang/Object;" since="8" />
 		<method name="computeOrientedBoundingBox()Landroid/gesture/OrientedBoundingBox;" />
@@ -7821,7 +7821,7 @@
 	</class>
 	<class name="android/gesture/GestureUtils" since="8">
 		<extends name="java/lang/Object" />
-		<method name="computeOrientedBoundingBox(Ljava/util/ArrayList&lt;android/gesture/GesturePoint>;)Landroid/gesture/OrientedBoundingBox;" />
+		<method name="computeOrientedBoundingBox(Ljava/util/ArrayList;)Landroid/gesture/OrientedBoundingBox;" />
 		<method name="computeOrientedBoundingBox([F)Landroid/gesture/OrientedBoundingBox;" />
 		<method name="spatialSampling(Landroid/gesture/Gesture;I)[F" />
 		<method name="spatialSampling(Landroid/gesture/Gesture;IZ)[F" />
@@ -7849,8 +7849,8 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/AvoidXfermode$Mode;" />
 		<method name="values()[Landroid/graphics/AvoidXfermode$Mode;" />
-		<field name="AVOID" />
-		<field name="TARGET" />
+		<field name="AVOID" since="14" />
+		<field name="TARGET" since="14" />
 	</class>
 	<class name="android/graphics/Bitmap" since="1">
 		<extends name="java/lang/Object" />
@@ -7904,18 +7904,18 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Bitmap$CompressFormat;" />
 		<method name="values()[Landroid/graphics/Bitmap$CompressFormat;" />
-		<field name="JPEG" />
-		<field name="PNG" />
+		<field name="JPEG" since="14" />
+		<field name="PNG" since="14" />
 		<field name="WEBP" since="14" />
 	</class>
 	<class name="android/graphics/Bitmap$Config" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Bitmap$Config;" />
 		<method name="values()[Landroid/graphics/Bitmap$Config;" />
-		<field name="ALPHA_8" />
-		<field name="ARGB_4444" />
-		<field name="ARGB_8888" />
-		<field name="RGB_565" />
+		<field name="ALPHA_8" since="14" />
+		<field name="ARGB_4444" since="14" />
+		<field name="ARGB_8888" since="14" />
+		<field name="RGB_565" since="14" />
 	</class>
 	<class name="android/graphics/BitmapFactory" since="1">
 		<extends name="java/lang/Object" />
@@ -7979,10 +7979,10 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/BlurMaskFilter$Blur;" />
 		<method name="values()[Landroid/graphics/BlurMaskFilter$Blur;" />
-		<field name="INNER" />
-		<field name="NORMAL" />
-		<field name="OUTER" />
-		<field name="SOLID" />
+		<field name="INNER" since="14" />
+		<field name="NORMAL" since="14" />
+		<field name="OUTER" since="14" />
+		<field name="SOLID" since="14" />
 	</class>
 	<class name="android/graphics/Camera" since="1">
 		<extends name="java/lang/Object" />
@@ -8102,16 +8102,16 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Canvas$EdgeType;" />
 		<method name="values()[Landroid/graphics/Canvas$EdgeType;" />
-		<field name="AA" />
-		<field name="BW" />
+		<field name="AA" since="14" />
+		<field name="BW" since="14" />
 	</class>
 	<class name="android/graphics/Canvas$VertexMode" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Canvas$VertexMode;" />
 		<method name="values()[Landroid/graphics/Canvas$VertexMode;" />
-		<field name="TRIANGLES" />
-		<field name="TRIANGLE_FAN" />
-		<field name="TRIANGLE_STRIP" />
+		<field name="TRIANGLES" since="14" />
+		<field name="TRIANGLE_FAN" since="14" />
+		<field name="TRIANGLE_STRIP" since="14" />
 	</class>
 	<class name="android/graphics/Color" since="1">
 		<extends name="java/lang/Object" />
@@ -8226,9 +8226,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Interpolator$Result;" />
 		<method name="values()[Landroid/graphics/Interpolator$Result;" />
-		<field name="FREEZE_END" />
-		<field name="FREEZE_START" />
-		<field name="NORMAL" />
+		<field name="FREEZE_END" since="14" />
+		<field name="FREEZE_START" since="14" />
+		<field name="NORMAL" since="14" />
 	</class>
 	<class name="android/graphics/LayerRasterizer" since="1">
 		<extends name="android/graphics/Rasterizer" />
@@ -8312,10 +8312,10 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Matrix$ScaleToFit;" />
 		<method name="values()[Landroid/graphics/Matrix$ScaleToFit;" />
-		<field name="CENTER" />
-		<field name="END" />
-		<field name="FILL" />
-		<field name="START" />
+		<field name="CENTER" since="14" />
+		<field name="END" since="14" />
+		<field name="FILL" since="14" />
+		<field name="START" since="14" />
 	</class>
 	<class name="android/graphics/Movie" since="1">
 		<extends name="java/lang/Object" />
@@ -8449,17 +8449,17 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Paint$Align;" />
 		<method name="values()[Landroid/graphics/Paint$Align;" />
-		<field name="CENTER" />
-		<field name="LEFT" />
-		<field name="RIGHT" />
+		<field name="CENTER" since="14" />
+		<field name="LEFT" since="14" />
+		<field name="RIGHT" since="14" />
 	</class>
 	<class name="android/graphics/Paint$Cap" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Paint$Cap;" />
 		<method name="values()[Landroid/graphics/Paint$Cap;" />
-		<field name="BUTT" />
-		<field name="ROUND" />
-		<field name="SQUARE" />
+		<field name="BUTT" since="14" />
+		<field name="ROUND" since="14" />
+		<field name="SQUARE" since="14" />
 	</class>
 	<class name="android/graphics/Paint$FontMetrics" since="1">
 		<extends name="java/lang/Object" />
@@ -8483,17 +8483,17 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Paint$Join;" />
 		<method name="values()[Landroid/graphics/Paint$Join;" />
-		<field name="BEVEL" />
-		<field name="MITER" />
-		<field name="ROUND" />
+		<field name="BEVEL" since="14" />
+		<field name="MITER" since="14" />
+		<field name="ROUND" since="14" />
 	</class>
 	<class name="android/graphics/Paint$Style" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Paint$Style;" />
 		<method name="values()[Landroid/graphics/Paint$Style;" />
-		<field name="FILL" />
-		<field name="FILL_AND_STROKE" />
-		<field name="STROKE" />
+		<field name="FILL" since="14" />
+		<field name="FILL_AND_STROKE" since="14" />
+		<field name="STROKE" since="14" />
 	</class>
 	<class name="android/graphics/PaintFlagsDrawFilter" since="1">
 		<extends name="android/graphics/DrawFilter" />
@@ -8545,17 +8545,17 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Path$Direction;" />
 		<method name="values()[Landroid/graphics/Path$Direction;" />
-		<field name="CCW" />
-		<field name="CW" />
+		<field name="CCW" since="14" />
+		<field name="CW" since="14" />
 	</class>
 	<class name="android/graphics/Path$FillType" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Path$FillType;" />
 		<method name="values()[Landroid/graphics/Path$FillType;" />
-		<field name="EVEN_ODD" />
-		<field name="INVERSE_EVEN_ODD" />
-		<field name="INVERSE_WINDING" />
-		<field name="WINDING" />
+		<field name="EVEN_ODD" since="14" />
+		<field name="INVERSE_EVEN_ODD" since="14" />
+		<field name="INVERSE_WINDING" since="14" />
+		<field name="WINDING" since="14" />
 	</class>
 	<class name="android/graphics/PathDashPathEffect" since="1">
 		<extends name="android/graphics/PathEffect" />
@@ -8565,9 +8565,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/PathDashPathEffect$Style;" />
 		<method name="values()[Landroid/graphics/PathDashPathEffect$Style;" />
-		<field name="MORPH" />
-		<field name="ROTATE" />
-		<field name="TRANSLATE" />
+		<field name="MORPH" since="14" />
+		<field name="ROTATE" since="14" />
+		<field name="TRANSLATE" since="14" />
 	</class>
 	<class name="android/graphics/PathEffect" since="1">
 		<extends name="java/lang/Object" />
@@ -8674,24 +8674,24 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/PorterDuff$Mode;" />
 		<method name="values()[Landroid/graphics/PorterDuff$Mode;" />
-		<field name="ADD" since="11" />
-		<field name="CLEAR" />
-		<field name="DARKEN" />
-		<field name="DST" />
-		<field name="DST_ATOP" />
-		<field name="DST_IN" />
-		<field name="DST_OUT" />
-		<field name="DST_OVER" />
-		<field name="LIGHTEN" />
-		<field name="MULTIPLY" />
-		<field name="OVERLAY" since="11" />
-		<field name="SCREEN" />
-		<field name="SRC" />
-		<field name="SRC_ATOP" />
-		<field name="SRC_IN" />
-		<field name="SRC_OUT" />
-		<field name="SRC_OVER" />
-		<field name="XOR" />
+		<field name="ADD" since="14" />
+		<field name="CLEAR" since="14" />
+		<field name="DARKEN" since="14" />
+		<field name="DST" since="14" />
+		<field name="DST_ATOP" since="14" />
+		<field name="DST_IN" since="14" />
+		<field name="DST_OUT" since="14" />
+		<field name="DST_OVER" since="14" />
+		<field name="LIGHTEN" since="14" />
+		<field name="MULTIPLY" since="14" />
+		<field name="OVERLAY" since="14" />
+		<field name="SCREEN" since="14" />
+		<field name="SRC" since="14" />
+		<field name="SRC_ATOP" since="14" />
+		<field name="SRC_IN" since="14" />
+		<field name="SRC_OUT" since="14" />
+		<field name="SRC_OVER" since="14" />
+		<field name="XOR" since="14" />
 	</class>
 	<class name="android/graphics/PorterDuffColorFilter" since="1">
 		<extends name="android/graphics/ColorFilter" />
@@ -8837,12 +8837,12 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Region$Op;" />
 		<method name="values()[Landroid/graphics/Region$Op;" />
-		<field name="DIFFERENCE" />
-		<field name="INTERSECT" />
-		<field name="REPLACE" />
-		<field name="REVERSE_DIFFERENCE" />
-		<field name="UNION" />
-		<field name="XOR" />
+		<field name="DIFFERENCE" since="14" />
+		<field name="INTERSECT" since="14" />
+		<field name="REPLACE" since="14" />
+		<field name="REVERSE_DIFFERENCE" since="14" />
+		<field name="UNION" since="14" />
+		<field name="XOR" since="14" />
 	</class>
 	<class name="android/graphics/RegionIterator" since="1">
 		<extends name="java/lang/Object" />
@@ -8859,9 +8859,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/Shader$TileMode;" />
 		<method name="values()[Landroid/graphics/Shader$TileMode;" />
-		<field name="CLAMP" />
-		<field name="MIRROR" />
-		<field name="REPEAT" />
+		<field name="CLAMP" since="14" />
+		<field name="MIRROR" since="14" />
+		<field name="REPEAT" since="14" />
 	</class>
 	<class name="android/graphics/SumPathEffect" since="1">
 		<extends name="android/graphics/PathEffect" />
@@ -9136,14 +9136,14 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/graphics/drawable/GradientDrawable$Orientation;" />
 		<method name="values()[Landroid/graphics/drawable/GradientDrawable$Orientation;" />
-		<field name="BL_TR" />
-		<field name="BOTTOM_TOP" />
-		<field name="BR_TL" />
-		<field name="LEFT_RIGHT" />
-		<field name="RIGHT_LEFT" />
-		<field name="TL_BR" />
-		<field name="TOP_BOTTOM" />
-		<field name="TR_BL" />
+		<field name="BL_TR" since="14" />
+		<field name="BOTTOM_TOP" since="14" />
+		<field name="BR_TL" since="14" />
+		<field name="LEFT_RIGHT" since="14" />
+		<field name="RIGHT_LEFT" since="14" />
+		<field name="TL_BR" since="14" />
+		<field name="TOP_BOTTOM" since="14" />
+		<field name="TR_BL" since="14" />
 	</class>
 	<class name="android/graphics/drawable/InsetDrawable" since="1">
 		<extends name="android/graphics/drawable/Drawable" />
@@ -9399,7 +9399,7 @@
 		<method name="getExposureCompensationStep()F" since="8" />
 		<method name="getFlashMode()Ljava/lang/String;" since="5" />
 		<method name="getFocalLength()F" since="8" />
-		<method name="getFocusAreas()Ljava/util/List&lt;android/hardware/Camera$Area>;" since="14" />
+		<method name="getFocusAreas()Ljava/util/List;" since="14" />
 		<method name="getFocusDistances([F)V" since="9" />
 		<method name="getFocusMode()Ljava/lang/String;" since="5" />
 		<method name="getHorizontalViewAngle()F" since="8" />
@@ -9412,7 +9412,7 @@
 		<method name="getMaxNumFocusAreas()I" since="14" />
 		<method name="getMaxNumMeteringAreas()I" since="14" />
 		<method name="getMaxZoom()I" since="8" />
-		<method name="getMeteringAreas()Ljava/util/List&lt;android/hardware/Camera$Area>;" since="14" />
+		<method name="getMeteringAreas()Ljava/util/List;" since="14" />
 		<method name="getMinExposureCompensation()I" since="8" />
 		<method name="getPictureFormat()I" />
 		<method name="getPictureSize()Landroid/hardware/Camera$Size;" />
@@ -9422,25 +9422,25 @@
 		<method name="getPreviewFrameRate()I" />
 		<method name="getPreviewSize()Landroid/hardware/Camera$Size;" />
 		<method name="getSceneMode()Ljava/lang/String;" since="5" />
-		<method name="getSupportedAntibanding()Ljava/util/List&lt;java/lang/String>;" since="5" />
-		<method name="getSupportedColorEffects()Ljava/util/List&lt;java/lang/String>;" since="5" />
-		<method name="getSupportedFlashModes()Ljava/util/List&lt;java/lang/String>;" since="5" />
-		<method name="getSupportedFocusModes()Ljava/util/List&lt;java/lang/String>;" since="5" />
-		<method name="getSupportedJpegThumbnailSizes()Ljava/util/List&lt;android/hardware/Camera$Size>;" since="8" />
-		<method name="getSupportedPictureFormats()Ljava/util/List&lt;java/lang/Integer>;" since="5" />
-		<method name="getSupportedPictureSizes()Ljava/util/List&lt;android/hardware/Camera$Size>;" since="5" />
-		<method name="getSupportedPreviewFormats()Ljava/util/List&lt;java/lang/Integer>;" since="5" />
-		<method name="getSupportedPreviewFpsRange()Ljava/util/List&lt;int[]>;" since="9" />
-		<method name="getSupportedPreviewFrameRates()Ljava/util/List&lt;java/lang/Integer>;" since="5" />
-		<method name="getSupportedPreviewSizes()Ljava/util/List&lt;android/hardware/Camera$Size>;" since="5" />
-		<method name="getSupportedSceneModes()Ljava/util/List&lt;java/lang/String>;" since="5" />
-		<method name="getSupportedVideoSizes()Ljava/util/List&lt;android/hardware/Camera$Size>;" since="11" />
-		<method name="getSupportedWhiteBalance()Ljava/util/List&lt;java/lang/String>;" since="5" />
+		<method name="getSupportedAntibanding()Ljava/util/List;" since="5" />
+		<method name="getSupportedColorEffects()Ljava/util/List;" since="5" />
+		<method name="getSupportedFlashModes()Ljava/util/List;" since="5" />
+		<method name="getSupportedFocusModes()Ljava/util/List;" since="5" />
+		<method name="getSupportedJpegThumbnailSizes()Ljava/util/List;" since="8" />
+		<method name="getSupportedPictureFormats()Ljava/util/List;" since="5" />
+		<method name="getSupportedPictureSizes()Ljava/util/List;" since="5" />
+		<method name="getSupportedPreviewFormats()Ljava/util/List;" since="5" />
+		<method name="getSupportedPreviewFpsRange()Ljava/util/List;" since="9" />
+		<method name="getSupportedPreviewFrameRates()Ljava/util/List;" since="5" />
+		<method name="getSupportedPreviewSizes()Ljava/util/List;" since="5" />
+		<method name="getSupportedSceneModes()Ljava/util/List;" since="5" />
+		<method name="getSupportedVideoSizes()Ljava/util/List;" since="11" />
+		<method name="getSupportedWhiteBalance()Ljava/util/List;" since="5" />
 		<method name="getVerticalViewAngle()F" since="8" />
 		<method name="getVideoStabilization()Z" since="15" />
 		<method name="getWhiteBalance()Ljava/lang/String;" since="5" />
 		<method name="getZoom()I" since="8" />
-		<method name="getZoomRatios()Ljava/util/List&lt;java/lang/Integer>;" since="8" />
+		<method name="getZoomRatios()Ljava/util/List;" since="8" />
 		<method name="isAutoExposureLockSupported()Z" since="14" />
 		<method name="isAutoWhiteBalanceLockSupported()Z" since="14" />
 		<method name="isSmoothZoomSupported()Z" since="8" />
@@ -9457,7 +9457,7 @@
 		<method name="setColorEffect(Ljava/lang/String;)V" since="5" />
 		<method name="setExposureCompensation(I)V" since="8" />
 		<method name="setFlashMode(Ljava/lang/String;)V" since="5" />
-		<method name="setFocusAreas(Ljava/util/List&lt;android/hardware/Camera$Area>;)V" since="14" />
+		<method name="setFocusAreas(Ljava/util/List;)V" since="14" />
 		<method name="setFocusMode(Ljava/lang/String;)V" since="5" />
 		<method name="setGpsAltitude(D)V" since="5" />
 		<method name="setGpsLatitude(D)V" since="5" />
@@ -9467,7 +9467,7 @@
 		<method name="setJpegQuality(I)V" since="5" />
 		<method name="setJpegThumbnailQuality(I)V" since="5" />
 		<method name="setJpegThumbnailSize(II)V" since="5" />
-		<method name="setMeteringAreas(Ljava/util/List&lt;android/hardware/Camera$Area>;)V" since="14" />
+		<method name="setMeteringAreas(Ljava/util/List;)V" since="14" />
 		<method name="setPictureFormat(I)V" />
 		<method name="setPictureSize(II)V" />
 		<method name="setPreviewFormat(I)V" />
@@ -9612,7 +9612,7 @@
 		<method name="getQuaternionFromVector([F[F)V" since="9" />
 		<method name="getRotationMatrix([F[F[F[F)Z" since="3" />
 		<method name="getRotationMatrixFromVector([F[F)V" since="9" />
-		<method name="getSensorList(I)Ljava/util/List&lt;android/hardware/Sensor>;" since="3" />
+		<method name="getSensorList(I)Ljava/util/List;" since="3" />
 		<method name="getSensors()I" />
 		<method name="registerListener(Landroid/hardware/SensorEventListener;Landroid/hardware/Sensor;I)Z" since="3" />
 		<method name="registerListener(Landroid/hardware/SensorEventListener;Landroid/hardware/Sensor;ILandroid/os/Handler;)Z" since="3" />
@@ -9791,7 +9791,7 @@
 	<class name="android/hardware/usb/UsbManager" since="12">
 		<extends name="java/lang/Object" />
 		<method name="getAccessoryList()[Landroid/hardware/usb/UsbAccessory;" />
-		<method name="getDeviceList()Ljava/util/HashMap&lt;java/lang/String, android$hardware/usb/UsbDevice>;" />
+		<method name="getDeviceList()Ljava/util/HashMap;" />
 		<method name="hasPermission(Landroid/hardware/usb/UsbAccessory;)Z" />
 		<method name="hasPermission(Landroid/hardware/usb/UsbDevice;)Z" />
 		<method name="openAccessory(Landroid/hardware/usb/UsbAccessory;)Landroid/os/ParcelFileDescriptor;" />
@@ -9980,9 +9980,9 @@
 		<method name="getHorizontalGap()I" />
 		<method name="getKeyHeight()I" />
 		<method name="getKeyWidth()I" />
-		<method name="getKeys()Ljava/util/List&lt;android/inputmethodservice/Keyboard$Key>;" />
+		<method name="getKeys()Ljava/util/List;" />
 		<method name="getMinWidth()I" />
-		<method name="getModifierKeys()Ljava/util/List&lt;android/inputmethodservice/Keyboard$Key>;" />
+		<method name="getModifierKeys()Ljava/util/List;" />
 		<method name="getNearestKeys(II)[I" />
 		<method name="getShiftKeyIndex()I" />
 		<method name="getVerticalGap()I" />
@@ -10175,9 +10175,9 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="&lt;init>(Landroid/content/Context;Ljava/util/Locale;)V" />
-		<method name="getFromLocation(DDI)Ljava/util/List&lt;android/location/Address>;" />
-		<method name="getFromLocationName(Ljava/lang/String;I)Ljava/util/List&lt;android/location/Address>;" />
-		<method name="getFromLocationName(Ljava/lang/String;IDDDD)Ljava/util/List&lt;android/location/Address>;" />
+		<method name="getFromLocation(DDI)Ljava/util/List;" />
+		<method name="getFromLocationName(Ljava/lang/String;I)Ljava/util/List;" />
+		<method name="getFromLocationName(Ljava/lang/String;IDDDD)Ljava/util/List;" />
 		<method name="isPresent()Z" since="9" />
 	</class>
 	<class name="android/location/GpsSatellite" since="3">
@@ -10193,7 +10193,7 @@
 	<class name="android/location/GpsStatus" since="3">
 		<extends name="java/lang/Object" />
 		<method name="getMaxSatellites()I" />
-		<method name="getSatellites()Ljava/lang/Iterable&lt;android/location/GpsSatellite>;" />
+		<method name="getSatellites()Ljava/lang/Iterable;" />
 		<method name="getTimeToFirstFix()I" />
 		<field name="GPS_EVENT_FIRST_FIX" />
 		<field name="GPS_EVENT_SATELLITE_STATUS" />
@@ -10267,13 +10267,13 @@
 		<method name="clearTestProviderEnabled(Ljava/lang/String;)V" since="3" />
 		<method name="clearTestProviderLocation(Ljava/lang/String;)V" since="3" />
 		<method name="clearTestProviderStatus(Ljava/lang/String;)V" since="3" />
-		<method name="getAllProviders()Ljava/util/List&lt;java/lang/String>;" />
+		<method name="getAllProviders()Ljava/util/List;" />
 		<method name="getBestProvider(Landroid/location/Criteria;Z)Ljava/lang/String;" />
 		<method name="getGpsStatus(Landroid/location/GpsStatus;)Landroid/location/GpsStatus;" since="3" />
 		<method name="getLastKnownLocation(Ljava/lang/String;)Landroid/location/Location;" />
 		<method name="getProvider(Ljava/lang/String;)Landroid/location/LocationProvider;" />
-		<method name="getProviders(Landroid/location/Criteria;Z)Ljava/util/List&lt;java/lang/String>;" />
-		<method name="getProviders(Z)Ljava/util/List&lt;java/lang/String>;" />
+		<method name="getProviders(Landroid/location/Criteria;Z)Ljava/util/List;" />
+		<method name="getProviders(Z)Ljava/util/List;" />
 		<method name="isProviderEnabled(Ljava/lang/String;)Z" />
 		<method name="removeGpsStatusListener(Landroid/location/GpsStatus$Listener;)V" since="3" />
 		<method name="removeNmeaListener(Landroid/location/GpsStatus$NmeaListener;)V" since="5" />
@@ -10728,7 +10728,7 @@
 		<method name="setDataSource(Ljava/io/FileDescriptor;)V" />
 		<method name="setDataSource(Ljava/io/FileDescriptor;JJ)V" />
 		<method name="setDataSource(Ljava/lang/String;)V" />
-		<method name="setDataSource(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)V" since="14" />
+		<method name="setDataSource(Ljava/lang/String;Ljava/util/Map;)V" since="14" />
 		<field name="METADATA_KEY_ALBUM" />
 		<field name="METADATA_KEY_ALBUMARTIST" />
 		<field name="METADATA_KEY_ARTIST" />
@@ -10780,7 +10780,7 @@
 		<method name="setAudioStreamType(I)V" />
 		<method name="setAuxEffectSendLevel(F)V" since="9" />
 		<method name="setDataSource(Landroid/content/Context;Landroid/net/Uri;)V" />
-		<method name="setDataSource(Landroid/content/Context;Landroid/net/Uri;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)V" since="14" />
+		<method name="setDataSource(Landroid/content/Context;Landroid/net/Uri;Ljava/util/Map;)V" since="14" />
 		<method name="setDataSource(Ljava/io/FileDescriptor;)V" />
 		<method name="setDataSource(Ljava/io/FileDescriptor;JJ)V" />
 		<method name="setDataSource(Ljava/lang/String;)V" />
@@ -11669,15 +11669,15 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/net/LocalSocketAddress$Namespace;" />
 		<method name="values()[Landroid/net/LocalSocketAddress$Namespace;" />
-		<field name="ABSTRACT" />
-		<field name="FILESYSTEM" />
-		<field name="RESERVED" />
+		<field name="ABSTRACT" since="14" />
+		<field name="FILESYSTEM" since="14" />
+		<field name="RESERVED" since="14" />
 	</class>
 	<class name="android/net/MailTo" since="1">
 		<extends name="java/lang/Object" />
 		<method name="getBody()Ljava/lang/String;" />
 		<method name="getCc()Ljava/lang/String;" />
-		<method name="getHeaders()Ljava/util/Map&lt;java/lang/String, java$lang/String>;" />
+		<method name="getHeaders()Ljava/util/Map;" />
 		<method name="getSubject()Ljava/lang/String;" />
 		<method name="getTo()Ljava/lang/String;" />
 		<method name="isMailTo(Ljava/lang/String;)Z" />
@@ -11708,28 +11708,28 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/net/NetworkInfo$DetailedState;" />
 		<method name="values()[Landroid/net/NetworkInfo$DetailedState;" />
-		<field name="AUTHENTICATING" />
+		<field name="AUTHENTICATING" since="14" />
 		<field name="BLOCKED" since="14" />
-		<field name="CONNECTED" />
-		<field name="CONNECTING" />
-		<field name="DISCONNECTED" />
-		<field name="DISCONNECTING" />
-		<field name="FAILED" />
-		<field name="IDLE" />
-		<field name="OBTAINING_IPADDR" />
-		<field name="SCANNING" />
-		<field name="SUSPENDED" />
+		<field name="CONNECTED" since="14" />
+		<field name="CONNECTING" since="14" />
+		<field name="DISCONNECTED" since="14" />
+		<field name="DISCONNECTING" since="14" />
+		<field name="FAILED" since="14" />
+		<field name="IDLE" since="14" />
+		<field name="OBTAINING_IPADDR" since="14" />
+		<field name="SCANNING" since="14" />
+		<field name="SUSPENDED" since="14" />
 	</class>
 	<class name="android/net/NetworkInfo$State" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/net/NetworkInfo$State;" />
 		<method name="values()[Landroid/net/NetworkInfo$State;" />
-		<field name="CONNECTED" />
-		<field name="CONNECTING" />
-		<field name="DISCONNECTED" />
-		<field name="DISCONNECTING" />
-		<field name="SUSPENDED" />
-		<field name="UNKNOWN" />
+		<field name="CONNECTED" since="14" />
+		<field name="CONNECTING" since="14" />
+		<field name="DISCONNECTED" since="14" />
+		<field name="DISCONNECTING" since="14" />
+		<field name="SUSPENDED" since="14" />
+		<field name="UNKNOWN" since="14" />
 	</class>
 	<class name="android/net/ParseException" since="1">
 		<extends name="java/lang/RuntimeException" />
@@ -11821,12 +11821,12 @@
 		<method name="getHost()Ljava/lang/String;" />
 		<method name="getLastPathSegment()Ljava/lang/String;" />
 		<method name="getPath()Ljava/lang/String;" />
-		<method name="getPathSegments()Ljava/util/List&lt;java/lang/String>;" />
+		<method name="getPathSegments()Ljava/util/List;" />
 		<method name="getPort()I" />
 		<method name="getQuery()Ljava/lang/String;" />
 		<method name="getQueryParameter(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getQueryParameterNames()Ljava/util/Set&lt;java/lang/String>;" since="11" />
-		<method name="getQueryParameters(Ljava/lang/String;)Ljava/util/List&lt;java/lang/String>;" />
+		<method name="getQueryParameterNames()Ljava/util/Set;" since="11" />
+		<method name="getQueryParameters(Ljava/lang/String;)Ljava/util/List;" />
 		<method name="getScheme()Ljava/lang/String;" />
 		<method name="getSchemeSpecificPart()Ljava/lang/String;" />
 		<method name="getUserInfo()Ljava/lang/String;" />
@@ -11876,8 +11876,8 @@
 		<method name="getAmpAndSpaceLegal()Landroid/net/UrlQuerySanitizer$ValueSanitizer;" />
 		<method name="getAmpLegal()Landroid/net/UrlQuerySanitizer$ValueSanitizer;" />
 		<method name="getEffectiveValueSanitizer(Ljava/lang/String;)Landroid/net/UrlQuerySanitizer$ValueSanitizer;" />
-		<method name="getParameterList()Ljava/util/List&lt;android/net/UrlQuerySanitizer$ParameterValuePair>;" />
-		<method name="getParameterSet()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getParameterList()Ljava/util/List;" />
+		<method name="getParameterSet()Ljava/util/Set;" />
 		<method name="getPreferFirstRepeatedParameter()Z" />
 		<method name="getSpaceLegal()Landroid/net/UrlQuerySanitizer$ValueSanitizer;" />
 		<method name="getUnregisteredParameterValueSanitizer()Landroid/net/UrlQuerySanitizer$ValueSanitizer;" />
@@ -11966,12 +11966,12 @@
 		<method name="disableCurlLogging()V" />
 		<method name="enableCurlLogging(Ljava/lang/String;I)V" />
 		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;)Lorg/apache/http/HttpResponse;" />
-		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;)LT;" />
-		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;Lorg/apache/http/protocol/HttpContext;)LT;" />
+		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler;)LT;" />
+		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler;Lorg/apache/http/protocol/HttpContext;)LT;" />
 		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;)Lorg/apache/http/HttpResponse;" />
-		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;)LT;" />
-		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;Lorg/apache/http/protocol/HttpContext;)LT;" />
+		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler;)LT;" />
+		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler;Lorg/apache/http/protocol/HttpContext;)LT;" />
 		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 		<method name="getCompressedEntity([BLandroid/content/ContentResolver;)Lorg/apache/http/entity/AbstractHttpEntity;" />
 		<method name="getConnectionManager()Lorg/apache/http/conn/ClientConnectionManager;" />
@@ -11990,7 +11990,7 @@
 		<method name="close()V" />
 		<method name="delete()V" />
 		<method name="flush()V" />
-		<method name="get(Ljava/net/URI;Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;)Ljava/net/CacheResponse;" />
+		<method name="get(Ljava/net/URI;Ljava/lang/String;Ljava/util/Map;)Ljava/net/CacheResponse;" />
 		<method name="getHitCount()I" />
 		<method name="getInstalled()Landroid/net/http/HttpResponseCache;" />
 		<method name="getNetworkCount()I" />
@@ -12288,19 +12288,19 @@
 		<method name="valueOf(Ljava/lang/String;)Landroid/net/wifi/SupplicantState;" />
 		<method name="values()[Landroid/net/wifi/SupplicantState;" />
 		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
-		<field name="ASSOCIATED" />
-		<field name="ASSOCIATING" />
+		<field name="ASSOCIATED" since="14" />
+		<field name="ASSOCIATING" since="14" />
 		<field name="AUTHENTICATING" since="14" />
-		<field name="COMPLETED" />
-		<field name="DISCONNECTED" />
-		<field name="DORMANT" />
-		<field name="FOUR_WAY_HANDSHAKE" />
-		<field name="GROUP_HANDSHAKE" />
-		<field name="INACTIVE" />
+		<field name="COMPLETED" since="14" />
+		<field name="DISCONNECTED" since="14" />
+		<field name="DORMANT" since="14" />
+		<field name="FOUR_WAY_HANDSHAKE" since="14" />
+		<field name="GROUP_HANDSHAKE" since="14" />
+		<field name="INACTIVE" since="14" />
 		<field name="INTERFACE_DISABLED" since="14" />
-		<field name="INVALID" />
-		<field name="SCANNING" />
-		<field name="UNINITIALIZED" />
+		<field name="INVALID" since="14" />
+		<field name="SCANNING" since="14" />
+		<field name="UNINITIALIZED" since="14" />
 	</class>
 	<class name="android/net/wifi/WifiConfiguration" since="1">
 		<extends name="java/lang/Object" />
@@ -12399,10 +12399,10 @@
 		<method name="disableNetwork(I)Z" />
 		<method name="disconnect()Z" />
 		<method name="enableNetwork(IZ)Z" />
-		<method name="getConfiguredNetworks()Ljava/util/List&lt;android/net/wifi/WifiConfiguration>;" />
+		<method name="getConfiguredNetworks()Ljava/util/List;" />
 		<method name="getConnectionInfo()Landroid/net/wifi/WifiInfo;" />
 		<method name="getDhcpInfo()Landroid/net/DhcpInfo;" />
-		<method name="getScanResults()Ljava/util/List&lt;android/net/wifi/ScanResult>;" />
+		<method name="getScanResults()Ljava/util/List;" />
 		<method name="getWifiState()I" />
 		<method name="isWifiEnabled()Z" />
 		<method name="pingSupplicant()Z" />
@@ -12509,7 +12509,7 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/net/wifi/p2p/WifiP2pDeviceList;)V" />
 		<method name="describeContents()I" />
-		<method name="getDeviceList()Ljava/util/Collection&lt;android/net/wifi/p2p/WifiP2pDevice>;" />
+		<method name="getDeviceList()Ljava/util/Collection;" />
 		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
@@ -12518,7 +12518,7 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/net/wifi/p2p/WifiP2pGroup;)V" />
 		<method name="describeContents()I" />
-		<method name="getClientList()Ljava/util/Collection&lt;android/net/wifi/p2p/WifiP2pDevice>;" />
+		<method name="getClientList()Ljava/util/Collection;" />
 		<method name="getInterface()Ljava/lang/String;" />
 		<method name="getNetworkName()Ljava/lang/String;" />
 		<method name="getOwner()Landroid/net/wifi/p2p/WifiP2pDevice;" />
@@ -14252,8 +14252,8 @@
 		<method name="cancel(Z)Z" />
 		<method name="doInBackground([LParams;)LResult;" />
 		<method name="execute(Ljava/lang/Runnable;)V" since="11" />
-		<method name="execute([LParams;)Landroid/os/AsyncTask&lt;Params, Progress, Result>;" />
-		<method name="executeOnExecutor(Ljava/util/concurrent/Executor;[LParams;)Landroid/os/AsyncTask&lt;Params, Progress, Result>;" since="11" />
+		<method name="execute([LParams;)Landroid/os/AsyncTask;" />
+		<method name="executeOnExecutor(Ljava/util/concurrent/Executor;[LParams;)Landroid/os/AsyncTask;" since="11" />
 		<method name="get()LResult;" />
 		<method name="get(JLjava/util/concurrent/TimeUnit;)LResult;" />
 		<method name="getStatus()Landroid/os/AsyncTask$Status;" />
@@ -14271,9 +14271,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/os/AsyncTask$Status;" />
 		<method name="values()[Landroid/os/AsyncTask$Status;" />
-		<field name="FINISHED" />
-		<field name="PENDING" />
-		<field name="RUNNING" />
+		<field name="FINISHED" since="14" />
+		<field name="PENDING" since="14" />
+		<field name="RUNNING" since="14" />
 	</class>
 	<class name="android/os/BadParcelableException" since="1">
 		<extends name="android/util/AndroidRuntimeException" />
@@ -14412,7 +14412,7 @@
 		<method name="getCharSequence(Ljava/lang/String;)Ljava/lang/CharSequence;" />
 		<method name="getCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;" since="12" />
 		<method name="getCharSequenceArray(Ljava/lang/String;)[Ljava/lang/CharSequence;" since="8" />
-		<method name="getCharSequenceArrayList(Ljava/lang/String;)Ljava/util/ArrayList&lt;java/lang/CharSequence>;" since="8" />
+		<method name="getCharSequenceArrayList(Ljava/lang/String;)Ljava/util/ArrayList;" since="8" />
 		<method name="getClassLoader()Ljava/lang/ClassLoader;" since="11" />
 		<method name="getDouble(Ljava/lang/String;)D" />
 		<method name="getDouble(Ljava/lang/String;D)D" />
@@ -14423,25 +14423,25 @@
 		<method name="getInt(Ljava/lang/String;)I" />
 		<method name="getInt(Ljava/lang/String;I)I" />
 		<method name="getIntArray(Ljava/lang/String;)[I" />
-		<method name="getIntegerArrayList(Ljava/lang/String;)Ljava/util/ArrayList&lt;java/lang/Integer>;" />
+		<method name="getIntegerArrayList(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getLong(Ljava/lang/String;)J" />
 		<method name="getLong(Ljava/lang/String;J)J" />
 		<method name="getLongArray(Ljava/lang/String;)[J" />
 		<method name="getParcelable(Ljava/lang/String;)LT;" />
 		<method name="getParcelableArray(Ljava/lang/String;)[Landroid/os/Parcelable;" />
-		<method name="getParcelableArrayList(Ljava/lang/String;)Ljava/util/ArrayList&lt;T>;" />
+		<method name="getParcelableArrayList(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getSerializable(Ljava/lang/String;)Ljava/io/Serializable;" />
 		<method name="getShort(Ljava/lang/String;)S" />
 		<method name="getShort(Ljava/lang/String;S)S" />
 		<method name="getShortArray(Ljava/lang/String;)[S" />
-		<method name="getSparseParcelableArray(Ljava/lang/String;)Landroid/util/SparseArray&lt;T>;" />
+		<method name="getSparseParcelableArray(Ljava/lang/String;)Landroid/util/SparseArray;" />
 		<method name="getString(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" since="12" />
 		<method name="getStringArray(Ljava/lang/String;)[Ljava/lang/String;" />
-		<method name="getStringArrayList(Ljava/lang/String;)Ljava/util/ArrayList&lt;java/lang/String>;" />
+		<method name="getStringArrayList(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="hasFileDescriptors()Z" />
 		<method name="isEmpty()Z" />
-		<method name="keySet()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="keySet()Ljava/util/Set;" />
 		<method name="putAll(Landroid/os/Bundle;)V" />
 		<method name="putBoolean(Ljava/lang/String;Z)V" />
 		<method name="putBooleanArray(Ljava/lang/String;[Z)V" />
@@ -14452,26 +14452,26 @@
 		<method name="putCharArray(Ljava/lang/String;[C)V" />
 		<method name="putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V" />
 		<method name="putCharSequenceArray(Ljava/lang/String;[Ljava/lang/CharSequence;)V" since="8" />
-		<method name="putCharSequenceArrayList(Ljava/lang/String;Ljava/util/ArrayList&lt;java/lang/CharSequence>;)V" since="8" />
+		<method name="putCharSequenceArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V" since="8" />
 		<method name="putDouble(Ljava/lang/String;D)V" />
 		<method name="putDoubleArray(Ljava/lang/String;[D)V" />
 		<method name="putFloat(Ljava/lang/String;F)V" />
 		<method name="putFloatArray(Ljava/lang/String;[F)V" />
 		<method name="putInt(Ljava/lang/String;I)V" />
 		<method name="putIntArray(Ljava/lang/String;[I)V" />
-		<method name="putIntegerArrayList(Ljava/lang/String;Ljava/util/ArrayList&lt;java/lang/Integer>;)V" />
+		<method name="putIntegerArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V" />
 		<method name="putLong(Ljava/lang/String;J)V" />
 		<method name="putLongArray(Ljava/lang/String;[J)V" />
 		<method name="putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V" />
 		<method name="putParcelableArray(Ljava/lang/String;[Landroid/os/Parcelable;)V" />
-		<method name="putParcelableArrayList(Ljava/lang/String;Ljava/util/ArrayList&lt;? extends android/os/Parcelable>;)V" />
+		<method name="putParcelableArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V" />
 		<method name="putSerializable(Ljava/lang/String;Ljava/io/Serializable;)V" />
 		<method name="putShort(Ljava/lang/String;S)V" />
 		<method name="putShortArray(Ljava/lang/String;[S)V" />
-		<method name="putSparseParcelableArray(Ljava/lang/String;Landroid/util/SparseArray&lt;? extends android/os/Parcelable>;)V" />
+		<method name="putSparseParcelableArray(Ljava/lang/String;Landroid/util/SparseArray;)V" />
 		<method name="putString(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="putStringArray(Ljava/lang/String;[Ljava/lang/String;)V" />
-		<method name="putStringArrayList(Ljava/lang/String;Ljava/util/ArrayList&lt;java/lang/String>;)V" />
+		<method name="putStringArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
 		<method name="remove(Ljava/lang/String;)V" />
 		<method name="setClassLoader(Ljava/lang/ClassLoader;)V" />
@@ -14848,7 +14848,7 @@
 		<extends name="java/lang/Object" />
 		<method name="appendFrom(Landroid/os/Parcel;II)V" />
 		<method name="createBinderArray()[Landroid/os/IBinder;" />
-		<method name="createBinderArrayList()Ljava/util/ArrayList&lt;android/os/IBinder>;" />
+		<method name="createBinderArrayList()Ljava/util/ArrayList;" />
 		<method name="createBooleanArray()[Z" />
 		<method name="createByteArray()[B" />
 		<method name="createCharArray()[C" />
@@ -14857,9 +14857,9 @@
 		<method name="createIntArray()[I" />
 		<method name="createLongArray()[J" />
 		<method name="createStringArray()[Ljava/lang/String;" />
-		<method name="createStringArrayList()Ljava/util/ArrayList&lt;java/lang/String>;" />
-		<method name="createTypedArray(Landroid/os/Parcelable$Creator&lt;T>;)[LT;" />
-		<method name="createTypedArrayList(Landroid/os/Parcelable$Creator&lt;T>;)Ljava/util/ArrayList&lt;T>;" />
+		<method name="createStringArrayList()Ljava/util/ArrayList;" />
+		<method name="createTypedArray(Landroid/os/Parcelable$Creator;)[LT;" />
+		<method name="createTypedArrayList(Landroid/os/Parcelable$Creator;)Ljava/util/ArrayList;" />
 		<method name="dataAvail()I" />
 		<method name="dataCapacity()I" />
 		<method name="dataPosition()I" />
@@ -14872,7 +14872,7 @@
 		<method name="readArray(Ljava/lang/ClassLoader;)[Ljava/lang/Object;" />
 		<method name="readArrayList(Ljava/lang/ClassLoader;)Ljava/util/ArrayList;" />
 		<method name="readBinderArray([Landroid/os/IBinder;)V" />
-		<method name="readBinderList(Ljava/util/List&lt;android/os/IBinder>;)V" />
+		<method name="readBinderList(Ljava/util/List;)V" />
 		<method name="readBooleanArray([Z)V" />
 		<method name="readBundle()Landroid/os/Bundle;" />
 		<method name="readBundle(Ljava/lang/ClassLoader;)Landroid/os/Bundle;" />
@@ -14900,10 +14900,10 @@
 		<method name="readSparseBooleanArray()Landroid/util/SparseBooleanArray;" />
 		<method name="readString()Ljava/lang/String;" />
 		<method name="readStringArray([Ljava/lang/String;)V" />
-		<method name="readStringList(Ljava/util/List&lt;java/lang/String>;)V" />
+		<method name="readStringList(Ljava/util/List;)V" />
 		<method name="readStrongBinder()Landroid/os/IBinder;" />
-		<method name="readTypedArray([LT;Landroid/os/Parcelable$Creator&lt;T>;)V" />
-		<method name="readTypedList(Ljava/util/List&lt;T>;Landroid/os/Parcelable$Creator&lt;T>;)V" />
+		<method name="readTypedArray([LT;Landroid/os/Parcelable$Creator;)V" />
+		<method name="readTypedList(Ljava/util/List;Landroid/os/Parcelable$Creator;)V" />
 		<method name="readValue(Ljava/lang/ClassLoader;)Ljava/lang/Object;" />
 		<method name="recycle()V" />
 		<method name="setDataCapacity(I)V" />
@@ -14912,7 +14912,7 @@
 		<method name="unmarshall([BII)V" />
 		<method name="writeArray([Ljava/lang/Object;)V" />
 		<method name="writeBinderArray([Landroid/os/IBinder;)V" />
-		<method name="writeBinderList(Ljava/util/List&lt;android/os/IBinder>;)V" />
+		<method name="writeBinderList(Ljava/util/List;)V" />
 		<method name="writeBooleanArray([Z)V" />
 		<method name="writeBundle(Landroid/os/Bundle;)V" />
 		<method name="writeByte(B)V" />
@@ -14936,15 +14936,15 @@
 		<method name="writeParcelable(Landroid/os/Parcelable;I)V" />
 		<method name="writeParcelableArray([LT;I)V" />
 		<method name="writeSerializable(Ljava/io/Serializable;)V" />
-		<method name="writeSparseArray(Landroid/util/SparseArray&lt;java/lang/Object>;)V" />
+		<method name="writeSparseArray(Landroid/util/SparseArray;)V" />
 		<method name="writeSparseBooleanArray(Landroid/util/SparseBooleanArray;)V" />
 		<method name="writeString(Ljava/lang/String;)V" />
 		<method name="writeStringArray([Ljava/lang/String;)V" />
-		<method name="writeStringList(Ljava/util/List&lt;java/lang/String>;)V" />
+		<method name="writeStringList(Ljava/util/List;)V" />
 		<method name="writeStrongBinder(Landroid/os/IBinder;)V" />
 		<method name="writeStrongInterface(Landroid/os/IInterface;)V" />
 		<method name="writeTypedArray([LT;I)V" />
-		<method name="writeTypedList(Ljava/util/List&lt;T>;)V" />
+		<method name="writeTypedList(Ljava/util/List;)V" />
 		<method name="writeValue(Ljava/lang/Object;)V" />
 		<field name="STRING_CREATOR" />
 	</class>
@@ -15338,12 +15338,12 @@
 		<method name="findIndexOfValue(Ljava/lang/String;)I" />
 		<method name="getEntries()[Ljava/lang/CharSequence;" />
 		<method name="getEntryValues()[Ljava/lang/CharSequence;" />
-		<method name="getValues()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getValues()Ljava/util/Set;" />
 		<method name="setEntries(I)V" />
 		<method name="setEntries([Ljava/lang/CharSequence;)V" />
 		<method name="setEntryValues(I)V" />
 		<method name="setEntryValues([Ljava/lang/CharSequence;)V" />
-		<method name="setValues(Ljava/util/Set&lt;java/lang/String>;)V" />
+		<method name="setValues(Ljava/util/Set;)V" />
 	</class>
 	<class name="android/preference/Preference" since="1">
 		<extends name="java/lang/Object" />
@@ -15455,8 +15455,8 @@
 		<method name="hasHeaders()Z" since="11" />
 		<method name="invalidateHeaders()V" since="11" />
 		<method name="isMultiPane()Z" since="11" />
-		<method name="loadHeadersFromResource(ILjava/util/List&lt;android/preference/PreferenceActivity$Header>;)V" since="11" />
-		<method name="onBuildHeaders(Ljava/util/List&lt;android/preference/PreferenceActivity$Header>;)V" since="11" />
+		<method name="loadHeadersFromResource(ILjava/util/List;)V" since="11" />
+		<method name="onBuildHeaders(Ljava/util/List;)V" since="11" />
 		<method name="onBuildStartFragmentIntent(Ljava/lang/String;Landroid/os/Bundle;II)Landroid/content/Intent;" since="14" />
 		<method name="onGetInitialHeader()Landroid/preference/PreferenceActivity$Header;" since="11" />
 		<method name="onGetNewHeader()Landroid/preference/PreferenceActivity$Header;" since="11" />
@@ -16910,7 +16910,7 @@
 	<class name="android/provider/ContactsContract$ProfileSyncState" since="14">
 		<implements name="android/provider/SyncStateContract$Columns" />
 		<method name="get(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)[B" />
-		<method name="getWithUri(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)Landroid/util/Pair&lt;android/net/Uri, byte[]>;" />
+		<method name="getWithUri(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)Landroid/util/Pair;" />
 		<method name="newSetOperation(Landroid/accounts/Account;[B)Landroid/content/ContentProviderOperation;" />
 		<method name="set(Landroid/content/ContentProviderClient;Landroid/accounts/Account;[B)V" />
 		<field name="CONTENT_DIRECTORY" />
@@ -17092,7 +17092,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/SyncStateContract$Columns" />
 		<method name="get(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)[B" />
-		<method name="getWithUri(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)Landroid/util/Pair&lt;android/net/Uri, byte[]>;" />
+		<method name="getWithUri(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)Landroid/util/Pair;" />
 		<method name="newSetOperation(Landroid/accounts/Account;[B)Landroid/content/ContentProviderOperation;" />
 		<method name="set(Landroid/content/ContentProviderClient;Landroid/accounts/Account;[B)V" />
 		<field name="CONTENT_DIRECTORY" />
@@ -17723,7 +17723,7 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="get(Landroid/content/ContentProviderClient;Landroid/net/Uri;Landroid/accounts/Account;)[B" />
-		<method name="getWithUri(Landroid/content/ContentProviderClient;Landroid/net/Uri;Landroid/accounts/Account;)Landroid/util/Pair&lt;android/net/Uri, byte[]>;" />
+		<method name="getWithUri(Landroid/content/ContentProviderClient;Landroid/net/Uri;Landroid/accounts/Account;)Landroid/util/Pair;" />
 		<method name="insert(Landroid/content/ContentProviderClient;Landroid/net/Uri;Landroid/accounts/Account;[B)Landroid/net/Uri;" />
 		<method name="newSetOperation(Landroid/net/Uri;Landroid/accounts/Account;[B)Landroid/content/ContentProviderOperation;" />
 		<method name="newUpdateOperation(Landroid/net/Uri;[B)Landroid/content/ContentProviderOperation;" />
@@ -17859,9 +17859,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/Allocation$MipmapControl;" />
 		<method name="values()[Landroid/renderscript/Allocation$MipmapControl;" />
-		<field name="MIPMAP_FULL" />
-		<field name="MIPMAP_NONE" />
-		<field name="MIPMAP_ON_SYNC_TO_TEXTURE" />
+		<field name="MIPMAP_FULL" since="14" />
+		<field name="MIPMAP_NONE" since="14" />
+		<field name="MIPMAP_ON_SYNC_TO_TEXTURE" since="14" />
 	</class>
 	<class name="android/renderscript/AllocationAdapter" since="11">
 		<extends name="android/renderscript/Allocation" />
@@ -18012,45 +18012,45 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/Element$DataKind;" />
 		<method name="values()[Landroid/renderscript/Element$DataKind;" />
-		<field name="PIXEL_A" />
+		<field name="PIXEL_A" since="14" />
 		<field name="PIXEL_DEPTH" since="14" />
-		<field name="PIXEL_L" />
-		<field name="PIXEL_LA" />
-		<field name="PIXEL_RGB" />
-		<field name="PIXEL_RGBA" />
-		<field name="USER" />
+		<field name="PIXEL_L" since="14" />
+		<field name="PIXEL_LA" since="14" />
+		<field name="PIXEL_RGB" since="14" />
+		<field name="PIXEL_RGBA" since="14" />
+		<field name="USER" since="14" />
 	</class>
 	<class name="android/renderscript/Element$DataType" since="11">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/Element$DataType;" />
 		<method name="values()[Landroid/renderscript/Element$DataType;" />
-		<field name="BOOLEAN" />
-		<field name="FLOAT_32" />
-		<field name="FLOAT_64" />
-		<field name="MATRIX_2X2" />
-		<field name="MATRIX_3X3" />
-		<field name="MATRIX_4X4" />
-		<field name="RS_ALLOCATION" />
-		<field name="RS_ELEMENT" />
-		<field name="RS_MESH" />
-		<field name="RS_PROGRAM_FRAGMENT" />
-		<field name="RS_PROGRAM_RASTER" />
-		<field name="RS_PROGRAM_STORE" />
-		<field name="RS_PROGRAM_VERTEX" />
-		<field name="RS_SAMPLER" />
-		<field name="RS_SCRIPT" />
-		<field name="RS_TYPE" />
-		<field name="SIGNED_16" />
-		<field name="SIGNED_32" />
-		<field name="SIGNED_64" />
-		<field name="SIGNED_8" />
-		<field name="UNSIGNED_16" />
-		<field name="UNSIGNED_32" />
-		<field name="UNSIGNED_4_4_4_4" />
-		<field name="UNSIGNED_5_5_5_1" />
-		<field name="UNSIGNED_5_6_5" />
-		<field name="UNSIGNED_64" />
-		<field name="UNSIGNED_8" />
+		<field name="BOOLEAN" since="14" />
+		<field name="FLOAT_32" since="14" />
+		<field name="FLOAT_64" since="14" />
+		<field name="MATRIX_2X2" since="14" />
+		<field name="MATRIX_3X3" since="14" />
+		<field name="MATRIX_4X4" since="14" />
+		<field name="RS_ALLOCATION" since="14" />
+		<field name="RS_ELEMENT" since="14" />
+		<field name="RS_MESH" since="14" />
+		<field name="RS_PROGRAM_FRAGMENT" since="14" />
+		<field name="RS_PROGRAM_RASTER" since="14" />
+		<field name="RS_PROGRAM_STORE" since="14" />
+		<field name="RS_PROGRAM_VERTEX" since="14" />
+		<field name="RS_SAMPLER" since="14" />
+		<field name="RS_SCRIPT" since="14" />
+		<field name="RS_TYPE" since="14" />
+		<field name="SIGNED_16" since="14" />
+		<field name="SIGNED_32" since="14" />
+		<field name="SIGNED_64" since="14" />
+		<field name="SIGNED_8" since="14" />
+		<field name="UNSIGNED_16" since="14" />
+		<field name="UNSIGNED_32" since="14" />
+		<field name="UNSIGNED_4_4_4_4" since="14" />
+		<field name="UNSIGNED_5_5_5_1" since="14" />
+		<field name="UNSIGNED_5_6_5" since="14" />
+		<field name="UNSIGNED_64" since="14" />
+		<field name="UNSIGNED_8" since="14" />
 	</class>
 	<class name="android/renderscript/FieldPacker" since="11">
 		<extends name="java/lang/Object" />
@@ -18119,8 +18119,8 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/FileA3D$EntryType;" />
 		<method name="values()[Landroid/renderscript/FileA3D$EntryType;" />
-		<field name="MESH" />
-		<field name="UNKNOWN" />
+		<field name="MESH" since="14" />
+		<field name="UNKNOWN" since="14" />
 	</class>
 	<class name="android/renderscript/FileA3D$IndexEntry" since="11">
 		<extends name="java/lang/Object" />
@@ -18165,10 +18165,10 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/Font$Style;" />
 		<method name="values()[Landroid/renderscript/Font$Style;" />
-		<field name="BOLD" />
-		<field name="BOLD_ITALIC" />
-		<field name="ITALIC" />
-		<field name="NORMAL" />
+		<field name="BOLD" since="14" />
+		<field name="BOLD_ITALIC" since="14" />
+		<field name="ITALIC" since="14" />
+		<field name="NORMAL" since="14" />
 	</class>
 	<class name="android/renderscript/Int2" since="11">
 		<extends name="java/lang/Object" />
@@ -18318,12 +18318,12 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/Mesh$Primitive;" />
 		<method name="values()[Landroid/renderscript/Mesh$Primitive;" />
-		<field name="LINE" />
-		<field name="LINE_STRIP" />
-		<field name="POINT" />
-		<field name="TRIANGLE" />
-		<field name="TRIANGLE_FAN" />
-		<field name="TRIANGLE_STRIP" />
+		<field name="LINE" since="14" />
+		<field name="LINE_STRIP" since="14" />
+		<field name="POINT" since="14" />
+		<field name="TRIANGLE" since="14" />
+		<field name="TRIANGLE_FAN" since="14" />
+		<field name="TRIANGLE_STRIP" since="14" />
 	</class>
 	<class name="android/renderscript/Mesh$TriangleMeshBuilder" since="11">
 		<extends name="java/lang/Object" />
@@ -18360,8 +18360,8 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/Program$TextureType;" />
 		<method name="values()[Landroid/renderscript/Program$TextureType;" />
-		<field name="TEXTURE_2D" />
-		<field name="TEXTURE_CUBE" />
+		<field name="TEXTURE_2D" since="14" />
+		<field name="TEXTURE_CUBE" since="14" />
 	</class>
 	<class name="android/renderscript/ProgramFragment" since="11">
 		<extends name="android/renderscript/Program" />
@@ -18387,18 +18387,18 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/ProgramFragmentFixedFunction$Builder$EnvMode;" />
 		<method name="values()[Landroid/renderscript/ProgramFragmentFixedFunction$Builder$EnvMode;" />
-		<field name="DECAL" />
-		<field name="MODULATE" />
-		<field name="REPLACE" />
+		<field name="DECAL" since="14" />
+		<field name="MODULATE" since="14" />
+		<field name="REPLACE" since="14" />
 	</class>
 	<class name="android/renderscript/ProgramFragmentFixedFunction$Builder$Format" since="11">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/ProgramFragmentFixedFunction$Builder$Format;" />
 		<method name="values()[Landroid/renderscript/ProgramFragmentFixedFunction$Builder$Format;" />
-		<field name="ALPHA" />
-		<field name="LUMINANCE_ALPHA" />
-		<field name="RGB" />
-		<field name="RGBA" />
+		<field name="ALPHA" since="14" />
+		<field name="LUMINANCE_ALPHA" since="14" />
+		<field name="RGB" since="14" />
+		<field name="RGBA" since="14" />
 	</class>
 	<class name="android/renderscript/ProgramRaster" since="11">
 		<extends name="android/renderscript/BaseObj" />
@@ -18417,9 +18417,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/ProgramRaster$CullMode;" />
 		<method name="values()[Landroid/renderscript/ProgramRaster$CullMode;" />
-		<field name="BACK" />
-		<field name="FRONT" />
-		<field name="NONE" />
+		<field name="BACK" since="14" />
+		<field name="FRONT" since="14" />
+		<field name="NONE" since="14" />
 	</class>
 	<class name="android/renderscript/ProgramStore" since="11">
 		<extends name="android/renderscript/BaseObj" />
@@ -18432,28 +18432,28 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/ProgramStore$BlendDstFunc;" />
 		<method name="values()[Landroid/renderscript/ProgramStore$BlendDstFunc;" />
-		<field name="DST_ALPHA" />
-		<field name="ONE" />
-		<field name="ONE_MINUS_DST_ALPHA" />
-		<field name="ONE_MINUS_SRC_ALPHA" />
-		<field name="ONE_MINUS_SRC_COLOR" />
-		<field name="SRC_ALPHA" />
-		<field name="SRC_COLOR" />
-		<field name="ZERO" />
+		<field name="DST_ALPHA" since="14" />
+		<field name="ONE" since="14" />
+		<field name="ONE_MINUS_DST_ALPHA" since="14" />
+		<field name="ONE_MINUS_SRC_ALPHA" since="14" />
+		<field name="ONE_MINUS_SRC_COLOR" since="14" />
+		<field name="SRC_ALPHA" since="14" />
+		<field name="SRC_COLOR" since="14" />
+		<field name="ZERO" since="14" />
 	</class>
 	<class name="android/renderscript/ProgramStore$BlendSrcFunc" since="11">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/ProgramStore$BlendSrcFunc;" />
 		<method name="values()[Landroid/renderscript/ProgramStore$BlendSrcFunc;" />
-		<field name="DST_ALPHA" />
-		<field name="DST_COLOR" />
-		<field name="ONE" />
-		<field name="ONE_MINUS_DST_ALPHA" />
-		<field name="ONE_MINUS_DST_COLOR" />
-		<field name="ONE_MINUS_SRC_ALPHA" />
-		<field name="SRC_ALPHA" />
-		<field name="SRC_ALPHA_SATURATE" />
-		<field name="ZERO" />
+		<field name="DST_ALPHA" since="14" />
+		<field name="DST_COLOR" since="14" />
+		<field name="ONE" since="14" />
+		<field name="ONE_MINUS_DST_ALPHA" since="14" />
+		<field name="ONE_MINUS_DST_COLOR" since="14" />
+		<field name="ONE_MINUS_SRC_ALPHA" since="14" />
+		<field name="SRC_ALPHA" since="14" />
+		<field name="SRC_ALPHA_SATURATE" since="14" />
+		<field name="ZERO" since="14" />
 	</class>
 	<class name="android/renderscript/ProgramStore$Builder" since="11">
 		<extends name="java/lang/Object" />
@@ -18469,13 +18469,13 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/ProgramStore$DepthFunc;" />
 		<method name="values()[Landroid/renderscript/ProgramStore$DepthFunc;" />
-		<field name="ALWAYS" />
-		<field name="EQUAL" />
-		<field name="GREATER" />
-		<field name="GREATER_OR_EQUAL" />
-		<field name="LESS" />
-		<field name="LESS_OR_EQUAL" />
-		<field name="NOT_EQUAL" />
+		<field name="ALWAYS" since="14" />
+		<field name="EQUAL" since="14" />
+		<field name="GREATER" since="14" />
+		<field name="GREATER_OR_EQUAL" since="14" />
+		<field name="LESS" since="14" />
+		<field name="LESS_OR_EQUAL" since="14" />
+		<field name="NOT_EQUAL" since="14" />
 	</class>
 	<class name="android/renderscript/ProgramVertex" since="11">
 		<extends name="android/renderscript/Program" />
@@ -18568,8 +18568,8 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/RenderScript$Priority;" />
 		<method name="values()[Landroid/renderscript/RenderScript$Priority;" />
-		<field name="LOW" />
-		<field name="NORMAL" />
+		<field name="LOW" since="14" />
+		<field name="NORMAL" since="14" />
 	</class>
 	<class name="android/renderscript/RenderScript$RSErrorHandler" since="11">
 		<extends name="java/lang/Object" />
@@ -18635,12 +18635,12 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/Sampler$Value;" />
 		<method name="values()[Landroid/renderscript/Sampler$Value;" />
-		<field name="CLAMP" />
-		<field name="LINEAR" />
-		<field name="LINEAR_MIP_LINEAR" />
-		<field name="LINEAR_MIP_NEAREST" />
-		<field name="NEAREST" />
-		<field name="WRAP" />
+		<field name="CLAMP" since="14" />
+		<field name="LINEAR" since="14" />
+		<field name="LINEAR_MIP_LINEAR" since="14" />
+		<field name="LINEAR_MIP_NEAREST" since="14" />
+		<field name="NEAREST" since="14" />
+		<field name="WRAP" since="14" />
 	</class>
 	<class name="android/renderscript/Script" since="11">
 		<extends name="android/renderscript/BaseObj" />
@@ -18724,15 +18724,15 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/renderscript/Type$CubemapFace;" />
 		<method name="values()[Landroid/renderscript/Type$CubemapFace;" />
-		<field name="NEGATIVE_X" />
-		<field name="NEGATIVE_Y" />
-		<field name="NEGATIVE_Z" />
+		<field name="NEGATIVE_X" since="14" />
+		<field name="NEGATIVE_Y" since="14" />
+		<field name="NEGATIVE_Z" since="14" />
 		<field name="POSITIVE_X" since="14" />
 		<field name="POSITIVE_Y" since="14" />
 		<field name="POSITIVE_Z" since="14" />
-		<field name="POSITVE_X" />
-		<field name="POSITVE_Y" />
-		<field name="POSITVE_Z" />
+		<field name="POSITVE_X" since="14" />
+		<field name="POSITVE_Y" since="14" />
+		<field name="POSITVE_Z" since="14" />
 	</class>
 	<class name="android/sax/Element" since="1">
 		<extends name="java/lang/Object" />
@@ -18961,13 +18961,13 @@
 		<method name="addSpeech(Ljava/lang/String;Ljava/lang/String;I)I" />
 		<method name="areDefaultsEnforced()Z" since="8" />
 		<method name="getDefaultEngine()Ljava/lang/String;" since="8" />
-		<method name="getEngines()Ljava/util/List&lt;android/speech/tts/TextToSpeech$EngineInfo>;" since="14" />
-		<method name="getFeatures(Ljava/util/Locale;)Ljava/util/Set&lt;java/lang/String>;" since="15" />
+		<method name="getEngines()Ljava/util/List;" since="14" />
+		<method name="getFeatures(Ljava/util/Locale;)Ljava/util/Set;" since="15" />
 		<method name="getLanguage()Ljava/util/Locale;" />
 		<method name="isLanguageAvailable(Ljava/util/Locale;)I" />
 		<method name="isSpeaking()Z" />
-		<method name="playEarcon(Ljava/lang/String;ILjava/util/HashMap&lt;java/lang/String, java$lang/String>;)I" />
-		<method name="playSilence(JILjava/util/HashMap&lt;java/lang/String, java$lang/String>;)I" />
+		<method name="playEarcon(Ljava/lang/String;ILjava/util/HashMap;)I" />
+		<method name="playSilence(JILjava/util/HashMap;)I" />
 		<method name="setEngineByPackageName(Ljava/lang/String;)I" since="8" />
 		<method name="setLanguage(Ljava/util/Locale;)I" />
 		<method name="setOnUtteranceCompletedListener(Landroid/speech/tts/TextToSpeech$OnUtteranceCompletedListener;)I" />
@@ -18975,9 +18975,9 @@
 		<method name="setPitch(F)I" />
 		<method name="setSpeechRate(F)I" />
 		<method name="shutdown()V" />
-		<method name="speak(Ljava/lang/String;ILjava/util/HashMap&lt;java/lang/String, java$lang/String>;)I" />
+		<method name="speak(Ljava/lang/String;ILjava/util/HashMap;)I" />
 		<method name="stop()I" />
-		<method name="synthesizeToFile(Ljava/lang/String;Ljava/util/HashMap&lt;java/lang/String, java$lang/String>;Ljava/lang/String;)I" />
+		<method name="synthesizeToFile(Ljava/lang/String;Ljava/util/HashMap;Ljava/lang/String;)I" />
 		<field name="ACTION_TTS_QUEUE_PROCESSING_COMPLETED" />
 		<field name="ERROR" />
 		<field name="LANG_AVAILABLE" />
@@ -19033,7 +19033,7 @@
 		<extends name="android/app/Service" />
 		<method name="&lt;init>()V" />
 		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
-		<method name="onGetFeaturesForLanguage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Set&lt;java/lang/String>;" since="15" />
+		<method name="onGetFeaturesForLanguage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Set;" since="15" />
 		<method name="onGetLanguage()[Ljava/lang/String;" />
 		<method name="onIsLanguageAvailable(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I" />
 		<method name="onLoadLanguage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I" />
@@ -19189,10 +19189,10 @@
 	</class>
 	<class name="android/telephony/SmsManager" since="4">
 		<extends name="java/lang/Object" />
-		<method name="divideMessage(Ljava/lang/String;)Ljava/util/ArrayList&lt;java/lang/String>;" />
+		<method name="divideMessage(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getDefault()Landroid/telephony/SmsManager;" />
 		<method name="sendDataMessage(Ljava/lang/String;Ljava/lang/String;S[BLandroid/app/PendingIntent;Landroid/app/PendingIntent;)V" />
-		<method name="sendMultipartTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList&lt;java/lang/String>;Ljava/util/ArrayList&lt;android/app/PendingIntent>;Ljava/util/ArrayList&lt;android/app/PendingIntent>;)V" />
+		<method name="sendMultipartTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/ArrayList;)V" />
 		<method name="sendTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/app/PendingIntent;Landroid/app/PendingIntent;)V" />
 		<field name="RESULT_ERROR_GENERIC_FAILURE" />
 		<field name="RESULT_ERROR_NO_SERVICE" />
@@ -19251,11 +19251,11 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/telephony/SmsMessage$MessageClass;" />
 		<method name="values()[Landroid/telephony/SmsMessage$MessageClass;" />
-		<field name="CLASS_0" />
-		<field name="CLASS_1" />
-		<field name="CLASS_2" />
-		<field name="CLASS_3" />
-		<field name="UNKNOWN" />
+		<field name="CLASS_0" since="14" />
+		<field name="CLASS_1" since="14" />
+		<field name="CLASS_2" since="14" />
+		<field name="CLASS_3" since="14" />
+		<field name="UNKNOWN" since="14" />
 	</class>
 	<class name="android/telephony/SmsMessage$SubmitPdu" since="4">
 		<extends name="java/lang/Object" />
@@ -19271,7 +19271,7 @@
 		<method name="getDeviceId()Ljava/lang/String;" />
 		<method name="getDeviceSoftwareVersion()Ljava/lang/String;" />
 		<method name="getLine1Number()Ljava/lang/String;" />
-		<method name="getNeighboringCellInfo()Ljava/util/List&lt;android/telephony/NeighboringCellInfo>;" since="3" />
+		<method name="getNeighboringCellInfo()Ljava/util/List;" since="3" />
 		<method name="getNetworkCountryIso()Ljava/lang/String;" />
 		<method name="getNetworkOperator()Ljava/lang/String;" />
 		<method name="getNetworkOperatorName()Ljava/lang/String;" />
@@ -19360,10 +19360,10 @@
 	</class>
 	<class name="android/telephony/gsm/SmsManager" since="1">
 		<extends name="java/lang/Object" />
-		<method name="divideMessage(Ljava/lang/String;)Ljava/util/ArrayList&lt;java/lang/String>;" />
+		<method name="divideMessage(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getDefault()Landroid/telephony/gsm/SmsManager;" />
 		<method name="sendDataMessage(Ljava/lang/String;Ljava/lang/String;S[BLandroid/app/PendingIntent;Landroid/app/PendingIntent;)V" />
-		<method name="sendMultipartTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList&lt;java/lang/String>;Ljava/util/ArrayList&lt;android/app/PendingIntent>;Ljava/util/ArrayList&lt;android/app/PendingIntent>;)V" />
+		<method name="sendMultipartTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/ArrayList;)V" />
 		<method name="sendTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/app/PendingIntent;Landroid/app/PendingIntent;)V" />
 		<field name="RESULT_ERROR_GENERIC_FAILURE" />
 		<field name="RESULT_ERROR_NO_SERVICE" />
@@ -19420,11 +19420,11 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/telephony/gsm/SmsMessage$MessageClass;" />
 		<method name="values()[Landroid/telephony/gsm/SmsMessage$MessageClass;" />
-		<field name="CLASS_0" />
-		<field name="CLASS_1" />
-		<field name="CLASS_2" />
-		<field name="CLASS_3" />
-		<field name="UNKNOWN" />
+		<field name="CLASS_0" since="14" />
+		<field name="CLASS_1" since="14" />
+		<field name="CLASS_2" since="14" />
+		<field name="CLASS_3" since="14" />
+		<field name="UNKNOWN" since="14" />
 	</class>
 	<class name="android/telephony/gsm/SmsMessage$SubmitPdu" since="1">
 		<extends name="java/lang/Object" />
@@ -19434,15 +19434,15 @@
 	</class>
 	<class name="android/test/ActivityInstrumentationTestCase" since="1">
 		<extends name="android/test/ActivityTestCase" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class&lt;T>;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class&lt;T>;Z)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;Z)V" />
 		<method name="getActivity()LT;" />
 		<method name="testActivityTestCaseSetUpProperly()V" />
 	</class>
 	<class name="android/test/ActivityInstrumentationTestCase2" since="3">
 		<extends name="android/test/ActivityTestCase" />
-		<method name="&lt;init>(Ljava/lang/Class&lt;T>;)V" since="8" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class&lt;T>;)V" />
+		<method name="&lt;init>(Ljava/lang/Class;)V" since="8" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" />
 		<method name="getActivity()LT;" />
 		<method name="setActivityInitialTouchMode(Z)V" />
 		<method name="setActivityIntent(Landroid/content/Intent;)V" />
@@ -19451,12 +19451,12 @@
 		<extends name="android/test/InstrumentationTestCase" />
 		<method name="&lt;init>()V" />
 		<method name="getActivity()Landroid/app/Activity;" />
-		<method name="scrubClass(Ljava/lang/Class&lt;?>;)V" />
+		<method name="scrubClass(Ljava/lang/Class;)V" />
 		<method name="setActivity(Landroid/app/Activity;)V" />
 	</class>
 	<class name="android/test/ActivityUnitTestCase" since="1">
 		<extends name="android/test/ActivityTestCase" />
-		<method name="&lt;init>(Ljava/lang/Class&lt;T>;)V" />
+		<method name="&lt;init>(Ljava/lang/Class;)V" />
 		<method name="getActivity()LT;" />
 		<method name="getFinishedActivityRequest()I" />
 		<method name="getRequestedOrientation()I" />
@@ -19474,7 +19474,7 @@
 		<method name="assertReadingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" />
 		<method name="assertWritingContentUriRequiresPermission(Landroid/net/Uri;Ljava/lang/String;)V" since="4" />
 		<method name="getContext()Landroid/content/Context;" />
-		<method name="scrubClass(Ljava/lang/Class&lt;?>;)V" />
+		<method name="scrubClass(Ljava/lang/Class;)V" />
 		<method name="setContext(Landroid/content/Context;)V" />
 		<method name="testAndroidTestCaseSetupProperly()V" />
 		<field name="mContext" />
@@ -19485,7 +19485,7 @@
 		<method name="addTestListener(Ljunit/framework/TestListener;)V" />
 		<method name="clearTestListeners()V" />
 		<method name="createTestResult()Ljunit/framework/TestResult;" />
-		<method name="getTestCases()Ljava/util/List&lt;junit/framework/TestCase>;" />
+		<method name="getTestCases()Ljava/util/List;" />
 		<method name="getTestClassName()Ljava/lang/String;" />
 		<method name="getTestResult()Ljunit/framework/TestResult;" />
 		<method name="runFailed(Ljava/lang/String;)V" />
@@ -19502,7 +19502,7 @@
 	</class>
 	<class name="android/test/ApplicationTestCase" since="1">
 		<extends name="android/test/AndroidTestCase" />
-		<method name="&lt;init>(Ljava/lang/Class&lt;T>;)V" />
+		<method name="&lt;init>(Ljava/lang/Class;)V" />
 		<method name="createApplication()V" />
 		<method name="getApplication()LT;" />
 		<method name="getSystemContext()Landroid/content/Context;" />
@@ -19528,8 +19528,8 @@
 		<method name="getInstrumentation()Landroid/app/Instrumentation;" />
 		<method name="injectInsrumentation(Landroid/app/Instrumentation;)V" />
 		<method name="injectInstrumentation(Landroid/app/Instrumentation;)V" since="5" />
-		<method name="launchActivity(Ljava/lang/String;Ljava/lang/Class&lt;T>;Landroid/os/Bundle;)LT;" />
-		<method name="launchActivityWithIntent(Ljava/lang/String;Ljava/lang/Class&lt;T>;Landroid/content/Intent;)LT;" since="3" />
+		<method name="launchActivity(Ljava/lang/String;Ljava/lang/Class;Landroid/os/Bundle;)LT;" />
+		<method name="launchActivityWithIntent(Ljava/lang/String;Ljava/lang/Class;Landroid/content/Intent;)LT;" since="3" />
 		<method name="runTestOnUiThread(Ljava/lang/Runnable;)V" since="3" />
 		<method name="sendKeys(Ljava/lang/String;)V" />
 		<method name="sendKeys([I)V" />
@@ -19563,33 +19563,33 @@
 	<class name="android/test/IsolatedContext" since="1">
 		<extends name="android/content/ContextWrapper" />
 		<method name="&lt;init>(Landroid/content/ContentResolver;Landroid/content/Context;)V" />
-		<method name="getAndClearBroadcastIntents()Ljava/util/List&lt;android/content/Intent>;" />
+		<method name="getAndClearBroadcastIntents()Ljava/util/List;" />
 	</class>
 	<class name="android/test/LoaderTestCase" since="11">
 		<extends name="android/test/AndroidTestCase" />
 		<method name="&lt;init>()V" />
-		<method name="getLoaderResultSynchronously(Landroid/content/Loader&lt;T>;)LT;" />
+		<method name="getLoaderResultSynchronously(Landroid/content/Loader;)LT;" />
 	</class>
 	<class name="android/test/MoreAsserts" since="1">
 		<extends name="java/lang/Object" />
-		<method name="assertAssignableFrom(Ljava/lang/Class&lt;?>;Ljava/lang/Class&lt;?>;)V" />
-		<method name="assertAssignableFrom(Ljava/lang/Class&lt;?>;Ljava/lang/Object;)V" />
+		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Class;)V" />
+		<method name="assertAssignableFrom(Ljava/lang/Class;Ljava/lang/Object;)V" />
 		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" />
 		<method name="assertContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" />
-		<method name="assertContentsInAnyOrder(Ljava/lang/Iterable&lt;?>;[Ljava/lang/Object;)V" />
-		<method name="assertContentsInAnyOrder(Ljava/lang/String;Ljava/lang/Iterable&lt;?>;[Ljava/lang/Object;)V" />
-		<method name="assertContentsInOrder(Ljava/lang/Iterable&lt;?>;[Ljava/lang/Object;)V" />
-		<method name="assertContentsInOrder(Ljava/lang/String;Ljava/lang/Iterable&lt;?>;[Ljava/lang/Object;)V" />
-		<method name="assertEmpty(Ljava/lang/Iterable&lt;?>;)V" />
-		<method name="assertEmpty(Ljava/lang/String;Ljava/lang/Iterable&lt;?>;)V" />
-		<method name="assertEmpty(Ljava/lang/String;Ljava/util/Map&lt;?, ?>;)V" />
-		<method name="assertEmpty(Ljava/util/Map&lt;?, ?>;)V" />
-		<method name="assertEquals(Ljava/lang/String;Ljava/util/Set&lt;? extends java/lang/Object>;Ljava/util/Set&lt;? extends java/lang/Object>;)V" />
+		<method name="assertContentsInAnyOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" />
+		<method name="assertContentsInAnyOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" />
+		<method name="assertContentsInOrder(Ljava/lang/Iterable;[Ljava/lang/Object;)V" />
+		<method name="assertContentsInOrder(Ljava/lang/String;Ljava/lang/Iterable;[Ljava/lang/Object;)V" />
+		<method name="assertEmpty(Ljava/lang/Iterable;)V" />
+		<method name="assertEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" />
+		<method name="assertEmpty(Ljava/lang/String;Ljava/util/Map;)V" />
+		<method name="assertEmpty(Ljava/util/Map;)V" />
+		<method name="assertEquals(Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;)V" />
 		<method name="assertEquals(Ljava/lang/String;[B[B)V" />
 		<method name="assertEquals(Ljava/lang/String;[D[D)V" />
 		<method name="assertEquals(Ljava/lang/String;[I[I)V" />
 		<method name="assertEquals(Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Object;)V" />
-		<method name="assertEquals(Ljava/util/Set&lt;? extends java/lang/Object>;Ljava/util/Set&lt;? extends java/lang/Object>;)V" />
+		<method name="assertEquals(Ljava/util/Set;Ljava/util/Set;)V" />
 		<method name="assertEquals([B[B)V" />
 		<method name="assertEquals([D[D)V" />
 		<method name="assertEquals([I[I)V" />
@@ -19598,10 +19598,10 @@
 		<method name="assertMatchesRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/util/regex/MatchResult;" />
 		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="assertNotContainsRegex(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="assertNotEmpty(Ljava/lang/Iterable&lt;?>;)V" />
-		<method name="assertNotEmpty(Ljava/lang/String;Ljava/lang/Iterable&lt;?>;)V" />
-		<method name="assertNotEmpty(Ljava/lang/String;Ljava/util/Map&lt;?, ?>;)V" />
-		<method name="assertNotEmpty(Ljava/util/Map&lt;?, ?>;)V" />
+		<method name="assertNotEmpty(Ljava/lang/Iterable;)V" />
+		<method name="assertNotEmpty(Ljava/lang/String;Ljava/lang/Iterable;)V" />
+		<method name="assertNotEmpty(Ljava/lang/String;Ljava/util/Map;)V" />
+		<method name="assertNotEmpty(Ljava/util/Map;)V" />
 		<method name="assertNotEqual(Ljava/lang/Object;Ljava/lang/Object;)V" />
 		<method name="assertNotEqual(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V" />
 		<method name="assertNotMatchesRegex(Ljava/lang/String;Ljava/lang/String;)V" />
@@ -19622,19 +19622,19 @@
 	</class>
 	<class name="android/test/ProviderTestCase" since="1">
 		<extends name="android/test/InstrumentationTestCase" />
-		<method name="&lt;init>(Ljava/lang/Class&lt;T>;Ljava/lang/String;)V" />
+		<method name="&lt;init>(Ljava/lang/Class;Ljava/lang/String;)V" />
 		<method name="getMockContentResolver()Landroid/test/mock/MockContentResolver;" />
 		<method name="getMockContext()Landroid/test/IsolatedContext;" />
 		<method name="getProvider()LT;" />
-		<method name="newResolverWithContentProviderFromSql(Landroid/content/Context;Ljava/lang/Class&lt;T>;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Landroid/content/ContentResolver;" />
+		<method name="newResolverWithContentProviderFromSql(Landroid/content/Context;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Landroid/content/ContentResolver;" />
 	</class>
 	<class name="android/test/ProviderTestCase2" since="3">
 		<extends name="android/test/AndroidTestCase" />
-		<method name="&lt;init>(Ljava/lang/Class&lt;T>;Ljava/lang/String;)V" />
+		<method name="&lt;init>(Ljava/lang/Class;Ljava/lang/String;)V" />
 		<method name="getMockContentResolver()Landroid/test/mock/MockContentResolver;" />
 		<method name="getMockContext()Landroid/test/IsolatedContext;" />
 		<method name="getProvider()LT;" />
-		<method name="newResolverWithContentProviderFromSql(Landroid/content/Context;Ljava/lang/String;Ljava/lang/Class&lt;T>;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Landroid/content/ContentResolver;" />
+		<method name="newResolverWithContentProviderFromSql(Landroid/content/Context;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Landroid/content/ContentResolver;" />
 	</class>
 	<class name="android/test/RenamingDelegatingContext" since="1">
 		<extends name="android/content/ContextWrapper" />
@@ -19642,12 +19642,12 @@
 		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/String;)V" />
 		<method name="getDatabasePrefix()Ljava/lang/String;" />
 		<method name="makeExistingFilesAndDbsAccessible()V" />
-		<method name="providerWithRenamedContext(Ljava/lang/Class&lt;T>;Landroid/content/Context;Ljava/lang/String;)LT;" />
-		<method name="providerWithRenamedContext(Ljava/lang/Class&lt;T>;Landroid/content/Context;Ljava/lang/String;Z)LT;" />
+		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;)LT;" />
+		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;Z)LT;" />
 	</class>
 	<class name="android/test/ServiceTestCase" since="1">
 		<extends name="android/test/AndroidTestCase" />
-		<method name="&lt;init>(Ljava/lang/Class&lt;T>;)V" />
+		<method name="&lt;init>(Ljava/lang/Class;)V" />
 		<method name="bindService(Landroid/content/Intent;)Landroid/os/IBinder;" />
 		<method name="getApplication()Landroid/app/Application;" />
 		<method name="getService()LT;" />
@@ -19660,7 +19660,7 @@
 	</class>
 	<class name="android/test/SingleLaunchActivityTestCase" since="1">
 		<extends name="android/test/InstrumentationTestCase" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class&lt;T>;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" />
 		<method name="getActivity()LT;" />
 		<method name="testActivityTestCaseSetUpProperly()V" />
 	</class>
@@ -19838,7 +19838,7 @@
 		<method name="abortUpdates()V" />
 		<method name="close()V" />
 		<method name="commitUpdates()Z" />
-		<method name="commitUpdates(Ljava/util/Map&lt;? extends java/lang/Long, ? extends java$util/Map&lt;java/lang/String, java$lang/Object>>;)Z" />
+		<method name="commitUpdates(Ljava/util/Map;)Z" />
 		<method name="copyStringToBuffer(ILandroid/database/CharArrayBuffer;)V" />
 		<method name="deactivate()V" />
 		<method name="deleteRow()Z" />
@@ -19914,7 +19914,7 @@
 		<method name="getActivityInfo(Landroid/content/ComponentName;I)Landroid/content/pm/ActivityInfo;" />
 		<method name="getActivityLogo(Landroid/content/ComponentName;)Landroid/graphics/drawable/Drawable;" since="9" />
 		<method name="getActivityLogo(Landroid/content/Intent;)Landroid/graphics/drawable/Drawable;" since="9" />
-		<method name="getAllPermissionGroups(I)Ljava/util/List&lt;android/content/pm/PermissionGroupInfo>;" />
+		<method name="getAllPermissionGroups(I)Ljava/util/List;" />
 		<method name="getApplicationEnabledSetting(Ljava/lang/String;)I" />
 		<method name="getApplicationIcon(Landroid/content/pm/ApplicationInfo;)Landroid/graphics/drawable/Drawable;" />
 		<method name="getApplicationIcon(Ljava/lang/String;)Landroid/graphics/drawable/Drawable;" />
@@ -19925,8 +19925,8 @@
 		<method name="getComponentEnabledSetting(Landroid/content/ComponentName;)I" />
 		<method name="getDefaultActivityIcon()Landroid/graphics/drawable/Drawable;" />
 		<method name="getDrawable(Ljava/lang/String;ILandroid/content/pm/ApplicationInfo;)Landroid/graphics/drawable/Drawable;" />
-		<method name="getInstalledApplications(I)Ljava/util/List&lt;android/content/pm/ApplicationInfo>;" />
-		<method name="getInstalledPackages(I)Ljava/util/List&lt;android/content/pm/PackageInfo>;" />
+		<method name="getInstalledApplications(I)Ljava/util/List;" />
+		<method name="getInstalledPackages(I)Ljava/util/List;" />
 		<method name="getInstallerPackageName(Ljava/lang/String;)Ljava/lang/String;" since="5" />
 		<method name="getInstrumentationInfo(Landroid/content/ComponentName;I)Landroid/content/pm/InstrumentationInfo;" />
 		<method name="getLaunchIntentForPackage(Ljava/lang/String;)Landroid/content/Intent;" since="3" />
@@ -19936,8 +19936,8 @@
 		<method name="getPackagesForUid(I)[Ljava/lang/String;" />
 		<method name="getPermissionGroupInfo(Ljava/lang/String;I)Landroid/content/pm/PermissionGroupInfo;" />
 		<method name="getPermissionInfo(Ljava/lang/String;I)Landroid/content/pm/PermissionInfo;" />
-		<method name="getPreferredActivities(Ljava/util/List&lt;android/content/IntentFilter>;Ljava/util/List&lt;android/content/ComponentName>;Ljava/lang/String;)I" />
-		<method name="getPreferredPackages(I)Ljava/util/List&lt;android/content/pm/PackageInfo>;" />
+		<method name="getPreferredActivities(Ljava/util/List;Ljava/util/List;Ljava/lang/String;)I" />
+		<method name="getPreferredPackages(I)Ljava/util/List;" />
 		<method name="getProviderInfo(Landroid/content/ComponentName;I)Landroid/content/pm/ProviderInfo;" since="9" />
 		<method name="getReceiverInfo(Landroid/content/ComponentName;I)Landroid/content/pm/ActivityInfo;" />
 		<method name="getResourcesForActivity(Landroid/content/ComponentName;)Landroid/content/res/Resources;" />
@@ -19951,13 +19951,13 @@
 		<method name="hasSystemFeature(Ljava/lang/String;)Z" since="5" />
 		<method name="installPackage(Landroid/net/Uri;Landroid/content/pm/IPackageInstallObserver;I)V" />
 		<method name="isSafeMode()Z" since="3" />
-		<method name="queryBroadcastReceivers(Landroid/content/Intent;I)Ljava/util/List&lt;android/content/pm/ResolveInfo>;" />
-		<method name="queryContentProviders(Ljava/lang/String;II)Ljava/util/List&lt;android/content/pm/ProviderInfo>;" />
-		<method name="queryInstrumentation(Ljava/lang/String;I)Ljava/util/List&lt;android/content/pm/InstrumentationInfo>;" />
-		<method name="queryIntentActivities(Landroid/content/Intent;I)Ljava/util/List&lt;android/content/pm/ResolveInfo>;" />
-		<method name="queryIntentActivityOptions(Landroid/content/ComponentName;[Landroid/content/Intent;Landroid/content/Intent;I)Ljava/util/List&lt;android/content/pm/ResolveInfo>;" />
-		<method name="queryIntentServices(Landroid/content/Intent;I)Ljava/util/List&lt;android/content/pm/ResolveInfo>;" />
-		<method name="queryPermissionsByGroup(Ljava/lang/String;I)Ljava/util/List&lt;android/content/pm/PermissionInfo>;" />
+		<method name="queryBroadcastReceivers(Landroid/content/Intent;I)Ljava/util/List;" />
+		<method name="queryContentProviders(Ljava/lang/String;II)Ljava/util/List;" />
+		<method name="queryInstrumentation(Ljava/lang/String;I)Ljava/util/List;" />
+		<method name="queryIntentActivities(Landroid/content/Intent;I)Ljava/util/List;" />
+		<method name="queryIntentActivityOptions(Landroid/content/ComponentName;[Landroid/content/Intent;Landroid/content/Intent;I)Ljava/util/List;" />
+		<method name="queryIntentServices(Landroid/content/Intent;I)Ljava/util/List;" />
+		<method name="queryPermissionsByGroup(Ljava/lang/String;I)Ljava/util/List;" />
 		<method name="removePackageFromPreferred(Ljava/lang/String;)V" />
 		<method name="removePermission(Ljava/lang/String;)V" />
 		<method name="resolveActivity(Landroid/content/Intent;I)Landroid/content/pm/ResolveInfo;" />
@@ -19974,12 +19974,12 @@
 	</class>
 	<class name="android/test/suitebuilder/TestMethod" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class&lt;? extends junit/framework/TestCase>;)V" since="3" />
-		<method name="&lt;init>(Ljava/lang/reflect/Method;Ljava/lang/Class&lt;? extends junit/framework/TestCase>;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" since="3" />
+		<method name="&lt;init>(Ljava/lang/reflect/Method;Ljava/lang/Class;)V" />
 		<method name="&lt;init>(Ljunit/framework/TestCase;)V" since="3" />
 		<method name="createTest()Ljunit/framework/TestCase;" />
-		<method name="getAnnotation(Ljava/lang/Class&lt;T>;)LT;" />
-		<method name="getEnclosingClass()Ljava/lang/Class&lt;? extends junit/framework/TestCase>;" />
+		<method name="getAnnotation(Ljava/lang/Class;)LT;" />
+		<method name="getEnclosingClass()Ljava/lang/Class;" />
 		<method name="getEnclosingClassname()Ljava/lang/String;" />
 		<method name="getName()Ljava/lang/String;" />
 	</class>
@@ -19987,8 +19987,8 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/lang/Class;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/ClassLoader;)V" />
-		<method name="addRequirements(Ljava/util/List&lt;com/android/internal/util/Predicate&lt;android/test/suitebuilder/TestMethod>>;)Landroid/test/suitebuilder/TestSuiteBuilder;" />
-		<method name="addRequirements([Lcom/android/internal/util/Predicate&lt;android/test/suitebuilder/TestMethod>;)Landroid/test/suitebuilder/TestSuiteBuilder;" />
+		<method name="addRequirements(Ljava/util/List;)Landroid/test/suitebuilder/TestSuiteBuilder;" />
+		<method name="addRequirements([Lcom/android/internal/util/Predicate;)Landroid/test/suitebuilder/TestSuiteBuilder;" />
 		<method name="build()Ljunit/framework/TestSuite;" />
 		<method name="excludePackages([Ljava/lang/String;)Landroid/test/suitebuilder/TestSuiteBuilder;" />
 		<method name="getSuiteName()Ljava/lang/String;" />
@@ -20268,9 +20268,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/text/Layout$Alignment;" />
 		<method name="values()[Landroid/text/Layout$Alignment;" />
-		<field name="ALIGN_CENTER" />
-		<field name="ALIGN_NORMAL" />
-		<field name="ALIGN_OPPOSITE" />
+		<field name="ALIGN_CENTER" since="14" />
+		<field name="ALIGN_NORMAL" since="14" />
+		<field name="ALIGN_OPPOSITE" since="14" />
 	</class>
 	<class name="android/text/Layout$Directions" since="1">
 		<extends name="java/lang/Object" />
@@ -20387,7 +20387,7 @@
 		<method name="getSpanEnd(Ljava/lang/Object;)I" />
 		<method name="getSpanFlags(Ljava/lang/Object;)I" />
 		<method name="getSpanStart(Ljava/lang/Object;)I" />
-		<method name="getSpans(IILjava/lang/Class&lt;T>;)[LT;" />
+		<method name="getSpans(IILjava/lang/Class;)[LT;" />
 		<method name="getTextRunCursor(IIIIILandroid/graphics/Paint;)I" since="11" />
 		<method name="insert(ILjava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;" />
 		<method name="insert(ILjava/lang/CharSequence;II)Landroid/text/SpannableStringBuilder;" />
@@ -20408,7 +20408,7 @@
 		<method name="getSpanEnd(Ljava/lang/Object;)I" />
 		<method name="getSpanFlags(Ljava/lang/Object;)I" />
 		<method name="getSpanStart(Ljava/lang/Object;)I" />
-		<method name="getSpans(IILjava/lang/Class&lt;T>;)[LT;" />
+		<method name="getSpans(IILjava/lang/Class;)[LT;" />
 		<method name="length()I" />
 		<method name="nextSpanTransition(IILjava/lang/Class;)I" />
 		<method name="toString()Ljava/lang/String;" />
@@ -20418,7 +20418,7 @@
 		<method name="getSpanEnd(Ljava/lang/Object;)I" />
 		<method name="getSpanFlags(Ljava/lang/Object;)I" />
 		<method name="getSpanStart(Ljava/lang/Object;)I" />
-		<method name="getSpans(IILjava/lang/Class&lt;T>;)[LT;" />
+		<method name="getSpans(IILjava/lang/Class;)[LT;" />
 		<method name="nextSpanTransition(IILjava/lang/Class;)I" />
 		<field name="SPAN_COMPOSING" since="3" />
 		<field name="SPAN_EXCLUSIVE_EXCLUSIVE" />
@@ -20528,7 +20528,7 @@
 		<implements name="android/text/TextUtils$StringSplitter" />
 		<method name="&lt;init>(C)V" />
 		<method name="hasNext()Z" />
-		<method name="iterator()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="next()Ljava/lang/String;" />
 		<method name="remove()V" />
 		<method name="setString(Ljava/lang/String;)V" />
@@ -20541,10 +20541,10 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/text/TextUtils$TruncateAt;" />
 		<method name="values()[Landroid/text/TextUtils$TruncateAt;" />
-		<field name="END" />
-		<field name="MARQUEE" since="2" />
-		<field name="MIDDLE" />
-		<field name="START" />
+		<field name="END" since="14" />
+		<field name="MARQUEE" since="14" />
+		<field name="MIDDLE" since="14" />
+		<field name="START" since="14" />
 	</class>
 	<class name="android/text/TextWatcher" since="1">
 		<implements name="android/text/NoCopySpan" since="3" />
@@ -20954,10 +20954,10 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/text/method/TextKeyListener$Capitalize;" />
 		<method name="values()[Landroid/text/method/TextKeyListener$Capitalize;" />
-		<field name="CHARACTERS" />
-		<field name="NONE" />
-		<field name="SENTENCES" />
-		<field name="WORDS" />
+		<field name="CHARACTERS" since="14" />
+		<field name="NONE" since="14" />
+		<field name="SENTENCES" since="14" />
+		<field name="WORDS" since="14" />
 	</class>
 	<class name="android/text/method/TimeKeyListener" since="1">
 		<extends name="android/text/method/NumberKeyListener" />
@@ -21257,7 +21257,7 @@
 	<class name="android/text/style/SuggestionSpan" since="14">
 		<extends name="android/text/style/CharacterStyle" />
 		<implements name="android/text/ParcelableSpan" />
-		<method name="&lt;init>(Landroid/content/Context;Ljava/util/Locale;[Ljava/lang/String;ILjava/lang/Class&lt;?>;)V" />
+		<method name="&lt;init>(Landroid/content/Context;Ljava/util/Locale;[Ljava/lang/String;ILjava/lang/Class;)V" />
 		<method name="&lt;init>(Landroid/content/Context;[Ljava/lang/String;I)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Ljava/util/Locale;[Ljava/lang/String;I)V" />
@@ -21405,7 +21405,7 @@
 		<method name="findTokenStart(Ljava/lang/CharSequence;I)I" />
 		<method name="terminateToken(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="tokenize(Ljava/lang/CharSequence;)[Landroid/text/util/Rfc822Token;" />
-		<method name="tokenize(Ljava/lang/CharSequence;Ljava/util/Collection&lt;android/text/util/Rfc822Token>;)V" since="8" />
+		<method name="tokenize(Ljava/lang/CharSequence;Ljava/util/Collection;)V" since="8" />
 	</class>
 	<class name="android/util/AndroidException" since="1">
 		<extends name="java/lang/Exception" />
@@ -21511,7 +21511,7 @@
 		<method name="&lt;init>()V" />
 		<method name="getTagCode(Ljava/lang/String;)I" />
 		<method name="getTagName(I)Ljava/lang/String;" />
-		<method name="readEvents([ILjava/util/Collection&lt;android/util/EventLog$Event>;)V" />
+		<method name="readEvents([ILjava/util/Collection;)V" />
 		<method name="writeEvent(II)I" />
 		<method name="writeEvent(IJ)I" />
 		<method name="writeEvent(ILjava/lang/String;)I" />
@@ -21571,16 +21571,16 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/util/JsonToken;" />
 		<method name="values()[Landroid/util/JsonToken;" />
-		<field name="BEGIN_ARRAY" />
-		<field name="BEGIN_OBJECT" />
-		<field name="BOOLEAN" />
-		<field name="END_ARRAY" />
-		<field name="END_DOCUMENT" />
-		<field name="END_OBJECT" />
-		<field name="NAME" />
-		<field name="NULL" />
-		<field name="NUMBER" />
-		<field name="STRING" />
+		<field name="BEGIN_ARRAY" since="14" />
+		<field name="BEGIN_OBJECT" since="14" />
+		<field name="BOOLEAN" since="14" />
+		<field name="END_ARRAY" since="14" />
+		<field name="END_DOCUMENT" since="14" />
+		<field name="END_OBJECT" since="14" />
+		<field name="NAME" since="14" />
+		<field name="NULL" since="14" />
+		<field name="NUMBER" since="14" />
+		<field name="STRING" since="14" />
 	</class>
 	<class name="android/util/JsonWriter" since="11">
 		<extends name="java/lang/Object" />
@@ -21652,7 +21652,7 @@
 		<method name="remove(LK;)LV;" />
 		<method name="size()I" />
 		<method name="sizeOf(LK;LV;)I" />
-		<method name="snapshot()Ljava/util/Map&lt;K, V>;" />
+		<method name="snapshot()Ljava/util/Map;" />
 		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="android/util/MalformedJsonException" since="11">
@@ -21684,7 +21684,7 @@
 	<class name="android/util/Pair" since="5">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(LF;LS;)V" />
-		<method name="create(LA;LB;)Landroid/util/Pair&lt;A, B>;" />
+		<method name="create(LA;LB;)Landroid/util/Pair;" />
 		<field name="first" />
 		<field name="second" />
 	</class>
@@ -21718,12 +21718,12 @@
 		<method name="println(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/util/Property" since="14">
-		<method name="&lt;init>(Ljava/lang/Class&lt;V>;Ljava/lang/String;)V" />
+		<method name="&lt;init>(Ljava/lang/Class;Ljava/lang/String;)V" />
 		<method name="get(LT;)LV;" />
 		<method name="getName()Ljava/lang/String;" />
-		<method name="getType()Ljava/lang/Class&lt;V>;" />
+		<method name="getType()Ljava/lang/Class;" />
 		<method name="isReadOnly()Z" />
-		<method name="of(Ljava/lang/Class&lt;T>;Ljava/lang/Class&lt;V>;Ljava/lang/String;)Landroid/util/Property&lt;T, V>;" />
+		<method name="of(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Landroid/util/Property;" />
 		<method name="set(LT;LV;)V" />
 	</class>
 	<class name="android/util/SparseArray" since="1">
@@ -21733,7 +21733,7 @@
 		<method name="&lt;init>(I)V" />
 		<method name="append(ILE;)V" />
 		<method name="clear()V" />
-		<method name="clone()Landroid/util/SparseArray&lt;E>;" since="14" />
+		<method name="clone()Landroid/util/SparseArray;" since="14" />
 		<method name="delete(I)V" />
 		<method name="get(I)LE;" />
 		<method name="get(ILE;)LE;" />
@@ -21896,10 +21896,10 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/util/Xml$Encoding;" />
 		<method name="values()[Landroid/util/Xml$Encoding;" />
-		<field name="ISO_8859_1" />
-		<field name="US_ASCII" />
-		<field name="UTF_16" />
-		<field name="UTF_8" />
+		<field name="ISO_8859_1" since="14" />
+		<field name="US_ASCII" since="14" />
+		<field name="UTF_16" since="14" />
+		<field name="UTF_8" since="14" />
 	</class>
 	<class name="android/view/AbsSavedState" since="1">
 		<extends name="java/lang/Object" />
@@ -22108,7 +22108,7 @@
 		<method name="getKeyboardType()I" />
 		<method name="getMotionRange(I)Landroid/view/InputDevice$MotionRange;" />
 		<method name="getMotionRange(II)Landroid/view/InputDevice$MotionRange;" since="12" />
-		<method name="getMotionRanges()Ljava/util/List&lt;android/view/InputDevice$MotionRange>;" since="12" />
+		<method name="getMotionRanges()Ljava/util/List;" since="12" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getSources()I" />
 		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
@@ -23091,11 +23091,11 @@
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V" />
-		<method name="addFocusables(Ljava/util/ArrayList&lt;android/view/View>;I)V" />
-		<method name="addFocusables(Ljava/util/ArrayList&lt;android/view/View>;II)V" since="4" />
+		<method name="addFocusables(Ljava/util/ArrayList;I)V" />
+		<method name="addFocusables(Ljava/util/ArrayList;II)V" since="4" />
 		<method name="addOnAttachStateChangeListener(Landroid/view/View$OnAttachStateChangeListener;)V" since="12" />
 		<method name="addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V" since="11" />
-		<method name="addTouchables(Ljava/util/ArrayList&lt;android/view/View>;)V" />
+		<method name="addTouchables(Ljava/util/ArrayList;)V" />
 		<method name="animate()Landroid/view/ViewPropertyAnimator;" since="12" />
 		<method name="awakenScrollBars()Z" since="5" />
 		<method name="awakenScrollBars(I)Z" since="5" />
@@ -23134,8 +23134,8 @@
 		<method name="dispatchKeyEventPreIme(Landroid/view/KeyEvent;)Z" since="3" />
 		<method name="dispatchKeyShortcutEvent(Landroid/view/KeyEvent;)Z" />
 		<method name="dispatchPopulateAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)Z" since="4" />
-		<method name="dispatchRestoreInstanceState(Landroid/util/SparseArray&lt;android/os/Parcelable>;)V" />
-		<method name="dispatchSaveInstanceState(Landroid/util/SparseArray&lt;android/os/Parcelable>;)V" />
+		<method name="dispatchRestoreInstanceState(Landroid/util/SparseArray;)V" />
+		<method name="dispatchSaveInstanceState(Landroid/util/SparseArray;)V" />
 		<method name="dispatchSetActivated(Z)V" since="11" />
 		<method name="dispatchSetPressed(Z)V" />
 		<method name="dispatchSetSelected(Z)V" />
@@ -23151,7 +23151,7 @@
 		<method name="findFocus()Landroid/view/View;" />
 		<method name="findViewById(I)Landroid/view/View;" />
 		<method name="findViewWithTag(Ljava/lang/Object;)Landroid/view/View;" />
-		<method name="findViewsWithText(Ljava/util/ArrayList&lt;android/view/View>;Ljava/lang/CharSequence;I)V" since="14" />
+		<method name="findViewsWithText(Ljava/util/ArrayList;Ljava/lang/CharSequence;I)V" since="14" />
 		<method name="fitSystemWindows(Landroid/graphics/Rect;)Z" />
 		<method name="fitsSystemWindows()Z" since="14" />
 		<method name="focusSearch(I)Landroid/view/View;" />
@@ -23176,7 +23176,7 @@
 		<method name="getDrawingRect(Landroid/graphics/Rect;)V" />
 		<method name="getDrawingTime()J" />
 		<method name="getFilterTouchesWhenObscured()Z" since="9" />
-		<method name="getFocusables(I)Ljava/util/ArrayList&lt;android/view/View>;" />
+		<method name="getFocusables(I)Ljava/util/ArrayList;" />
 		<method name="getFocusedRect(Landroid/graphics/Rect;)V" />
 		<method name="getGlobalVisibleRect(Landroid/graphics/Rect;)Z" />
 		<method name="getGlobalVisibleRect(Landroid/graphics/Rect;Landroid/graphics/Point;)Z" />
@@ -23239,7 +23239,7 @@
 		<method name="getTopFadingEdgeStrength()F" />
 		<method name="getTopPaddingOffset()I" since="2" />
 		<method name="getTouchDelegate()Landroid/view/TouchDelegate;" />
-		<method name="getTouchables()Ljava/util/ArrayList&lt;android/view/View>;" />
+		<method name="getTouchables()Ljava/util/ArrayList;" />
 		<method name="getTranslationX()F" since="11" />
 		<method name="getTranslationY()F" since="11" />
 		<method name="getVerticalFadingEdgeLength()I" />
@@ -23368,8 +23368,8 @@
 		<method name="requestRectangleOnScreen(Landroid/graphics/Rect;Z)Z" />
 		<method name="resolveSize(II)I" />
 		<method name="resolveSizeAndState(III)I" since="11" />
-		<method name="restoreHierarchyState(Landroid/util/SparseArray&lt;android/os/Parcelable>;)V" />
-		<method name="saveHierarchyState(Landroid/util/SparseArray&lt;android/os/Parcelable>;)V" />
+		<method name="restoreHierarchyState(Landroid/util/SparseArray;)V" />
+		<method name="saveHierarchyState(Landroid/util/SparseArray;)V" />
 		<method name="scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V" />
 		<method name="scrollBy(II)V" />
 		<method name="scrollTo(II)V" />
@@ -23692,14 +23692,14 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/view/ViewDebug$HierarchyTraceType;" />
 		<method name="values()[Landroid/view/ViewDebug$HierarchyTraceType;" />
-		<field name="BUILD_CACHE" />
-		<field name="DRAW" />
-		<field name="INVALIDATE" />
-		<field name="INVALIDATE_CHILD" />
-		<field name="INVALIDATE_CHILD_IN_PARENT" />
-		<field name="ON_LAYOUT" />
-		<field name="ON_MEASURE" />
-		<field name="REQUEST_LAYOUT" />
+		<field name="BUILD_CACHE" since="14" />
+		<field name="DRAW" since="14" />
+		<field name="INVALIDATE" since="14" />
+		<field name="INVALIDATE_CHILD" since="14" />
+		<field name="INVALIDATE_CHILD_IN_PARENT" since="14" />
+		<field name="ON_LAYOUT" since="14" />
+		<field name="ON_MEASURE" since="14" />
+		<field name="REQUEST_LAYOUT" since="14" />
 	</class>
 	<class name="android/view/ViewDebug$IntToString" since="1">
 		<extends name="java/lang/Object" />
@@ -23709,13 +23709,12 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/view/ViewDebug$RecyclerTraceType;" />
 		<method name="values()[Landroid/view/ViewDebug$RecyclerTraceType;" />
-		<field name="BIND_VIEW" />
-		<field name="MOVE_FROM_ACTIVE_TO_SCRAP_HEAP" />
-		<field name="MOVE_TO_ACTIVE_HEAP" />
-		<field name="MOVE_TO_SCRAP_HEAP" />
-		<field name="NEW_VIEW" />
-		<field name="RECYCLE_FROM_ACTIVE_HEAP" />
-		<field name="RECYCLE_FROM_SCRAP_HEAP" />
+		<field name="BIND_VIEW" since="14" />
+		<field name="MOVE_FROM_ACTIVE_TO_SCRAP_HEAP" since="14" />
+		<field name="MOVE_TO_SCRAP_HEAP" since="14" />
+		<field name="NEW_VIEW" since="14" />
+		<field name="RECYCLE_FROM_ACTIVE_HEAP" since="14" />
+		<field name="RECYCLE_FROM_SCRAP_HEAP" since="14" />
 	</class>
 	<class name="android/view/ViewGroup" since="1">
 		<extends name="android/view/View" />
@@ -23746,10 +23745,10 @@
 		<method name="detachViewFromParent(I)V" />
 		<method name="detachViewFromParent(Landroid/view/View;)V" />
 		<method name="detachViewsFromParent(II)V" />
-		<method name="dispatchFreezeSelfOnly(Landroid/util/SparseArray&lt;android/os/Parcelable>;)V" />
+		<method name="dispatchFreezeSelfOnly(Landroid/util/SparseArray;)V" />
 		<method name="dispatchSetActivated(Z)V" since="11" />
 		<method name="dispatchSetSelected(Z)V" />
-		<method name="dispatchThawSelfOnly(Landroid/util/SparseArray&lt;android/os/Parcelable>;)V" />
+		<method name="dispatchThawSelfOnly(Landroid/util/SparseArray;)V" />
 		<method name="drawChild(Landroid/graphics/Canvas;Landroid/view/View;J)Z" />
 		<method name="endViewTransition(Landroid/view/View;)V" since="11" />
 		<method name="focusSearch(Landroid/view/View;I)Landroid/view/View;" />
@@ -24253,7 +24252,7 @@
 		<method name="getRecord(I)Landroid/view/accessibility/AccessibilityRecord;" since="14" />
 		<method name="getRecordCount()I" since="14" />
 		<method name="getRemovedCount()I" />
-		<method name="getText()Ljava/util/List&lt;java/lang/CharSequence>;" />
+		<method name="getText()Ljava/util/List;" />
 		<method name="initFromParcel(Landroid/os/Parcel;)V" />
 		<method name="isChecked()Z" />
 		<method name="isEnabled()Z" />
@@ -24306,9 +24305,9 @@
 	<class name="android/view/accessibility/AccessibilityManager" since="4">
 		<extends name="java/lang/Object" />
 		<method name="addAccessibilityStateChangeListener(Landroid/view/accessibility/AccessibilityManager$AccessibilityStateChangeListener;)Z" since="14" />
-		<method name="getAccessibilityServiceList()Ljava/util/List&lt;android/content/pm/ServiceInfo>;" />
-		<method name="getEnabledAccessibilityServiceList(I)Ljava/util/List&lt;android/accessibilityservice/AccessibilityServiceInfo>;" since="14" />
-		<method name="getInstalledAccessibilityServiceList()Ljava/util/List&lt;android/accessibilityservice/AccessibilityServiceInfo>;" since="14" />
+		<method name="getAccessibilityServiceList()Ljava/util/List;" />
+		<method name="getEnabledAccessibilityServiceList(I)Ljava/util/List;" since="14" />
+		<method name="getInstalledAccessibilityServiceList()Ljava/util/List;" since="14" />
 		<method name="interrupt()V" />
 		<method name="isEnabled()Z" />
 		<method name="isTouchExplorationEnabled()Z" since="14" />
@@ -24323,7 +24322,7 @@
 		<method name="addAction(I)V" />
 		<method name="addChild(Landroid/view/View;)V" />
 		<method name="describeContents()I" />
-		<method name="findAccessibilityNodeInfosByText(Ljava/lang/String;)Ljava/util/List&lt;android/view/accessibility/AccessibilityNodeInfo>;" />
+		<method name="findAccessibilityNodeInfosByText(Ljava/lang/String;)Ljava/util/List;" />
 		<method name="getActions()I" />
 		<method name="getBoundsInParent(Landroid/graphics/Rect;)V" />
 		<method name="getBoundsInScreen(Landroid/graphics/Rect;)V" />
@@ -24390,7 +24389,7 @@
 		<method name="getScrollX()I" />
 		<method name="getScrollY()I" />
 		<method name="getSource()Landroid/view/accessibility/AccessibilityNodeInfo;" />
-		<method name="getText()Ljava/util/List&lt;java/lang/CharSequence>;" />
+		<method name="getText()Ljava/util/List;" />
 		<method name="getToIndex()I" />
 		<method name="getWindowId()I" />
 		<method name="isChecked()Z" />
@@ -24519,7 +24518,7 @@
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
 		<method name="&lt;init>(Z)V" />
 		<method name="addAnimation(Landroid/view/animation/Animation;)V" />
-		<method name="getAnimations()Ljava/util/List&lt;android/view/animation/Animation>;" />
+		<method name="getAnimations()Ljava/util/List;" />
 	</class>
 	<class name="android/view/animation/AnimationUtils" since="1">
 		<extends name="java/lang/Object" />
@@ -24930,11 +24929,11 @@
 		<extends name="java/lang/Object" />
 		<method name="displayCompletions(Landroid/view/View;[Landroid/view/inputmethod/CompletionInfo;)V" />
 		<method name="getCurrentInputMethodSubtype()Landroid/view/inputmethod/InputMethodSubtype;" since="11" />
-		<method name="getEnabledInputMethodList()Ljava/util/List&lt;android/view/inputmethod/InputMethodInfo>;" />
-		<method name="getEnabledInputMethodSubtypeList(Landroid/view/inputmethod/InputMethodInfo;Z)Ljava/util/List&lt;android/view/inputmethod/InputMethodSubtype>;" since="11" />
-		<method name="getInputMethodList()Ljava/util/List&lt;android/view/inputmethod/InputMethodInfo>;" />
+		<method name="getEnabledInputMethodList()Ljava/util/List;" />
+		<method name="getEnabledInputMethodSubtypeList(Landroid/view/inputmethod/InputMethodInfo;Z)Ljava/util/List;" since="11" />
+		<method name="getInputMethodList()Ljava/util/List;" />
 		<method name="getLastInputMethodSubtype()Landroid/view/inputmethod/InputMethodSubtype;" since="14" />
-		<method name="getShortcutInputMethodsAndSubtypes()Ljava/util/Map&lt;android/view/inputmethod/InputMethodInfo, java$util/List&lt;android/view/inputmethod/InputMethodSubtype>>;" since="11" />
+		<method name="getShortcutInputMethodsAndSubtypes()Ljava/util/Map;" since="11" />
 		<method name="hideSoftInputFromInputMethod(Landroid/os/IBinder;I)V" />
 		<method name="hideSoftInputFromWindow(Landroid/os/IBinder;I)Z" />
 		<method name="hideSoftInputFromWindow(Landroid/os/IBinder;ILandroid/os/ResultReceiver;)Z" />
@@ -25081,7 +25080,7 @@
 		<method name="&lt;init>()V" />
 		<method name="cacheDisabled()Z" />
 		<method name="endCacheTransaction()Z" />
-		<method name="getCacheFile(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)Landroid/webkit/CacheManager$CacheResult;" />
+		<method name="getCacheFile(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/CacheManager$CacheResult;" />
 		<method name="getCacheFileBaseDir()Ljava/io/File;" />
 		<method name="saveCacheFile(Ljava/lang/String;Landroid/webkit/CacheManager$CacheResult;)V" />
 		<method name="startCacheTransaction()Z" />
@@ -25113,7 +25112,7 @@
 		<method name="doUpdateVisitedHistory(Ljava/lang/String;Z)V" />
 		<method name="getBackForwardList()Landroid/webkit/WebBackForwardList;" />
 		<method name="getProgress()I" />
-		<method name="getVisitedHistory(Landroid/webkit/ValueCallback&lt;java/lang/String[]>;)V" since="7" />
+		<method name="getVisitedHistory(Landroid/webkit/ValueCallback;)V" since="7" />
 		<method name="getWebChromeClient()Landroid/webkit/WebChromeClient;" since="7" />
 		<method name="onCloseWindow(Landroid/webkit/WebView;)V" />
 		<method name="onDownloadStart(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;J)Z" />
@@ -25159,11 +25158,11 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/webkit/ConsoleMessage$MessageLevel;" />
 		<method name="values()[Landroid/webkit/ConsoleMessage$MessageLevel;" />
-		<field name="DEBUG" />
-		<field name="ERROR" />
-		<field name="LOG" />
-		<field name="TIP" />
-		<field name="WARNING" />
+		<field name="DEBUG" since="14" />
+		<field name="ERROR" since="14" />
+		<field name="LOG" since="14" />
+		<field name="TIP" since="14" />
+		<field name="WARNING" since="14" />
 	</class>
 	<class name="android/webkit/CookieManager" since="1">
 		<extends name="java/lang/Object" />
@@ -25202,9 +25201,9 @@
 		<method name="allow(Ljava/lang/String;)V" since="7" />
 		<method name="clear(Ljava/lang/String;)V" since="7" />
 		<method name="clearAll()V" since="7" />
-		<method name="getAllowed(Ljava/lang/String;Landroid/webkit/ValueCallback&lt;java/lang/Boolean>;)V" since="7" />
+		<method name="getAllowed(Ljava/lang/String;Landroid/webkit/ValueCallback;)V" since="7" />
 		<method name="getInstance()Landroid/webkit/GeolocationPermissions;" since="7" />
-		<method name="getOrigins(Landroid/webkit/ValueCallback&lt;java/util/Set&lt;java/lang/String>>;)V" since="7" />
+		<method name="getOrigins(Landroid/webkit/ValueCallback;)V" since="7" />
 	</class>
 	<class name="android/webkit/GeolocationPermissions$Callback" since="5">
 		<method name="invoke(Ljava/lang/String;ZZ)V" />
@@ -25255,9 +25254,9 @@
 	</class>
 	<class name="android/webkit/PluginData" since="3">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(Ljava/io/InputStream;JLjava/util/Map&lt;java/lang/String, java$lang/String[]>;I)V" />
+		<method name="&lt;init>(Ljava/io/InputStream;JLjava/util/Map;I)V" />
 		<method name="getContentLength()J" />
-		<method name="getHeaders()Ljava/util/Map&lt;java/lang/String, java$lang/String[]>;" />
+		<method name="getHeaders()Ljava/util/Map;" />
 		<method name="getInputStream()Ljava/io/InputStream;" />
 		<method name="getStatusCode()I" />
 	</class>
@@ -25300,14 +25299,14 @@
 		<method name="stripAnchor(Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="android/webkit/UrlInterceptHandler" since="1">
-		<method name="getPluginData(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)Landroid/webkit/PluginData;" since="3" />
-		<method name="service(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)Landroid/webkit/CacheManager$CacheResult;" />
+		<method name="getPluginData(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/PluginData;" since="3" />
+		<method name="service(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/CacheManager$CacheResult;" />
 	</class>
 	<class name="android/webkit/UrlInterceptRegistry" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="getPluginData(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)Landroid/webkit/PluginData;" since="3" />
-		<method name="getSurrogate(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)Landroid/webkit/CacheManager$CacheResult;" />
+		<method name="getPluginData(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/PluginData;" since="3" />
+		<method name="getSurrogate(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/CacheManager$CacheResult;" />
 		<method name="registerHandler(Landroid/webkit/UrlInterceptHandler;)Z" />
 		<method name="setUrlInterceptDisabled(Z)V" />
 		<method name="unregisterHandler(Landroid/webkit/UrlInterceptHandler;)Z" />
@@ -25330,7 +25329,7 @@
 		<method name="&lt;init>()V" />
 		<method name="getDefaultVideoPoster()Landroid/graphics/Bitmap;" since="7" />
 		<method name="getVideoLoadingProgressView()Landroid/view/View;" since="7" />
-		<method name="getVisitedHistory(Landroid/webkit/ValueCallback&lt;java/lang/String[]>;)V" since="7" />
+		<method name="getVisitedHistory(Landroid/webkit/ValueCallback;)V" since="7" />
 		<method name="onCloseWindow(Landroid/webkit/WebView;)V" />
 		<method name="onConsoleMessage(Landroid/webkit/ConsoleMessage;)Z" since="8" />
 		<method name="onConsoleMessage(Ljava/lang/String;ILjava/lang/String;)V" since="7" />
@@ -25495,43 +25494,43 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/webkit/WebSettings$LayoutAlgorithm;" />
 		<method name="values()[Landroid/webkit/WebSettings$LayoutAlgorithm;" />
-		<field name="NARROW_COLUMNS" />
-		<field name="NORMAL" />
-		<field name="SINGLE_COLUMN" />
+		<field name="NARROW_COLUMNS" since="14" />
+		<field name="NORMAL" since="14" />
+		<field name="SINGLE_COLUMN" since="14" />
 	</class>
 	<class name="android/webkit/WebSettings$PluginState" since="8">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/webkit/WebSettings$PluginState;" />
 		<method name="values()[Landroid/webkit/WebSettings$PluginState;" />
-		<field name="OFF" />
-		<field name="ON" />
-		<field name="ON_DEMAND" />
+		<field name="OFF" since="14" />
+		<field name="ON" since="14" />
+		<field name="ON_DEMAND" since="14" />
 	</class>
 	<class name="android/webkit/WebSettings$RenderPriority" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/webkit/WebSettings$RenderPriority;" />
 		<method name="values()[Landroid/webkit/WebSettings$RenderPriority;" />
-		<field name="HIGH" />
-		<field name="LOW" />
-		<field name="NORMAL" />
+		<field name="HIGH" since="14" />
+		<field name="LOW" since="14" />
+		<field name="NORMAL" since="14" />
 	</class>
 	<class name="android/webkit/WebSettings$TextSize" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/webkit/WebSettings$TextSize;" />
 		<method name="values()[Landroid/webkit/WebSettings$TextSize;" />
-		<field name="LARGER" />
-		<field name="LARGEST" />
-		<field name="NORMAL" />
-		<field name="SMALLER" />
-		<field name="SMALLEST" />
+		<field name="LARGER" since="14" />
+		<field name="LARGEST" since="14" />
+		<field name="NORMAL" since="14" />
+		<field name="SMALLER" since="14" />
+		<field name="SMALLEST" since="14" />
 	</class>
 	<class name="android/webkit/WebSettings$ZoomDensity" since="7">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/webkit/WebSettings$ZoomDensity;" />
 		<method name="values()[Landroid/webkit/WebSettings$ZoomDensity;" />
-		<field name="CLOSE" />
-		<field name="FAR" />
-		<field name="MEDIUM" />
+		<field name="CLOSE" since="14" />
+		<field name="FAR" since="14" />
+		<field name="MEDIUM" since="14" />
 	</class>
 	<class name="android/webkit/WebStorage" since="5">
 		<extends name="java/lang/Object" />
@@ -25539,9 +25538,9 @@
 		<method name="deleteAllData()V" since="7" />
 		<method name="deleteOrigin(Ljava/lang/String;)V" since="7" />
 		<method name="getInstance()Landroid/webkit/WebStorage;" since="7" />
-		<method name="getOrigins(Landroid/webkit/ValueCallback&lt;java/util/Map>;)V" since="7" />
-		<method name="getQuotaForOrigin(Ljava/lang/String;Landroid/webkit/ValueCallback&lt;java/lang/Long>;)V" since="7" />
-		<method name="getUsageForOrigin(Ljava/lang/String;Landroid/webkit/ValueCallback&lt;java/lang/Long>;)V" since="7" />
+		<method name="getOrigins(Landroid/webkit/ValueCallback;)V" since="7" />
+		<method name="getQuotaForOrigin(Ljava/lang/String;Landroid/webkit/ValueCallback;)V" since="7" />
+		<method name="getUsageForOrigin(Ljava/lang/String;Landroid/webkit/ValueCallback;)V" since="7" />
 		<method name="setQuotaForOrigin(Ljava/lang/String;J)V" since="7" />
 	</class>
 	<class name="android/webkit/WebStorage$Origin" since="11">
@@ -25622,7 +25621,7 @@
 		<method name="loadData(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="loadDataWithBaseURL(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="loadUrl(Ljava/lang/String;)V" />
-		<method name="loadUrl(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)V" since="8" />
+		<method name="loadUrl(Ljava/lang/String;Ljava/util/Map;)V" since="8" />
 		<method name="onChildViewAdded(Landroid/view/View;Landroid/view/View;)V" />
 		<method name="onChildViewRemoved(Landroid/view/View;Landroid/view/View;)V" />
 		<method name="onGlobalFocusChanged(Landroid/view/View;Landroid/view/View;)V" />
@@ -25646,7 +25645,7 @@
 		<method name="savePicture(Landroid/os/Bundle;Ljava/io/File;)Z" since="3" />
 		<method name="saveState(Landroid/os/Bundle;)Landroid/webkit/WebBackForwardList;" />
 		<method name="saveWebArchive(Ljava/lang/String;)V" since="11" />
-		<method name="saveWebArchive(Ljava/lang/String;ZLandroid/webkit/ValueCallback&lt;java/lang/String>;)V" since="11" />
+		<method name="saveWebArchive(Ljava/lang/String;ZLandroid/webkit/ValueCallback;)V" since="11" />
 		<method name="setCertificate(Landroid/net/http/SslCertificate;)V" />
 		<method name="setDownloadListener(Landroid/webkit/DownloadListener;)V" />
 		<method name="setHorizontalScrollbarOverlay(Z)V" />
@@ -25790,7 +25789,7 @@
 		<method name="onTouchModeChanged(Z)V" />
 		<method name="pointToPosition(II)I" />
 		<method name="pointToRowId(II)J" />
-		<method name="reclaimViews(Ljava/util/List&lt;android/view/View>;)V" />
+		<method name="reclaimViews(Ljava/util/List;)V" />
 		<method name="setAdapter(Landroid/widget/ListAdapter;)V" since="11" />
 		<method name="setCacheColorHint(I)V" />
 		<method name="setChoiceMode(I)V" since="11" />
@@ -25948,14 +25947,14 @@
 		<field name="targetView" />
 	</class>
 	<class name="android/widget/AdapterView$OnItemClickListener" since="1">
-		<method name="onItemClick(Landroid/widget/AdapterView&lt;?>;Landroid/view/View;IJ)V" />
+		<method name="onItemClick(Landroid/widget/AdapterView;Landroid/view/View;IJ)V" />
 	</class>
 	<class name="android/widget/AdapterView$OnItemLongClickListener" since="1">
-		<method name="onItemLongClick(Landroid/widget/AdapterView&lt;?>;Landroid/view/View;IJ)Z" />
+		<method name="onItemLongClick(Landroid/widget/AdapterView;Landroid/view/View;IJ)Z" />
 	</class>
 	<class name="android/widget/AdapterView$OnItemSelectedListener" since="1">
-		<method name="onItemSelected(Landroid/widget/AdapterView&lt;?>;Landroid/view/View;IJ)V" />
-		<method name="onNothingSelected(Landroid/widget/AdapterView&lt;?>;)V" />
+		<method name="onItemSelected(Landroid/widget/AdapterView;Landroid/view/View;IJ)V" />
+		<method name="onNothingSelected(Landroid/widget/AdapterView;)V" />
 	</class>
 	<class name="android/widget/AdapterViewAnimator" since="11">
 		<extends name="android/widget/AdapterView" />
@@ -26022,15 +26021,15 @@
 		<implements name="android/widget/Filterable" />
 		<method name="&lt;init>(Landroid/content/Context;I)V" />
 		<method name="&lt;init>(Landroid/content/Context;II)V" />
-		<method name="&lt;init>(Landroid/content/Context;IILjava/util/List&lt;T>;)V" />
+		<method name="&lt;init>(Landroid/content/Context;IILjava/util/List;)V" />
 		<method name="&lt;init>(Landroid/content/Context;II[LT;)V" />
-		<method name="&lt;init>(Landroid/content/Context;ILjava/util/List&lt;T>;)V" />
+		<method name="&lt;init>(Landroid/content/Context;ILjava/util/List;)V" />
 		<method name="&lt;init>(Landroid/content/Context;I[LT;)V" />
 		<method name="add(LT;)V" />
-		<method name="addAll(Ljava/util/Collection&lt;? extends T>;)V" since="11" />
+		<method name="addAll(Ljava/util/Collection;)V" since="11" />
 		<method name="addAll([LT;)V" since="11" />
 		<method name="clear()V" />
-		<method name="createFromResource(Landroid/content/Context;II)Landroid/widget/ArrayAdapter&lt;java/lang/CharSequence>;" />
+		<method name="createFromResource(Landroid/content/Context;II)Landroid/widget/ArrayAdapter;" />
 		<method name="getContext()Landroid/content/Context;" />
 		<method name="getCount()I" />
 		<method name="getFilter()Landroid/widget/Filter;" />
@@ -26042,7 +26041,7 @@
 		<method name="remove(LT;)V" />
 		<method name="setDropDownViewResource(I)V" />
 		<method name="setNotifyOnChange(Z)V" />
-		<method name="sort(Ljava/util/Comparator&lt;? super T>;)V" since="3" />
+		<method name="sort(Ljava/util/Comparator;)V" since="3" />
 	</class>
 	<class name="android/widget/AutoCompleteTextView" since="1">
 		<extends name="android/widget/EditText" />
@@ -26571,7 +26570,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/widget/Filterable" />
 		<implements name="android/widget/WrapperListAdapter" />
-		<method name="&lt;init>(Ljava/util/ArrayList&lt;android/widget/ListView$FixedViewInfo>;Ljava/util/ArrayList&lt;android/widget/ListView$FixedViewInfo>;Landroid/widget/ListAdapter;)V" />
+		<method name="&lt;init>(Ljava/util/ArrayList;Ljava/util/ArrayList;Landroid/widget/ListAdapter;)V" />
 		<method name="areAllItemsEnabled()Z" />
 		<method name="getCount()I" />
 		<method name="getFilter()Landroid/widget/Filter;" />
@@ -26664,14 +26663,14 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/widget/ImageView$ScaleType;" />
 		<method name="values()[Landroid/widget/ImageView$ScaleType;" />
-		<field name="CENTER" />
-		<field name="CENTER_CROP" />
-		<field name="CENTER_INSIDE" />
-		<field name="FIT_CENTER" />
-		<field name="FIT_END" />
-		<field name="FIT_START" />
-		<field name="FIT_XY" />
-		<field name="MATRIX" />
+		<field name="CENTER" since="14" />
+		<field name="CENTER_CROP" since="14" />
+		<field name="CENTER_INSIDE" since="14" />
+		<field name="FIT_CENTER" since="14" />
+		<field name="FIT_END" since="14" />
+		<field name="FIT_START" since="14" />
+		<field name="FIT_XY" since="14" />
+		<field name="MATRIX" since="14" />
 	</class>
 	<class name="android/widget/LinearLayout" since="1">
 		<extends name="android/view/ViewGroup" />
@@ -27354,7 +27353,7 @@
 	<class name="android/widget/SimpleAdapter" since="1">
 		<extends name="android/widget/BaseAdapter" />
 		<implements name="android/widget/Filterable" />
-		<method name="&lt;init>(Landroid/content/Context;Ljava/util/List&lt;? extends java/util/Map&lt;java/lang/String, ?>>;I[Ljava/lang/String;[I)V" />
+		<method name="&lt;init>(Landroid/content/Context;Ljava/util/List;I[Ljava/lang/String;[I)V" />
 		<method name="getCount()I" />
 		<method name="getFilter()Landroid/widget/Filter;" />
 		<method name="getItem(I)Ljava/lang/Object;" />
@@ -27408,9 +27407,9 @@
 	</class>
 	<class name="android/widget/SimpleExpandableListAdapter" since="1">
 		<extends name="android/widget/BaseExpandableListAdapter" />
-		<method name="&lt;init>(Landroid/content/Context;Ljava/util/List&lt;? extends java/util/Map&lt;java/lang/String, ?>>;II[Ljava/lang/String;[ILjava/util/List&lt;? extends java/util/List&lt;? extends java/util/Map&lt;java/lang/String, ?>>>;II[Ljava/lang/String;[I)V" />
-		<method name="&lt;init>(Landroid/content/Context;Ljava/util/List&lt;? extends java/util/Map&lt;java/lang/String, ?>>;II[Ljava/lang/String;[ILjava/util/List&lt;? extends java/util/List&lt;? extends java/util/Map&lt;java/lang/String, ?>>>;I[Ljava/lang/String;[I)V" />
-		<method name="&lt;init>(Landroid/content/Context;Ljava/util/List&lt;? extends java/util/Map&lt;java/lang/String, ?>>;I[Ljava/lang/String;[ILjava/util/List&lt;? extends java/util/List&lt;? extends java/util/Map&lt;java/lang/String, ?>>>;I[Ljava/lang/String;[I)V" />
+		<method name="&lt;init>(Landroid/content/Context;Ljava/util/List;II[Ljava/lang/String;[ILjava/util/List;II[Ljava/lang/String;[I)V" />
+		<method name="&lt;init>(Landroid/content/Context;Ljava/util/List;II[Ljava/lang/String;[ILjava/util/List;I[Ljava/lang/String;[I)V" />
+		<method name="&lt;init>(Landroid/content/Context;Ljava/util/List;I[Ljava/lang/String;[ILjava/util/List;I[Ljava/lang/String;[I)V" />
 		<method name="getChild(II)Ljava/lang/Object;" />
 		<method name="getChildId(II)J" />
 		<method name="getChildView(IIZLandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
@@ -27783,9 +27782,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Landroid/widget/TextView$BufferType;" />
 		<method name="values()[Landroid/widget/TextView$BufferType;" />
-		<field name="EDITABLE" />
-		<field name="NORMAL" />
-		<field name="SPANNABLE" />
+		<field name="EDITABLE" since="14" />
+		<field name="NORMAL" since="14" />
+		<field name="SPANNABLE" since="14" />
 	</class>
 	<class name="android/widget/TextView$OnEditorActionListener" since="3">
 		<method name="onEditorAction(Landroid/widget/TextView;ILandroid/view/KeyEvent;)Z" />
@@ -27966,12 +27965,6 @@
 	<class name="com/android/internal/util/Predicate" since="1">
 		<method name="apply(LT;)Z" />
 	</class>
-	<class name="com/google/android/maps/MapView$ReticleDrawMode" since="1">
-		<extends name="java/lang/Enum" />
-		<field name="DRAW_RETICLE_NEVER" />
-		<field name="DRAW_RETICLE_OVER" />
-		<field name="DRAW_RETICLE_UNDER" />
-	</class>
 	<class name="dalvik/annotation/TestTarget" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
@@ -28309,7 +28302,7 @@
 		<method name="&lt;init>(Ljava/io/File;)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="close()V" />
-		<method name="entries()Ljava/util/Enumeration&lt;java/lang/String>;" />
+		<method name="entries()Ljava/util/Enumeration;" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="isDexOptNeeded(Ljava/lang/String;)Z" />
 		<method name="loadClass(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class;" />
@@ -28410,7 +28403,7 @@
 		<method name="&lt;init>()V" />
 		<method name="getCallingClassLoader()Ljava/lang/ClassLoader;" />
 		<method name="getCallingClassLoader2()Ljava/lang/ClassLoader;" />
-		<method name="getClasses(IZ)[Ljava/lang/Class&lt;?>;" />
+		<method name="getClasses(IZ)[Ljava/lang/Class;" />
 		<method name="getThreadStackTrace(Ljava/lang/Thread;)[Ljava/lang/StackTraceElement;" />
 	</class>
 	<class name="dalvik/system/Zygote" since="1">
@@ -29019,9 +29012,9 @@
 		<method name="readUnsignedByte()I" />
 		<method name="readUnsignedShort()I" />
 		<method name="registerValidation(Ljava/io/ObjectInputValidation;I)V" />
-		<method name="resolveClass(Ljava/io/ObjectStreamClass;)Ljava/lang/Class&lt;?>;" />
+		<method name="resolveClass(Ljava/io/ObjectStreamClass;)Ljava/lang/Class;" />
 		<method name="resolveObject(Ljava/lang/Object;)Ljava/lang/Object;" />
-		<method name="resolveProxyClass([Ljava/lang/String;)Ljava/lang/Class&lt;?>;" />
+		<method name="resolveProxyClass([Ljava/lang/String;)Ljava/lang/Class;" />
 		<method name="skipBytes(I)I" />
 	</class>
 	<class name="java/io/ObjectInputStream$GetField" since="1">
@@ -29057,8 +29050,8 @@
 		<implements name="java/io/ObjectStreamConstants" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/io/OutputStream;)V" />
-		<method name="annotateClass(Ljava/lang/Class&lt;?>;)V" />
-		<method name="annotateProxyClass(Ljava/lang/Class&lt;?>;)V" />
+		<method name="annotateClass(Ljava/lang/Class;)V" />
+		<method name="annotateProxyClass(Ljava/lang/Class;)V" />
 		<method name="defaultWriteObject()V" />
 		<method name="drain()V" />
 		<method name="enableReplaceObject(Z)Z" />
@@ -29102,13 +29095,13 @@
 	<class name="java/io/ObjectStreamClass" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
-		<method name="forClass()Ljava/lang/Class&lt;?>;" />
+		<method name="forClass()Ljava/lang/Class;" />
 		<method name="getField(Ljava/lang/String;)Ljava/io/ObjectStreamField;" />
 		<method name="getFields()[Ljava/io/ObjectStreamField;" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getSerialVersionUID()J" />
-		<method name="lookup(Ljava/lang/Class&lt;?>;)Ljava/io/ObjectStreamClass;" />
-		<method name="lookupAny(Ljava/lang/Class&lt;?>;)Ljava/io/ObjectStreamClass;" since="9" />
+		<method name="lookup(Ljava/lang/Class;)Ljava/io/ObjectStreamClass;" />
+		<method name="lookupAny(Ljava/lang/Class;)Ljava/io/ObjectStreamClass;" since="9" />
 		<field name="NO_FIELDS" />
 	</class>
 	<class name="java/io/ObjectStreamConstants" since="1">
@@ -29150,12 +29143,12 @@
 	<class name="java/io/ObjectStreamField" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Comparable" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class&lt;?>;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class&lt;?>;Z)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;Z)V" />
 		<method name="compareTo(Ljava/lang/Object;)I" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getOffset()I" />
-		<method name="getType()Ljava/lang/Class&lt;?>;" />
+		<method name="getType()Ljava/lang/Class;" />
 		<method name="getTypeCode()C" />
 		<method name="getTypeString()Ljava/lang/String;" />
 		<method name="isPrimitive()Z" />
@@ -29397,7 +29390,7 @@
 	<class name="java/io/SequenceInputStream" since="1">
 		<extends name="java/io/InputStream" />
 		<method name="&lt;init>(Ljava/io/InputStream;Ljava/io/InputStream;)V" />
-		<method name="&lt;init>(Ljava/util/Enumeration&lt;? extends java/io/InputStream>;)V" />
+		<method name="&lt;init>(Ljava/util/Enumeration;)V" />
 		<method name="read()I" />
 	</class>
 	<class name="java/io/Serializable" since="1">
@@ -29894,49 +29887,38 @@
 		<implements name="java/lang/reflect/GenericDeclaration" />
 		<implements name="java/io/Serializable" />
 		<implements name="java/lang/reflect/Type" />
-		<method name="asSubclass(Ljava/lang/Class&lt;U>;)Ljava/lang/Class&lt;? extends U>;" />
+		<method name="asSubclass(Ljava/lang/Class;)Ljava/lang/Class;" />
 		<method name="cast(Ljava/lang/Object;)LT;" />
 		<method name="desiredAssertionStatus()Z" />
-		<method name="forName(Ljava/lang/String;)Ljava/lang/Class&lt;?>;" />
-		<method name="forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class&lt;?>;" />
-		<method name="getAnnotation(Ljava/lang/Class&lt;A>;)LA;" />
+		<method name="forName(Ljava/lang/String;)Ljava/lang/Class;" />
+		<method name="forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;" />
+		<method name="getAnnotation(Ljava/lang/Class;)LA;" />
 		<method name="getAnnotations()[Ljava/lang/annotation/Annotation;" />
 		<method name="getCanonicalName()Ljava/lang/String;" />
 		<method name="getClassLoader()Ljava/lang/ClassLoader;" />
-		<method name="getClasses()[Ljava/lang/Class;" since="3" />
-		<method name="getClasses()[Ljava/lang/Class&lt;?>;" />
-		<method name="getComponentType()Ljava/lang/Class&lt;?>;" />
-		<method name="getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor&lt;T>;" />
-		<method name="getConstructor([Ljava/lang/Class&lt;?>;)Ljava/lang/reflect/Constructor&lt;T>;" since="9" />
-		<method name="getConstructors()[Ljava/lang/reflect/Constructor;" since="3" />
-		<method name="getConstructors()[Ljava/lang/reflect/Constructor&lt;?>;" since="9" />
-		<method name="getConstructors()[Ljava/lang/reflect/Constructor&lt;T>;" />
+		<method name="getClasses()[Ljava/lang/Class;" />
+		<method name="getComponentType()Ljava/lang/Class;" />
+		<method name="getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;" />
+		<method name="getConstructors()[Ljava/lang/reflect/Constructor;" />
 		<method name="getDeclaredAnnotations()[Ljava/lang/annotation/Annotation;" />
-		<method name="getDeclaredClasses()[Ljava/lang/Class;" since="3" />
-		<method name="getDeclaredClasses()[Ljava/lang/Class&lt;?>;" />
-		<method name="getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor&lt;T>;" />
-		<method name="getDeclaredConstructor([Ljava/lang/Class&lt;?>;)Ljava/lang/reflect/Constructor&lt;T>;" since="9" />
-		<method name="getDeclaredConstructors()[Ljava/lang/reflect/Constructor;" since="3" />
-		<method name="getDeclaredConstructors()[Ljava/lang/reflect/Constructor&lt;?>;" since="9" />
-		<method name="getDeclaredConstructors()[Ljava/lang/reflect/Constructor&lt;T>;" />
+		<method name="getDeclaredClasses()[Ljava/lang/Class;" />
+		<method name="getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;" />
+		<method name="getDeclaredConstructors()[Ljava/lang/reflect/Constructor;" />
 		<method name="getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;" />
 		<method name="getDeclaredFields()[Ljava/lang/reflect/Field;" />
 		<method name="getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;" />
-		<method name="getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class&lt;?>;)Ljava/lang/reflect/Method;" since="9" />
 		<method name="getDeclaredMethods()[Ljava/lang/reflect/Method;" />
-		<method name="getDeclaringClass()Ljava/lang/Class&lt;?>;" />
-		<method name="getEnclosingClass()Ljava/lang/Class&lt;?>;" />
-		<method name="getEnclosingConstructor()Ljava/lang/reflect/Constructor&lt;?>;" />
+		<method name="getDeclaringClass()Ljava/lang/Class;" />
+		<method name="getEnclosingClass()Ljava/lang/Class;" />
+		<method name="getEnclosingConstructor()Ljava/lang/reflect/Constructor;" />
 		<method name="getEnclosingMethod()Ljava/lang/reflect/Method;" />
 		<method name="getEnumConstants()[LT;" />
 		<method name="getField(Ljava/lang/String;)Ljava/lang/reflect/Field;" />
 		<method name="getFields()[Ljava/lang/reflect/Field;" />
 		<method name="getGenericInterfaces()[Ljava/lang/reflect/Type;" />
 		<method name="getGenericSuperclass()Ljava/lang/reflect/Type;" />
-		<method name="getInterfaces()[Ljava/lang/Class;" since="3" />
-		<method name="getInterfaces()[Ljava/lang/Class&lt;?>;" />
+		<method name="getInterfaces()[Ljava/lang/Class;" />
 		<method name="getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;" />
-		<method name="getMethod(Ljava/lang/String;[Ljava/lang/Class&lt;?>;)Ljava/lang/reflect/Method;" since="9" />
 		<method name="getMethods()[Ljava/lang/reflect/Method;" />
 		<method name="getModifiers()I" />
 		<method name="getName()Ljava/lang/String;" />
@@ -29946,13 +29928,13 @@
 		<method name="getResourceAsStream(Ljava/lang/String;)Ljava/io/InputStream;" />
 		<method name="getSigners()[Ljava/lang/Object;" />
 		<method name="getSimpleName()Ljava/lang/String;" />
-		<method name="getSuperclass()Ljava/lang/Class&lt;? super T>;" />
-		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable&lt;java/lang/Class&lt;T>>;" />
+		<method name="getSuperclass()Ljava/lang/Class;" />
+		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable;" />
 		<method name="isAnnotation()Z" />
-		<method name="isAnnotationPresent(Ljava/lang/Class&lt;? extends java/lang/annotation/Annotation>;)Z" />
+		<method name="isAnnotationPresent(Ljava/lang/Class;)Z" />
 		<method name="isAnonymousClass()Z" />
 		<method name="isArray()Z" />
-		<method name="isAssignableFrom(Ljava/lang/Class&lt;?>;)Z" />
+		<method name="isAssignableFrom(Ljava/lang/Class;)Z" />
 		<method name="isEnum()Z" />
 		<method name="isInstance(Ljava/lang/Object;)Z" />
 		<method name="isInterface()Z" />
@@ -29982,34 +29964,34 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/ClassLoader;)V" />
 		<method name="clearAssertionStatus()V" />
-		<method name="defineClass(Ljava/lang/String;Ljava/nio/ByteBuffer;Ljava/security/ProtectionDomain;)Ljava/lang/Class&lt;?>;" />
-		<method name="defineClass(Ljava/lang/String;[BII)Ljava/lang/Class&lt;?>;" />
-		<method name="defineClass(Ljava/lang/String;[BIILjava/security/ProtectionDomain;)Ljava/lang/Class&lt;?>;" />
-		<method name="defineClass([BII)Ljava/lang/Class&lt;?>;" />
+		<method name="defineClass(Ljava/lang/String;Ljava/nio/ByteBuffer;Ljava/security/ProtectionDomain;)Ljava/lang/Class;" />
+		<method name="defineClass(Ljava/lang/String;[BII)Ljava/lang/Class;" />
+		<method name="defineClass(Ljava/lang/String;[BIILjava/security/ProtectionDomain;)Ljava/lang/Class;" />
+		<method name="defineClass([BII)Ljava/lang/Class;" />
 		<method name="definePackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/URL;)Ljava/lang/Package;" />
-		<method name="findClass(Ljava/lang/String;)Ljava/lang/Class&lt;?>;" />
+		<method name="findClass(Ljava/lang/String;)Ljava/lang/Class;" />
 		<method name="findLibrary(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="findLoadedClass(Ljava/lang/String;)Ljava/lang/Class&lt;?>;" />
+		<method name="findLoadedClass(Ljava/lang/String;)Ljava/lang/Class;" />
 		<method name="findResource(Ljava/lang/String;)Ljava/net/URL;" />
-		<method name="findResources(Ljava/lang/String;)Ljava/util/Enumeration&lt;java/net/URL>;" />
-		<method name="findSystemClass(Ljava/lang/String;)Ljava/lang/Class&lt;?>;" />
+		<method name="findResources(Ljava/lang/String;)Ljava/util/Enumeration;" />
+		<method name="findSystemClass(Ljava/lang/String;)Ljava/lang/Class;" />
 		<method name="getPackage(Ljava/lang/String;)Ljava/lang/Package;" />
 		<method name="getPackages()[Ljava/lang/Package;" />
 		<method name="getParent()Ljava/lang/ClassLoader;" />
 		<method name="getResource(Ljava/lang/String;)Ljava/net/URL;" />
 		<method name="getResourceAsStream(Ljava/lang/String;)Ljava/io/InputStream;" />
-		<method name="getResources(Ljava/lang/String;)Ljava/util/Enumeration&lt;java/net/URL>;" />
+		<method name="getResources(Ljava/lang/String;)Ljava/util/Enumeration;" />
 		<method name="getSystemClassLoader()Ljava/lang/ClassLoader;" />
 		<method name="getSystemResource(Ljava/lang/String;)Ljava/net/URL;" />
 		<method name="getSystemResourceAsStream(Ljava/lang/String;)Ljava/io/InputStream;" />
-		<method name="getSystemResources(Ljava/lang/String;)Ljava/util/Enumeration&lt;java/net/URL>;" />
-		<method name="loadClass(Ljava/lang/String;)Ljava/lang/Class&lt;?>;" />
-		<method name="loadClass(Ljava/lang/String;Z)Ljava/lang/Class&lt;?>;" />
-		<method name="resolveClass(Ljava/lang/Class&lt;?>;)V" />
+		<method name="getSystemResources(Ljava/lang/String;)Ljava/util/Enumeration;" />
+		<method name="loadClass(Ljava/lang/String;)Ljava/lang/Class;" />
+		<method name="loadClass(Ljava/lang/String;Z)Ljava/lang/Class;" />
+		<method name="resolveClass(Ljava/lang/Class;)V" />
 		<method name="setClassAssertionStatus(Ljava/lang/String;Z)V" />
 		<method name="setDefaultAssertionStatus(Z)V" />
 		<method name="setPackageAssertionStatus(Ljava/lang/String;Z)V" />
-		<method name="setSigners(Ljava/lang/Class&lt;?>;[Ljava/lang/Object;)V" />
+		<method name="setSigners(Ljava/lang/Class;[Ljava/lang/Object;)V" />
 	</class>
 	<class name="java/lang/ClassNotFoundException" since="1">
 		<extends name="java/lang/Exception" />
@@ -30031,7 +30013,7 @@
 	<class name="java/lang/Compiler" since="1">
 		<extends name="java/lang/Object" />
 		<method name="command(Ljava/lang/Object;)Ljava/lang/Object;" />
-		<method name="compileClass(Ljava/lang/Class&lt;?>;)Z" />
+		<method name="compileClass(Ljava/lang/Class;)Z" />
 		<method name="compileClasses(Ljava/lang/String;)Z" />
 		<method name="disable()V" />
 		<method name="enable()V" />
@@ -30083,17 +30065,17 @@
 		<method name="compareTo(LE;)I" />
 		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="finalize()V" since="9" />
-		<method name="getDeclaringClass()Ljava/lang/Class&lt;E>;" />
+		<method name="getDeclaringClass()Ljava/lang/Class;" />
 		<method name="hashCode()I" />
 		<method name="name()Ljava/lang/String;" />
 		<method name="ordinal()I" />
-		<method name="valueOf(Ljava/lang/Class&lt;T>;Ljava/lang/String;)LT;" />
+		<method name="valueOf(Ljava/lang/Class;Ljava/lang/String;)LT;" />
 	</class>
 	<class name="java/lang/EnumConstantNotPresentException" since="1">
 		<extends name="java/lang/RuntimeException" />
-		<method name="&lt;init>(Ljava/lang/Class&lt;? extends java/lang/Enum>;Ljava/lang/String;)V" />
+		<method name="&lt;init>(Ljava/lang/Class;Ljava/lang/String;)V" />
 		<method name="constantName()Ljava/lang/String;" />
-		<method name="enumType()Ljava/lang/Class&lt;? extends java/lang/Enum>;" />
+		<method name="enumType()Ljava/lang/Class;" />
 	</class>
 	<class name="java/lang/Error" since="1">
 		<extends name="java/lang/Throwable" />
@@ -30260,7 +30242,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/lang/Iterable" since="1">
-		<method name="iterator()Ljava/util/Iterator&lt;T>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 	</class>
 	<class name="java/lang/LinkageError" since="1">
 		<extends name="java/lang/Error" />
@@ -30421,8 +30403,7 @@
 		<method name="clone()Ljava/lang/Object;" />
 		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="finalize()V" />
-		<method name="getClass()Ljava/lang/Class&lt;? extends java/lang/Object>;" />
-		<method name="getClass()Ljava/lang/Class&lt;?>;" since="11" />
+		<method name="getClass()Ljava/lang/Class;" />
 		<method name="hashCode()I" />
 		<method name="notify()V" />
 		<method name="notifyAll()V" />
@@ -30443,8 +30424,8 @@
 	<class name="java/lang/Package" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/reflect/AnnotatedElement" />
-		<method name="getAnnotation(Ljava/lang/Class&lt;A>;)LA;" since="9" />
-		<method name="getAnnotation(Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="getAnnotation(Ljava/lang/Class;)LA;" since="9" />
+		<method name="getAnnotation(Ljava/lang/Class;)LT;" />
 		<method name="getAnnotations()[Ljava/lang/annotation/Annotation;" />
 		<method name="getDeclaredAnnotations()[Ljava/lang/annotation/Annotation;" />
 		<method name="getImplementationTitle()Ljava/lang/String;" />
@@ -30456,7 +30437,7 @@
 		<method name="getSpecificationTitle()Ljava/lang/String;" />
 		<method name="getSpecificationVendor()Ljava/lang/String;" />
 		<method name="getSpecificationVersion()Ljava/lang/String;" />
-		<method name="isAnnotationPresent(Ljava/lang/Class&lt;? extends java/lang/annotation/Annotation>;)Z" />
+		<method name="isAnnotationPresent(Ljava/lang/Class;)Z" />
 		<method name="isCompatibleWith(Ljava/lang/String;)Z" />
 		<method name="isSealed()Z" />
 		<method name="isSealed(Ljava/net/URL;)Z" />
@@ -30473,14 +30454,14 @@
 	</class>
 	<class name="java/lang/ProcessBuilder" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(Ljava/util/List&lt;java/lang/String>;)V" />
+		<method name="&lt;init>(Ljava/util/List;)V" />
 		<method name="&lt;init>([Ljava/lang/String;)V" />
-		<method name="command()Ljava/util/List&lt;java/lang/String>;" />
-		<method name="command(Ljava/util/List&lt;java/lang/String>;)Ljava/lang/ProcessBuilder;" />
+		<method name="command()Ljava/util/List;" />
+		<method name="command(Ljava/util/List;)Ljava/lang/ProcessBuilder;" />
 		<method name="command([Ljava/lang/String;)Ljava/lang/ProcessBuilder;" />
 		<method name="directory()Ljava/io/File;" />
 		<method name="directory(Ljava/io/File;)Ljava/lang/ProcessBuilder;" />
-		<method name="environment()Ljava/util/Map&lt;java/lang/String, java$lang/String>;" />
+		<method name="environment()Ljava/util/Map;" />
 		<method name="redirectErrorStream()Z" />
 		<method name="redirectErrorStream(Z)Ljava/lang/ProcessBuilder;" />
 		<method name="start()Ljava/lang/Process;" />
@@ -30552,7 +30533,7 @@
 		<method name="checkExit(I)V" />
 		<method name="checkLink(Ljava/lang/String;)V" />
 		<method name="checkListen(I)V" />
-		<method name="checkMemberAccess(Ljava/lang/Class&lt;?>;I)V" />
+		<method name="checkMemberAccess(Ljava/lang/Class;I)V" />
 		<method name="checkMulticast(Ljava/net/InetAddress;)V" />
 		<method name="checkMulticast(Ljava/net/InetAddress;B)V" />
 		<method name="checkPackageAccess(Ljava/lang/String;)V" />
@@ -30574,7 +30555,7 @@
 		<method name="classDepth(Ljava/lang/String;)I" />
 		<method name="classLoaderDepth()I" />
 		<method name="currentClassLoader()Ljava/lang/ClassLoader;" />
-		<method name="currentLoadedClass()Ljava/lang/Class&lt;?>;" />
+		<method name="currentLoadedClass()Ljava/lang/Class;" />
 		<method name="getClassContext()[Ljava/lang/Class;" />
 		<method name="getInCheck()Z" />
 		<method name="getSecurityContext()Ljava/lang/Object;" />
@@ -30866,7 +30847,7 @@
 		<method name="getProperty(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getSecurityManager()Ljava/lang/SecurityManager;" />
-		<method name="getenv()Ljava/util/Map&lt;java/lang/String, java$lang/String>;" />
+		<method name="getenv()Ljava/util/Map;" />
 		<method name="getenv(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="identityHashCode(Ljava/lang/Object;)I" />
 		<method name="inheritedChannel()Ljava/nio/channels/Channel;" />
@@ -30904,7 +30885,7 @@
 		<method name="destroy()V" />
 		<method name="dumpStack()V" />
 		<method name="enumerate([Ljava/lang/Thread;)I" />
-		<method name="getAllStackTraces()Ljava/util/Map&lt;java/lang/Thread, java$lang/StackTraceElement[]>;" />
+		<method name="getAllStackTraces()Ljava/util/Map;" />
 		<method name="getContextClassLoader()Ljava/lang/ClassLoader;" />
 		<method name="getDefaultUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;" />
 		<method name="getId()J" />
@@ -30946,12 +30927,12 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/lang/Thread$State;" />
 		<method name="values()[Ljava/lang/Thread$State;" />
-		<field name="BLOCKED" />
-		<field name="NEW" />
-		<field name="RUNNABLE" />
-		<field name="TERMINATED" />
-		<field name="TIMED_WAITING" />
-		<field name="WAITING" />
+		<field name="BLOCKED" since="14" />
+		<field name="NEW" since="14" />
+		<field name="RUNNABLE" since="14" />
+		<field name="TERMINATED" since="14" />
+		<field name="TIMED_WAITING" since="14" />
+		<field name="WAITING" since="14" />
 	</class>
 	<class name="java/lang/Thread$UncaughtExceptionHandler" since="1">
 		<method name="uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V" />
@@ -31057,7 +31038,7 @@
 		<field name="TYPE" />
 	</class>
 	<class name="java/lang/annotation/Annotation" since="1">
-		<method name="annotationType()Ljava/lang/Class&lt;? extends java/lang/annotation/Annotation>;" />
+		<method name="annotationType()Ljava/lang/Class;" />
 		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="hashCode()I" />
 		<method name="toString()Ljava/lang/String;" />
@@ -31082,19 +31063,19 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/lang/annotation/ElementType;" />
 		<method name="values()[Ljava/lang/annotation/ElementType;" />
-		<field name="ANNOTATION_TYPE" />
-		<field name="CONSTRUCTOR" />
-		<field name="FIELD" />
-		<field name="LOCAL_VARIABLE" />
-		<field name="METHOD" />
-		<field name="PACKAGE" />
-		<field name="PARAMETER" />
-		<field name="TYPE" />
+		<field name="ANNOTATION_TYPE" since="14" />
+		<field name="CONSTRUCTOR" since="14" />
+		<field name="FIELD" since="14" />
+		<field name="LOCAL_VARIABLE" since="14" />
+		<field name="METHOD" since="14" />
+		<field name="PACKAGE" since="14" />
+		<field name="PARAMETER" since="14" />
+		<field name="TYPE" since="14" />
 	</class>
 	<class name="java/lang/annotation/IncompleteAnnotationException" since="1">
 		<extends name="java/lang/RuntimeException" />
-		<method name="&lt;init>(Ljava/lang/Class&lt;? extends java/lang/annotation/Annotation>;Ljava/lang/String;)V" />
-		<method name="annotationType()Ljava/lang/Class&lt;? extends java/lang/annotation/Annotation>;" />
+		<method name="&lt;init>(Ljava/lang/Class;Ljava/lang/String;)V" />
+		<method name="annotationType()Ljava/lang/Class;" />
 		<method name="elementName()Ljava/lang/String;" />
 	</class>
 	<class name="java/lang/annotation/Inherited" since="1">
@@ -31109,9 +31090,9 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/lang/annotation/RetentionPolicy;" />
 		<method name="values()[Ljava/lang/annotation/RetentionPolicy;" />
-		<field name="CLASS" />
-		<field name="RUNTIME" />
-		<field name="SOURCE" />
+		<field name="CLASS" since="14" />
+		<field name="RUNTIME" since="14" />
+		<field name="SOURCE" since="14" />
 	</class>
 	<class name="java/lang/annotation/Target" since="1">
 		<extends name="java/lang/Object" />
@@ -31119,7 +31100,7 @@
 	</class>
 	<class name="java/lang/ref/PhantomReference" since="1">
 		<extends name="java/lang/ref/Reference" />
-		<method name="&lt;init>(LT;Ljava/lang/ref/ReferenceQueue&lt;? super T>;)V" />
+		<method name="&lt;init>(LT;Ljava/lang/ref/ReferenceQueue;)V" />
 	</class>
 	<class name="java/lang/ref/Reference" since="1">
 		<extends name="java/lang/Object" />
@@ -31131,37 +31112,37 @@
 	<class name="java/lang/ref/ReferenceQueue" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="poll()Ljava/lang/ref/Reference&lt;? extends T>;" />
-		<method name="remove()Ljava/lang/ref/Reference&lt;? extends T>;" />
-		<method name="remove(J)Ljava/lang/ref/Reference&lt;? extends T>;" />
+		<method name="poll()Ljava/lang/ref/Reference;" />
+		<method name="remove()Ljava/lang/ref/Reference;" />
+		<method name="remove(J)Ljava/lang/ref/Reference;" />
 	</class>
 	<class name="java/lang/ref/SoftReference" since="1">
 		<extends name="java/lang/ref/Reference" />
 		<method name="&lt;init>(LT;)V" />
-		<method name="&lt;init>(LT;Ljava/lang/ref/ReferenceQueue&lt;? super T>;)V" />
+		<method name="&lt;init>(LT;Ljava/lang/ref/ReferenceQueue;)V" />
 	</class>
 	<class name="java/lang/ref/WeakReference" since="1">
 		<extends name="java/lang/ref/Reference" />
 		<method name="&lt;init>(LT;)V" />
-		<method name="&lt;init>(LT;Ljava/lang/ref/ReferenceQueue&lt;? super T>;)V" />
+		<method name="&lt;init>(LT;Ljava/lang/ref/ReferenceQueue;)V" />
 	</class>
 	<class name="java/lang/reflect/AccessibleObject" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/reflect/AnnotatedElement" />
 		<method name="&lt;init>()V" />
-		<method name="getAnnotation(Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="getAnnotation(Ljava/lang/Class;)LT;" />
 		<method name="getAnnotations()[Ljava/lang/annotation/Annotation;" />
 		<method name="getDeclaredAnnotations()[Ljava/lang/annotation/Annotation;" />
 		<method name="isAccessible()Z" />
-		<method name="isAnnotationPresent(Ljava/lang/Class&lt;? extends java/lang/annotation/Annotation>;)Z" />
+		<method name="isAnnotationPresent(Ljava/lang/Class;)Z" />
 		<method name="setAccessible(Z)V" />
 		<method name="setAccessible([Ljava/lang/reflect/AccessibleObject;Z)V" />
 	</class>
 	<class name="java/lang/reflect/AnnotatedElement" since="1">
-		<method name="getAnnotation(Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="getAnnotation(Ljava/lang/Class;)LT;" />
 		<method name="getAnnotations()[Ljava/lang/annotation/Annotation;" />
 		<method name="getDeclaredAnnotations()[Ljava/lang/annotation/Annotation;" />
-		<method name="isAnnotationPresent(Ljava/lang/Class&lt;? extends java/lang/annotation/Annotation>;)Z" />
+		<method name="isAnnotationPresent(Ljava/lang/Class;)Z" />
 	</class>
 	<class name="java/lang/reflect/Array" since="1">
 		<extends name="java/lang/Object" />
@@ -31175,8 +31156,8 @@
 		<method name="getLength(Ljava/lang/Object;)I" />
 		<method name="getLong(Ljava/lang/Object;I)J" />
 		<method name="getShort(Ljava/lang/Object;I)S" />
-		<method name="newInstance(Ljava/lang/Class&lt;?>;I)Ljava/lang/Object;" />
-		<method name="newInstance(Ljava/lang/Class&lt;?>;[I)Ljava/lang/Object;" />
+		<method name="newInstance(Ljava/lang/Class;I)Ljava/lang/Object;" />
+		<method name="newInstance(Ljava/lang/Class;[I)Ljava/lang/Object;" />
 		<method name="set(Ljava/lang/Object;ILjava/lang/Object;)V" />
 		<method name="setBoolean(Ljava/lang/Object;IZ)V" />
 		<method name="setByte(Ljava/lang/Object;IB)V" />
@@ -31191,16 +31172,16 @@
 		<extends name="java/lang/reflect/AccessibleObject" />
 		<implements name="java/lang/reflect/GenericDeclaration" />
 		<implements name="java/lang/reflect/Member" />
-		<method name="getAnnotation(Ljava/lang/Class&lt;A>;)LA;" since="14" />
-		<method name="getDeclaringClass()Ljava/lang/Class&lt;T>;" />
-		<method name="getExceptionTypes()[Ljava/lang/Class&lt;?>;" />
+		<method name="getAnnotation(Ljava/lang/Class;)LA;" since="14" />
+		<method name="getDeclaringClass()Ljava/lang/Class;" />
+		<method name="getExceptionTypes()[Ljava/lang/Class;" />
 		<method name="getGenericExceptionTypes()[Ljava/lang/reflect/Type;" />
 		<method name="getGenericParameterTypes()[Ljava/lang/reflect/Type;" />
 		<method name="getModifiers()I" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getParameterAnnotations()[[Ljava/lang/annotation/Annotation;" />
-		<method name="getParameterTypes()[Ljava/lang/Class&lt;?>;" />
-		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable&lt;java/lang/reflect/Constructor&lt;T>>;" />
+		<method name="getParameterTypes()[Ljava/lang/Class;" />
+		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable;" />
 		<method name="isSynthetic()Z" />
 		<method name="isVarArgs()Z" />
 		<method name="newInstance([Ljava/lang/Object;)LT;" />
@@ -31210,11 +31191,11 @@
 		<extends name="java/lang/reflect/AccessibleObject" />
 		<implements name="java/lang/reflect/Member" />
 		<method name="get(Ljava/lang/Object;)Ljava/lang/Object;" />
-		<method name="getAnnotation(Ljava/lang/Class&lt;A>;)LA;" since="14" />
+		<method name="getAnnotation(Ljava/lang/Class;)LA;" since="14" />
 		<method name="getBoolean(Ljava/lang/Object;)Z" />
 		<method name="getByte(Ljava/lang/Object;)B" />
 		<method name="getChar(Ljava/lang/Object;)C" />
-		<method name="getDeclaringClass()Ljava/lang/Class&lt;?>;" />
+		<method name="getDeclaringClass()Ljava/lang/Class;" />
 		<method name="getDouble(Ljava/lang/Object;)D" />
 		<method name="getFloat(Ljava/lang/Object;)F" />
 		<method name="getGenericType()Ljava/lang/reflect/Type;" />
@@ -31223,7 +31204,7 @@
 		<method name="getModifiers()I" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getShort(Ljava/lang/Object;)S" />
-		<method name="getType()Ljava/lang/Class&lt;?>;" />
+		<method name="getType()Ljava/lang/Class;" />
 		<method name="isEnumConstant()Z" />
 		<method name="isSynthetic()Z" />
 		<method name="set(Ljava/lang/Object;Ljava/lang/Object;)V" />
@@ -31242,7 +31223,7 @@
 		<method name="getGenericComponentType()Ljava/lang/reflect/Type;" />
 	</class>
 	<class name="java/lang/reflect/GenericDeclaration" since="1">
-		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable&lt;?>;" />
+		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable;" />
 	</class>
 	<class name="java/lang/reflect/GenericSignatureFormatError" since="1">
 		<extends name="java/lang/ClassFormatError" />
@@ -31264,7 +31245,6 @@
 	</class>
 	<class name="java/lang/reflect/Member" since="1">
 		<method name="getDeclaringClass()Ljava/lang/Class;" />
-		<method name="getDeclaringClass()Ljava/lang/Class&lt;?>;" since="9" />
 		<method name="getModifiers()I" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="isSynthetic()Z" />
@@ -31275,19 +31255,19 @@
 		<extends name="java/lang/reflect/AccessibleObject" />
 		<implements name="java/lang/reflect/GenericDeclaration" />
 		<implements name="java/lang/reflect/Member" />
-		<method name="getAnnotation(Ljava/lang/Class&lt;A>;)LA;" since="14" />
-		<method name="getDeclaringClass()Ljava/lang/Class&lt;?>;" />
+		<method name="getAnnotation(Ljava/lang/Class;)LA;" since="14" />
+		<method name="getDeclaringClass()Ljava/lang/Class;" />
 		<method name="getDefaultValue()Ljava/lang/Object;" />
-		<method name="getExceptionTypes()[Ljava/lang/Class&lt;?>;" />
+		<method name="getExceptionTypes()[Ljava/lang/Class;" />
 		<method name="getGenericExceptionTypes()[Ljava/lang/reflect/Type;" />
 		<method name="getGenericParameterTypes()[Ljava/lang/reflect/Type;" />
 		<method name="getGenericReturnType()Ljava/lang/reflect/Type;" />
 		<method name="getModifiers()I" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getParameterAnnotations()[[Ljava/lang/annotation/Annotation;" />
-		<method name="getParameterTypes()[Ljava/lang/Class&lt;?>;" />
-		<method name="getReturnType()Ljava/lang/Class&lt;?>;" />
-		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable&lt;java/lang/reflect/Method>;" />
+		<method name="getParameterTypes()[Ljava/lang/Class;" />
+		<method name="getReturnType()Ljava/lang/Class;" />
+		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable;" />
 		<method name="invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="isBridge()Z" />
 		<method name="isSynthetic()Z" />
@@ -31334,9 +31314,9 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(Ljava/lang/reflect/InvocationHandler;)V" />
 		<method name="getInvocationHandler(Ljava/lang/Object;)Ljava/lang/reflect/InvocationHandler;" />
-		<method name="getProxyClass(Ljava/lang/ClassLoader;[Ljava/lang/Class&lt;?>;)Ljava/lang/Class&lt;?>;" />
-		<method name="isProxyClass(Ljava/lang/Class&lt;?>;)Z" />
-		<method name="newProxyInstance(Ljava/lang/ClassLoader;[Ljava/lang/Class&lt;?>;Ljava/lang/reflect/InvocationHandler;)Ljava/lang/Object;" />
+		<method name="getProxyClass(Ljava/lang/ClassLoader;[Ljava/lang/Class;)Ljava/lang/Class;" />
+		<method name="isProxyClass(Ljava/lang/Class;)Z" />
+		<method name="newProxyInstance(Ljava/lang/ClassLoader;[Ljava/lang/Class;Ljava/lang/reflect/InvocationHandler;)Ljava/lang/Object;" />
 		<field name="h" />
 	</class>
 	<class name="java/lang/reflect/ReflectPermission" since="1">
@@ -31525,14 +31505,14 @@
 		<method name="valueOf(I)Ljava/math/RoundingMode;" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/math/RoundingMode;" />
 		<method name="values()[Ljava/math/RoundingMode;" />
-		<field name="CEILING" />
-		<field name="DOWN" />
-		<field name="FLOOR" />
-		<field name="HALF_DOWN" />
-		<field name="HALF_EVEN" />
-		<field name="HALF_UP" />
-		<field name="UNNECESSARY" />
-		<field name="UP" />
+		<field name="CEILING" since="14" />
+		<field name="DOWN" since="14" />
+		<field name="FLOOR" since="14" />
+		<field name="HALF_DOWN" since="14" />
+		<field name="HALF_EVEN" since="14" />
+		<field name="HALF_UP" since="14" />
+		<field name="UNNECESSARY" since="14" />
+		<field name="UP" since="14" />
 	</class>
 	<class name="java/net/Authenticator" since="1">
 		<extends name="java/lang/Object" />
@@ -31555,8 +31535,8 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/net/Authenticator$RequestorType;" />
 		<method name="values()[Ljava/net/Authenticator$RequestorType;" />
-		<field name="PROXY" />
-		<field name="SERVER" />
+		<field name="PROXY" since="14" />
+		<field name="SERVER" since="14" />
 	</class>
 	<class name="java/net/BindException" since="1">
 		<extends name="java/net/SocketException" />
@@ -31573,7 +31553,7 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="getBody()Ljava/io/InputStream;" />
-		<method name="getHeaders()Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;" />
+		<method name="getHeaders()Ljava/util/Map;" />
 	</class>
 	<class name="java/net/ConnectException" since="1">
 		<extends name="java/net/SocketException" />
@@ -31592,18 +31572,18 @@
 	<class name="java/net/CookieHandler" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="get(Ljava/net/URI;Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;)Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;" />
+		<method name="get(Ljava/net/URI;Ljava/util/Map;)Ljava/util/Map;" />
 		<method name="getDefault()Ljava/net/CookieHandler;" />
-		<method name="put(Ljava/net/URI;Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;)V" />
+		<method name="put(Ljava/net/URI;Ljava/util/Map;)V" />
 		<method name="setDefault(Ljava/net/CookieHandler;)V" />
 	</class>
 	<class name="java/net/CookieManager" since="9">
 		<extends name="java/net/CookieHandler" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/net/CookieStore;Ljava/net/CookiePolicy;)V" />
-		<method name="get(Ljava/net/URI;Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;)Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;" />
+		<method name="get(Ljava/net/URI;Ljava/util/Map;)Ljava/util/Map;" />
 		<method name="getCookieStore()Ljava/net/CookieStore;" />
-		<method name="put(Ljava/net/URI;Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;)V" />
+		<method name="put(Ljava/net/URI;Ljava/util/Map;)V" />
 		<method name="setCookiePolicy(Ljava/net/CookiePolicy;)V" />
 	</class>
 	<class name="java/net/CookiePolicy" since="9">
@@ -31614,9 +31594,9 @@
 	</class>
 	<class name="java/net/CookieStore" since="9">
 		<method name="add(Ljava/net/URI;Ljava/net/HttpCookie;)V" />
-		<method name="get(Ljava/net/URI;)Ljava/util/List&lt;java/net/HttpCookie>;" />
-		<method name="getCookies()Ljava/util/List&lt;java/net/HttpCookie>;" />
-		<method name="getURIs()Ljava/util/List&lt;java/net/URI>;" />
+		<method name="get(Ljava/net/URI;)Ljava/util/List;" />
+		<method name="getCookies()Ljava/util/List;" />
+		<method name="getURIs()Ljava/util/List;" />
 		<method name="remove(Ljava/net/URI;Ljava/net/HttpCookie;)Z" />
 		<method name="removeAll()Z" />
 	</class>
@@ -31731,7 +31711,7 @@
 		<method name="getValue()Ljava/lang/String;" />
 		<method name="getVersion()I" />
 		<method name="hasExpired()Z" />
-		<method name="parse(Ljava/lang/String;)Ljava/util/List&lt;java/net/HttpCookie>;" />
+		<method name="parse(Ljava/lang/String;)Ljava/util/List;" />
 		<method name="setComment(Ljava/lang/String;)V" />
 		<method name="setCommentURL(Ljava/lang/String;)V" />
 		<method name="setDiscard(Z)V" />
@@ -31924,13 +31904,13 @@
 		<method name="getByName(Ljava/lang/String;)Ljava/net/NetworkInterface;" />
 		<method name="getDisplayName()Ljava/lang/String;" />
 		<method name="getHardwareAddress()[B" since="9" />
-		<method name="getInetAddresses()Ljava/util/Enumeration&lt;java/net/InetAddress>;" />
-		<method name="getInterfaceAddresses()Ljava/util/List&lt;java/net/InterfaceAddress>;" since="9" />
+		<method name="getInetAddresses()Ljava/util/Enumeration;" />
+		<method name="getInterfaceAddresses()Ljava/util/List;" since="9" />
 		<method name="getMTU()I" since="9" />
 		<method name="getName()Ljava/lang/String;" />
-		<method name="getNetworkInterfaces()Ljava/util/Enumeration&lt;java/net/NetworkInterface>;" />
+		<method name="getNetworkInterfaces()Ljava/util/Enumeration;" />
 		<method name="getParent()Ljava/net/NetworkInterface;" since="9" />
-		<method name="getSubInterfaces()Ljava/util/Enumeration&lt;java/net/NetworkInterface>;" since="9" />
+		<method name="getSubInterfaces()Ljava/util/Enumeration;" since="9" />
 		<method name="isLoopback()Z" since="9" />
 		<method name="isPointToPoint()Z" since="9" />
 		<method name="isUp()Z" since="9" />
@@ -31971,22 +31951,22 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/net/Proxy$Type;" />
 		<method name="values()[Ljava/net/Proxy$Type;" />
-		<field name="DIRECT" />
-		<field name="HTTP" />
-		<field name="SOCKS" />
+		<field name="DIRECT" since="14" />
+		<field name="HTTP" since="14" />
+		<field name="SOCKS" since="14" />
 	</class>
 	<class name="java/net/ProxySelector" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="connectFailed(Ljava/net/URI;Ljava/net/SocketAddress;Ljava/io/IOException;)V" />
 		<method name="getDefault()Ljava/net/ProxySelector;" />
-		<method name="select(Ljava/net/URI;)Ljava/util/List&lt;java/net/Proxy>;" />
+		<method name="select(Ljava/net/URI;)Ljava/util/List;" />
 		<method name="setDefault(Ljava/net/ProxySelector;)V" />
 	</class>
 	<class name="java/net/ResponseCache" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="get(Ljava/net/URI;Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;)Ljava/net/CacheResponse;" />
+		<method name="get(Ljava/net/URI;Ljava/lang/String;Ljava/util/Map;)Ljava/net/CacheResponse;" />
 		<method name="getDefault()Ljava/net/ResponseCache;" />
 		<method name="put(Ljava/net/URI;Ljava/net/URLConnection;)Ljava/net/CacheRequest;" />
 		<method name="setDefault(Ljava/net/ResponseCache;)V" />
@@ -31995,10 +31975,10 @@
 		<extends name="java/net/CacheResponse" />
 		<method name="&lt;init>()V" />
 		<method name="getCipherSuite()Ljava/lang/String;" />
-		<method name="getLocalCertificateChain()Ljava/util/List&lt;java/security/cert/Certificate>;" />
+		<method name="getLocalCertificateChain()Ljava/util/List;" />
 		<method name="getLocalPrincipal()Ljava/security/Principal;" />
 		<method name="getPeerPrincipal()Ljava/security/Principal;" />
-		<method name="getServerCertificateChain()Ljava/util/List&lt;java/security/cert/Certificate>;" />
+		<method name="getServerCertificateChain()Ljava/util/List;" />
 	</class>
 	<class name="java/net/ServerSocket" since="1">
 		<extends name="java/lang/Object" />
@@ -32239,7 +32219,7 @@
 		<method name="addURL(Ljava/net/URL;)V" />
 		<method name="definePackage(Ljava/lang/String;Ljava/util/jar/Manifest;Ljava/net/URL;)Ljava/lang/Package;" />
 		<method name="findResource(Ljava/lang/String;)Ljava/net/URL;" />
-		<method name="findResources(Ljava/lang/String;)Ljava/util/Enumeration&lt;java/net/URL>;" />
+		<method name="findResources(Ljava/lang/String;)Ljava/util/Enumeration;" />
 		<method name="getURLs()[Ljava/net/URL;" />
 		<method name="newInstance([Ljava/net/URL;)Ljava/net/URLClassLoader;" />
 		<method name="newInstance([Ljava/net/URL;Ljava/lang/ClassLoader;)Ljava/net/URLClassLoader;" />
@@ -32269,14 +32249,14 @@
 		<method name="getHeaderFieldDate(Ljava/lang/String;J)J" />
 		<method name="getHeaderFieldInt(Ljava/lang/String;I)I" />
 		<method name="getHeaderFieldKey(I)Ljava/lang/String;" />
-		<method name="getHeaderFields()Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;" />
+		<method name="getHeaderFields()Ljava/util/Map;" />
 		<method name="getIfModifiedSince()J" />
 		<method name="getInputStream()Ljava/io/InputStream;" />
 		<method name="getLastModified()J" />
 		<method name="getOutputStream()Ljava/io/OutputStream;" />
 		<method name="getPermission()Ljava/security/Permission;" />
 		<method name="getReadTimeout()I" />
-		<method name="getRequestProperties()Ljava/util/Map&lt;java/lang/String, java$util/List&lt;java/lang/String>>;" />
+		<method name="getRequestProperties()Ljava/util/Map;" />
 		<method name="getRequestProperty(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getURL()Ljava/net/URL;" />
 		<method name="getUseCaches()Z" />
@@ -32848,13 +32828,13 @@
 		<method name="&lt;init>()V" />
 		<method name="close()V" />
 		<method name="isOpen()Z" />
-		<method name="keys()Ljava/util/Set&lt;java/nio/channels/SelectionKey>;" />
+		<method name="keys()Ljava/util/Set;" />
 		<method name="open()Ljava/nio/channels/Selector;" />
 		<method name="provider()Ljava/nio/channels/spi/SelectorProvider;" />
 		<method name="select()I" />
 		<method name="select(J)I" />
 		<method name="selectNow()I" />
-		<method name="selectedKeys()Ljava/util/Set&lt;java/nio/channels/SelectionKey>;" />
+		<method name="selectedKeys()Ljava/util/Set;" />
 		<method name="wakeup()Ljava/nio/channels/Selector;" />
 	</class>
 	<class name="java/nio/channels/ServerSocketChannel" since="1">
@@ -32933,7 +32913,7 @@
 		<extends name="java/nio/channels/Selector" />
 		<method name="&lt;init>(Ljava/nio/channels/spi/SelectorProvider;)V" />
 		<method name="begin()V" />
-		<method name="cancelledKeys()Ljava/util/Set&lt;java/nio/channels/SelectionKey>;" />
+		<method name="cancelledKeys()Ljava/util/Set;" />
 		<method name="close()V" />
 		<method name="deregister(Ljava/nio/channels/spi/AbstractSelectionKey;)V" />
 		<method name="end()V" />
@@ -32961,8 +32941,8 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>(Ljava/lang/String;[Ljava/lang/String;)V" />
-		<method name="aliases()Ljava/util/Set&lt;java/lang/String>;" />
-		<method name="availableCharsets()Ljava/util/SortedMap&lt;java/lang/String, java$nio/charset/Charset>;" />
+		<method name="aliases()Ljava/util/Set;" />
+		<method name="availableCharsets()Ljava/util/SortedMap;" />
 		<method name="canEncode()Z" />
 		<method name="compareTo(Ljava/nio/charset/Charset;)I" />
 		<method name="contains(Ljava/nio/charset/Charset;)Z" />
@@ -33083,7 +33063,7 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="charsetForName(Ljava/lang/String;)Ljava/nio/charset/Charset;" />
-		<method name="charsets()Ljava/util/Iterator&lt;java/nio/charset/Charset>;" />
+		<method name="charsets()Ljava/util/Iterator;" />
 	</class>
 	<class name="java/security/AccessControlContext" since="1">
 		<extends name="java/lang/Object" />
@@ -33101,12 +33081,12 @@
 	<class name="java/security/AccessController" since="1">
 		<extends name="java/lang/Object" />
 		<method name="checkPermission(Ljava/security/Permission;)V" />
-		<method name="doPrivileged(Ljava/security/PrivilegedAction&lt;T>;)LT;" />
-		<method name="doPrivileged(Ljava/security/PrivilegedAction&lt;T>;Ljava/security/AccessControlContext;)LT;" />
-		<method name="doPrivileged(Ljava/security/PrivilegedExceptionAction&lt;T>;)LT;" />
-		<method name="doPrivileged(Ljava/security/PrivilegedExceptionAction&lt;T>;Ljava/security/AccessControlContext;)LT;" />
-		<method name="doPrivilegedWithCombiner(Ljava/security/PrivilegedAction&lt;T>;)LT;" since="9" />
-		<method name="doPrivilegedWithCombiner(Ljava/security/PrivilegedExceptionAction&lt;T>;)LT;" since="9" />
+		<method name="doPrivileged(Ljava/security/PrivilegedAction;)LT;" />
+		<method name="doPrivileged(Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;)LT;" />
+		<method name="doPrivileged(Ljava/security/PrivilegedExceptionAction;)LT;" />
+		<method name="doPrivileged(Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;)LT;" />
+		<method name="doPrivilegedWithCombiner(Ljava/security/PrivilegedAction;)LT;" since="9" />
+		<method name="doPrivilegedWithCombiner(Ljava/security/PrivilegedExceptionAction;)LT;" since="9" />
 		<method name="getContext()Ljava/security/AccessControlContext;" />
 	</class>
 	<class name="java/security/AlgorithmParameterGenerator" since="1">
@@ -33139,7 +33119,7 @@
 		<method name="getInstance(Ljava/lang/String;)Ljava/security/AlgorithmParameters;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/lang/String;)Ljava/security/AlgorithmParameters;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljava/security/AlgorithmParameters;" />
-		<method name="getParameterSpec(Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="getParameterSpec(Ljava/lang/Class;)LT;" />
 		<method name="getProvider()Ljava/security/Provider;" />
 		<method name="init(Ljava/security/spec/AlgorithmParameterSpec;)V" />
 		<method name="init([B)V" />
@@ -33151,7 +33131,7 @@
 		<method name="&lt;init>()V" />
 		<method name="engineGetEncoded()[B" />
 		<method name="engineGetEncoded(Ljava/lang/String;)[B" />
-		<method name="engineGetParameterSpec(Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="engineGetParameterSpec(Ljava/lang/Class;)LT;" />
 		<method name="engineInit(Ljava/security/spec/AlgorithmParameterSpec;)V" />
 		<method name="engineInit([B)V" />
 		<method name="engineInit([BLjava/lang/String;)V" />
@@ -33281,7 +33261,7 @@
 		<method name="getIdentity(Ljava/security/Principal;)Ljava/security/Identity;" />
 		<method name="getIdentity(Ljava/security/PublicKey;)Ljava/security/Identity;" />
 		<method name="getSystemScope()Ljava/security/IdentityScope;" />
-		<method name="identities()Ljava/util/Enumeration&lt;java/security/Identity>;" />
+		<method name="identities()Ljava/util/Enumeration;" />
 		<method name="removeIdentity(Ljava/security/Identity;)V" />
 		<method name="setSystemScope(Ljava/security/IdentityScope;)V" />
 		<method name="size()I" />
@@ -33328,7 +33308,7 @@
 		<method name="getInstance(Ljava/lang/String;)Ljava/security/KeyFactory;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/lang/String;)Ljava/security/KeyFactory;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljava/security/KeyFactory;" />
-		<method name="getKeySpec(Ljava/security/Key;Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="getKeySpec(Ljava/security/Key;Ljava/lang/Class;)LT;" />
 		<method name="getProvider()Ljava/security/Provider;" />
 		<method name="translateKey(Ljava/security/Key;)Ljava/security/Key;" />
 	</class>
@@ -33337,7 +33317,7 @@
 		<method name="&lt;init>()V" />
 		<method name="engineGeneratePrivate(Ljava/security/spec/KeySpec;)Ljava/security/PrivateKey;" />
 		<method name="engineGeneratePublic(Ljava/security/spec/KeySpec;)Ljava/security/PublicKey;" />
-		<method name="engineGetKeySpec(Ljava/security/Key;Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="engineGetKeySpec(Ljava/security/Key;Ljava/lang/Class;)LT;" />
 		<method name="engineTranslateKey(Ljava/security/Key;)Ljava/security/Key;" />
 	</class>
 	<class name="java/security/KeyManagementException" since="1">
@@ -33385,17 +33365,17 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/security/KeyRep$Type;" />
 		<method name="values()[Ljava/security/KeyRep$Type;" />
-		<field name="PRIVATE" />
-		<field name="PUBLIC" />
-		<field name="SECRET" />
+		<field name="PRIVATE" since="14" />
+		<field name="PUBLIC" since="14" />
+		<field name="SECRET" since="14" />
 	</class>
 	<class name="java/security/KeyStore" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/security/KeyStoreSpi;Ljava/security/Provider;Ljava/lang/String;)V" />
-		<method name="aliases()Ljava/util/Enumeration&lt;java/lang/String>;" />
+		<method name="aliases()Ljava/util/Enumeration;" />
 		<method name="containsAlias(Ljava/lang/String;)Z" />
 		<method name="deleteEntry(Ljava/lang/String;)V" />
-		<method name="entryInstanceOf(Ljava/lang/String;Ljava/lang/Class&lt;? extends java/security/KeyStore$Entry>;)Z" />
+		<method name="entryInstanceOf(Ljava/lang/String;Ljava/lang/Class;)Z" />
 		<method name="getCertificate(Ljava/lang/String;)Ljava/security/cert/Certificate;" />
 		<method name="getCertificateAlias(Ljava/security/cert/Certificate;)Ljava/lang/String;" />
 		<method name="getCertificateChain(Ljava/lang/String;)[Ljava/security/cert/Certificate;" />
@@ -33481,10 +33461,10 @@
 	<class name="java/security/KeyStoreSpi" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="engineAliases()Ljava/util/Enumeration&lt;java/lang/String>;" />
+		<method name="engineAliases()Ljava/util/Enumeration;" />
 		<method name="engineContainsAlias(Ljava/lang/String;)Z" />
 		<method name="engineDeleteEntry(Ljava/lang/String;)V" />
-		<method name="engineEntryInstanceOf(Ljava/lang/String;Ljava/lang/Class&lt;? extends java/security/KeyStore$Entry>;)Z" />
+		<method name="engineEntryInstanceOf(Ljava/lang/String;Ljava/lang/Class;)Z" />
 		<method name="engineGetCertificate(Ljava/lang/String;)Ljava/security/cert/Certificate;" />
 		<method name="engineGetCertificateAlias(Ljava/security/cert/Certificate;)Ljava/lang/String;" />
 		<method name="engineGetCertificateChain(Ljava/lang/String;)[Ljava/security/cert/Certificate;" />
@@ -33564,7 +33544,7 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="add(Ljava/security/Permission;)V" />
-		<method name="elements()Ljava/util/Enumeration&lt;java/security/Permission>;" />
+		<method name="elements()Ljava/util/Enumeration;" />
 		<method name="implies(Ljava/security/Permission;)Z" />
 		<method name="isReadOnly()Z" />
 		<method name="setReadOnly()V" />
@@ -33574,7 +33554,7 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="add(Ljava/security/Permission;)V" />
-		<method name="elements()Ljava/util/Enumeration&lt;java/security/Permission>;" />
+		<method name="elements()Ljava/util/Enumeration;" />
 		<method name="implies(Ljava/security/Permission;)Z" />
 	</class>
 	<class name="java/security/Policy" since="1">
@@ -33641,16 +33621,16 @@
 		<method name="getInfo()Ljava/lang/String;" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getService(Ljava/lang/String;Ljava/lang/String;)Ljava/security/Provider$Service;" />
-		<method name="getServices()Ljava/util/Set&lt;java/security/Provider$Service>;" />
+		<method name="getServices()Ljava/util/Set;" />
 		<method name="getVersion()D" />
 		<method name="put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
-		<method name="putAll(Ljava/util/Map&lt;?, ?>;)V" />
+		<method name="putAll(Ljava/util/Map;)V" />
 		<method name="putService(Ljava/security/Provider$Service;)V" />
 		<method name="removeService(Ljava/security/Provider$Service;)V" />
 	</class>
 	<class name="java/security/Provider$Service" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(Ljava/security/Provider;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List&lt;java/lang/String>;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)V" />
+		<method name="&lt;init>(Ljava/security/Provider;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;)V" />
 		<method name="getAlgorithm()Ljava/lang/String;" />
 		<method name="getAttribute(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getClassName()Ljava/lang/String;" />
@@ -33674,8 +33654,8 @@
 		<extends name="java/lang/ClassLoader" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/ClassLoader;)V" />
-		<method name="defineClass(Ljava/lang/String;Ljava/nio/ByteBuffer;Ljava/security/CodeSource;)Ljava/lang/Class&lt;?>;" />
-		<method name="defineClass(Ljava/lang/String;[BIILjava/security/CodeSource;)Ljava/lang/Class&lt;?>;" />
+		<method name="defineClass(Ljava/lang/String;Ljava/nio/ByteBuffer;Ljava/security/CodeSource;)Ljava/lang/Class;" />
+		<method name="defineClass(Ljava/lang/String;[BIILjava/security/CodeSource;)Ljava/lang/Class;" />
 		<method name="getPermissions(Ljava/security/CodeSource;)Ljava/security/PermissionCollection;" />
 	</class>
 	<class name="java/security/SecureRandom" since="1">
@@ -33705,12 +33685,12 @@
 		<extends name="java/lang/Object" />
 		<method name="addProvider(Ljava/security/Provider;)I" />
 		<method name="getAlgorithmProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getAlgorithms(Ljava/lang/String;)Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getAlgorithms(Ljava/lang/String;)Ljava/util/Set;" />
 		<method name="getProperty(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getProvider(Ljava/lang/String;)Ljava/security/Provider;" />
 		<method name="getProviders()[Ljava/security/Provider;" />
 		<method name="getProviders(Ljava/lang/String;)[Ljava/security/Provider;" />
-		<method name="getProviders(Ljava/util/Map&lt;java/lang/String, java$lang/String>;)[Ljava/security/Provider;" />
+		<method name="getProviders(Ljava/util/Map;)[Ljava/security/Provider;" />
 		<method name="insertProviderAt(Ljava/security/Provider;I)I" />
 		<method name="removeProvider(Ljava/lang/String;)V" />
 		<method name="setProperty(Ljava/lang/String;Ljava/lang/String;)V" />
@@ -33828,9 +33808,9 @@
 		<implements name="java/security/acl/Owner" />
 		<method name="addEntry(Ljava/security/Principal;Ljava/security/acl/AclEntry;)Z" />
 		<method name="checkPermission(Ljava/security/Principal;Ljava/security/acl/Permission;)Z" />
-		<method name="entries()Ljava/util/Enumeration&lt;java/security/acl/AclEntry>;" />
+		<method name="entries()Ljava/util/Enumeration;" />
 		<method name="getName()Ljava/lang/String;" />
-		<method name="getPermissions(Ljava/security/Principal;)Ljava/util/Enumeration&lt;java/security/acl/Permission>;" />
+		<method name="getPermissions(Ljava/security/Principal;)Ljava/util/Enumeration;" />
 		<method name="removeEntry(Ljava/security/Principal;Ljava/security/acl/AclEntry;)Z" />
 		<method name="setName(Ljava/security/Principal;Ljava/lang/String;)V" />
 		<method name="toString()Ljava/lang/String;" />
@@ -33842,7 +33822,7 @@
 		<method name="clone()Ljava/lang/Object;" />
 		<method name="getPrincipal()Ljava/security/Principal;" />
 		<method name="isNegative()Z" />
-		<method name="permissions()Ljava/util/Enumeration&lt;java/security/acl/Permission>;" />
+		<method name="permissions()Ljava/util/Enumeration;" />
 		<method name="removePermission(Ljava/security/acl/Permission;)Z" />
 		<method name="setNegativePermissions()V" />
 		<method name="setPrincipal(Ljava/security/Principal;)Z" />
@@ -33856,7 +33836,7 @@
 		<implements name="java/security/Principal" />
 		<method name="addMember(Ljava/security/Principal;)Z" />
 		<method name="isMember(Ljava/security/Principal;)Z" />
-		<method name="members()Ljava/util/Enumeration&lt;? extends java/security/Principal>;" />
+		<method name="members()Ljava/util/Enumeration;" />
 		<method name="removeMember(Ljava/security/Principal;)Z" />
 	</class>
 	<class name="java/security/acl/LastOwnerException" since="1">
@@ -33899,10 +33879,10 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="getCertificates()Ljava/util/List&lt;? extends java/security/cert/Certificate>;" />
+		<method name="getCertificates()Ljava/util/List;" />
 		<method name="getEncoded()[B" />
 		<method name="getEncoded(Ljava/lang/String;)[B" />
-		<method name="getEncodings()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="getEncodings()Ljava/util/Iterator;" />
 		<method name="getType()Ljava/lang/String;" />
 		<method name="writeReplace()Ljava/lang/Object;" />
 	</class>
@@ -33982,9 +33962,9 @@
 	<class name="java/security/cert/CertStore" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/security/cert/CertStoreSpi;Ljava/security/Provider;Ljava/lang/String;Ljava/security/cert/CertStoreParameters;)V" />
-		<method name="getCRLs(Ljava/security/cert/CRLSelector;)Ljava/util/Collection&lt;? extends java/security/cert/CRL>;" />
+		<method name="getCRLs(Ljava/security/cert/CRLSelector;)Ljava/util/Collection;" />
 		<method name="getCertStoreParameters()Ljava/security/cert/CertStoreParameters;" />
-		<method name="getCertificates(Ljava/security/cert/CertSelector;)Ljava/util/Collection&lt;? extends java/security/cert/Certificate>;" />
+		<method name="getCertificates(Ljava/security/cert/CertSelector;)Ljava/util/Collection;" />
 		<method name="getDefaultType()Ljava/lang/String;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/security/cert/CertStoreParameters;)Ljava/security/cert/CertStore;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/security/cert/CertStoreParameters;Ljava/lang/String;)Ljava/security/cert/CertStore;" />
@@ -34006,8 +33986,8 @@
 	<class name="java/security/cert/CertStoreSpi" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/security/cert/CertStoreParameters;)V" />
-		<method name="engineGetCRLs(Ljava/security/cert/CRLSelector;)Ljava/util/Collection&lt;? extends java/security/cert/CRL>;" />
-		<method name="engineGetCertificates(Ljava/security/cert/CertSelector;)Ljava/util/Collection&lt;? extends java/security/cert/Certificate>;" />
+		<method name="engineGetCRLs(Ljava/security/cert/CRLSelector;)Ljava/util/Collection;" />
+		<method name="engineGetCertificates(Ljava/security/cert/CertSelector;)Ljava/util/Collection;" />
 	</class>
 	<class name="java/security/cert/Certificate" since="1">
 		<extends name="java/lang/Object" />
@@ -34050,13 +34030,13 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/security/cert/CertificateFactorySpi;Ljava/security/Provider;Ljava/lang/String;)V" />
 		<method name="generateCRL(Ljava/io/InputStream;)Ljava/security/cert/CRL;" />
-		<method name="generateCRLs(Ljava/io/InputStream;)Ljava/util/Collection&lt;? extends java/security/cert/CRL>;" />
+		<method name="generateCRLs(Ljava/io/InputStream;)Ljava/util/Collection;" />
 		<method name="generateCertPath(Ljava/io/InputStream;)Ljava/security/cert/CertPath;" />
 		<method name="generateCertPath(Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/cert/CertPath;" />
-		<method name="generateCertPath(Ljava/util/List&lt;? extends java/security/cert/Certificate>;)Ljava/security/cert/CertPath;" />
+		<method name="generateCertPath(Ljava/util/List;)Ljava/security/cert/CertPath;" />
 		<method name="generateCertificate(Ljava/io/InputStream;)Ljava/security/cert/Certificate;" />
-		<method name="generateCertificates(Ljava/io/InputStream;)Ljava/util/Collection&lt;? extends java/security/cert/Certificate>;" />
-		<method name="getCertPathEncodings()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="generateCertificates(Ljava/io/InputStream;)Ljava/util/Collection;" />
+		<method name="getCertPathEncodings()Ljava/util/Iterator;" />
 		<method name="getInstance(Ljava/lang/String;)Ljava/security/cert/CertificateFactory;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/lang/String;)Ljava/security/cert/CertificateFactory;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljava/security/cert/CertificateFactory;" />
@@ -34067,13 +34047,13 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="engineGenerateCRL(Ljava/io/InputStream;)Ljava/security/cert/CRL;" />
-		<method name="engineGenerateCRLs(Ljava/io/InputStream;)Ljava/util/Collection&lt;? extends java/security/cert/CRL>;" />
+		<method name="engineGenerateCRLs(Ljava/io/InputStream;)Ljava/util/Collection;" />
 		<method name="engineGenerateCertPath(Ljava/io/InputStream;)Ljava/security/cert/CertPath;" />
 		<method name="engineGenerateCertPath(Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/cert/CertPath;" />
-		<method name="engineGenerateCertPath(Ljava/util/List&lt;? extends java/security/cert/Certificate>;)Ljava/security/cert/CertPath;" />
+		<method name="engineGenerateCertPath(Ljava/util/List;)Ljava/security/cert/CertPath;" />
 		<method name="engineGenerateCertificate(Ljava/io/InputStream;)Ljava/security/cert/Certificate;" />
-		<method name="engineGenerateCertificates(Ljava/io/InputStream;)Ljava/util/Collection&lt;? extends java/security/cert/Certificate>;" />
-		<method name="engineGetCertPathEncodings()Ljava/util/Iterator&lt;java/lang/String>;" />
+		<method name="engineGenerateCertificates(Ljava/io/InputStream;)Ljava/util/Collection;" />
+		<method name="engineGetCertPathEncodings()Ljava/util/Iterator;" />
 	</class>
 	<class name="java/security/cert/CertificateNotYetValidException" since="1">
 		<extends name="java/security/cert/CertificateException" />
@@ -34091,9 +34071,9 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/security/cert/CertStoreParameters" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;?>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
 		<method name="clone()Ljava/lang/Object;" />
-		<method name="getCollection()Ljava/util/Collection&lt;?>;" />
+		<method name="getCollection()Ljava/util/Collection;" />
 	</class>
 	<class name="java/security/cert/LDAPCertStoreParameters" since="1">
 		<extends name="java/lang/Object" />
@@ -34108,7 +34088,7 @@
 	<class name="java/security/cert/PKIXBuilderParameters" since="1">
 		<extends name="java/security/cert/PKIXParameters" />
 		<method name="&lt;init>(Ljava/security/KeyStore;Ljava/security/cert/CertSelector;)V" />
-		<method name="&lt;init>(Ljava/util/Set&lt;java/security/cert/TrustAnchor>;Ljava/security/cert/CertSelector;)V" />
+		<method name="&lt;init>(Ljava/util/Set;Ljava/security/cert/CertSelector;)V" />
 		<method name="getMaxPathLength()I" />
 		<method name="setMaxPathLength(I)V" />
 	</class>
@@ -34122,9 +34102,9 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>()V" />
-		<method name="check(Ljava/security/cert/Certificate;Ljava/util/Collection&lt;java/lang/String>;)V" />
+		<method name="check(Ljava/security/cert/Certificate;Ljava/util/Collection;)V" />
 		<method name="clone()Ljava/lang/Object;" />
-		<method name="getSupportedExtensions()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getSupportedExtensions()Ljava/util/Set;" />
 		<method name="init(Z)V" />
 		<method name="isForwardCheckingSupported()Z" />
 	</class>
@@ -34141,41 +34121,41 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/security/cert/CertPathParameters" />
 		<method name="&lt;init>(Ljava/security/KeyStore;)V" />
-		<method name="&lt;init>(Ljava/util/Set&lt;java/security/cert/TrustAnchor>;)V" />
+		<method name="&lt;init>(Ljava/util/Set;)V" />
 		<method name="addCertPathChecker(Ljava/security/cert/PKIXCertPathChecker;)V" />
 		<method name="addCertStore(Ljava/security/cert/CertStore;)V" />
 		<method name="clone()Ljava/lang/Object;" />
-		<method name="getCertPathCheckers()Ljava/util/List&lt;java/security/cert/PKIXCertPathChecker>;" />
-		<method name="getCertStores()Ljava/util/List&lt;java/security/cert/CertStore>;" />
+		<method name="getCertPathCheckers()Ljava/util/List;" />
+		<method name="getCertStores()Ljava/util/List;" />
 		<method name="getDate()Ljava/util/Date;" />
-		<method name="getInitialPolicies()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getInitialPolicies()Ljava/util/Set;" />
 		<method name="getPolicyQualifiersRejected()Z" />
 		<method name="getSigProvider()Ljava/lang/String;" />
 		<method name="getTargetCertConstraints()Ljava/security/cert/CertSelector;" />
-		<method name="getTrustAnchors()Ljava/util/Set&lt;java/security/cert/TrustAnchor>;" />
+		<method name="getTrustAnchors()Ljava/util/Set;" />
 		<method name="isAnyPolicyInhibited()Z" />
 		<method name="isExplicitPolicyRequired()Z" />
 		<method name="isPolicyMappingInhibited()Z" />
 		<method name="isRevocationEnabled()Z" />
 		<method name="setAnyPolicyInhibited(Z)V" />
-		<method name="setCertPathCheckers(Ljava/util/List&lt;java/security/cert/PKIXCertPathChecker>;)V" />
-		<method name="setCertStores(Ljava/util/List&lt;java/security/cert/CertStore>;)V" />
+		<method name="setCertPathCheckers(Ljava/util/List;)V" />
+		<method name="setCertStores(Ljava/util/List;)V" />
 		<method name="setDate(Ljava/util/Date;)V" />
 		<method name="setExplicitPolicyRequired(Z)V" />
-		<method name="setInitialPolicies(Ljava/util/Set&lt;java/lang/String>;)V" />
+		<method name="setInitialPolicies(Ljava/util/Set;)V" />
 		<method name="setPolicyMappingInhibited(Z)V" />
 		<method name="setPolicyQualifiersRejected(Z)V" />
 		<method name="setRevocationEnabled(Z)V" />
 		<method name="setSigProvider(Ljava/lang/String;)V" />
 		<method name="setTargetCertConstraints(Ljava/security/cert/CertSelector;)V" />
-		<method name="setTrustAnchors(Ljava/util/Set&lt;java/security/cert/TrustAnchor>;)V" />
+		<method name="setTrustAnchors(Ljava/util/Set;)V" />
 	</class>
 	<class name="java/security/cert/PolicyNode" since="1">
-		<method name="getChildren()Ljava/util/Iterator&lt;? extends java/security/cert/PolicyNode>;" />
+		<method name="getChildren()Ljava/util/Iterator;" />
 		<method name="getDepth()I" />
-		<method name="getExpectedPolicies()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getExpectedPolicies()Ljava/util/Set;" />
 		<method name="getParent()Ljava/security/cert/PolicyNode;" />
-		<method name="getPolicyQualifiers()Ljava/util/Set&lt;? extends java/security/cert/PolicyQualifierInfo>;" />
+		<method name="getPolicyQualifiers()Ljava/util/Set;" />
 		<method name="getValidPolicy()Ljava/lang/String;" />
 		<method name="isCritical()Z" />
 	</class>
@@ -34207,7 +34187,7 @@
 		<method name="getNextUpdate()Ljava/util/Date;" />
 		<method name="getRevokedCertificate(Ljava/math/BigInteger;)Ljava/security/cert/X509CRLEntry;" />
 		<method name="getRevokedCertificate(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509CRLEntry;" />
-		<method name="getRevokedCertificates()Ljava/util/Set&lt;? extends java/security/cert/X509CRLEntry>;" />
+		<method name="getRevokedCertificates()Ljava/util/Set;" />
 		<method name="getSigAlgName()Ljava/lang/String;" />
 		<method name="getSigAlgOID()Ljava/lang/String;" />
 		<method name="getSigAlgParams()[B" />
@@ -34239,15 +34219,15 @@
 		<method name="clone()Ljava/lang/Object;" />
 		<method name="getCertificateChecking()Ljava/security/cert/X509Certificate;" />
 		<method name="getDateAndTime()Ljava/util/Date;" />
-		<method name="getIssuerNames()Ljava/util/Collection&lt;java/lang/Object>;" />
-		<method name="getIssuers()Ljava/util/Collection&lt;javax/security/auth/x500/X500Principal>;" />
+		<method name="getIssuerNames()Ljava/util/Collection;" />
+		<method name="getIssuers()Ljava/util/Collection;" />
 		<method name="getMaxCRL()Ljava/math/BigInteger;" />
 		<method name="getMinCRL()Ljava/math/BigInteger;" />
 		<method name="match(Ljava/security/cert/CRL;)Z" />
 		<method name="setCertificateChecking(Ljava/security/cert/X509Certificate;)V" />
 		<method name="setDateAndTime(Ljava/util/Date;)V" />
-		<method name="setIssuerNames(Ljava/util/Collection&lt;?>;)V" />
-		<method name="setIssuers(Ljava/util/Collection&lt;javax/security/auth/x500/X500Principal>;)V" />
+		<method name="setIssuerNames(Ljava/util/Collection;)V" />
+		<method name="setIssuers(Ljava/util/Collection;)V" />
 		<method name="setMaxCRLNumber(Ljava/math/BigInteger;)V" />
 		<method name="setMinCRLNumber(Ljava/math/BigInteger;)V" />
 	</class>
@@ -34264,19 +34244,19 @@
 		<method name="getBasicConstraints()I" />
 		<method name="getCertificate()Ljava/security/cert/X509Certificate;" />
 		<method name="getCertificateValid()Ljava/util/Date;" />
-		<method name="getExtendedKeyUsage()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getExtendedKeyUsage()Ljava/util/Set;" />
 		<method name="getIssuer()Ljavax/security/auth/x500/X500Principal;" />
 		<method name="getIssuerAsBytes()[B" />
 		<method name="getIssuerAsString()Ljava/lang/String;" />
 		<method name="getKeyUsage()[Z" />
 		<method name="getMatchAllSubjectAltNames()Z" />
 		<method name="getNameConstraints()[B" />
-		<method name="getPathToNames()Ljava/util/Collection&lt;java/util/List&lt;?>>;" />
-		<method name="getPolicy()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getPathToNames()Ljava/util/Collection;" />
+		<method name="getPolicy()Ljava/util/Set;" />
 		<method name="getPrivateKeyValid()Ljava/util/Date;" />
 		<method name="getSerialNumber()Ljava/math/BigInteger;" />
 		<method name="getSubject()Ljavax/security/auth/x500/X500Principal;" />
-		<method name="getSubjectAlternativeNames()Ljava/util/Collection&lt;java/util/List&lt;?>>;" />
+		<method name="getSubjectAlternativeNames()Ljava/util/Collection;" />
 		<method name="getSubjectAsBytes()[B" />
 		<method name="getSubjectAsString()Ljava/lang/String;" />
 		<method name="getSubjectKeyIdentifier()[B" />
@@ -34287,21 +34267,21 @@
 		<method name="setBasicConstraints(I)V" />
 		<method name="setCertificate(Ljava/security/cert/X509Certificate;)V" />
 		<method name="setCertificateValid(Ljava/util/Date;)V" />
-		<method name="setExtendedKeyUsage(Ljava/util/Set&lt;java/lang/String>;)V" />
+		<method name="setExtendedKeyUsage(Ljava/util/Set;)V" />
 		<method name="setIssuer(Ljava/lang/String;)V" />
 		<method name="setIssuer(Ljavax/security/auth/x500/X500Principal;)V" />
 		<method name="setIssuer([B)V" />
 		<method name="setKeyUsage([Z)V" />
 		<method name="setMatchAllSubjectAltNames(Z)V" />
 		<method name="setNameConstraints([B)V" />
-		<method name="setPathToNames(Ljava/util/Collection&lt;java/util/List&lt;?>>;)V" />
-		<method name="setPolicy(Ljava/util/Set&lt;java/lang/String>;)V" />
+		<method name="setPathToNames(Ljava/util/Collection;)V" />
+		<method name="setPolicy(Ljava/util/Set;)V" />
 		<method name="setPrivateKeyValid(Ljava/util/Date;)V" />
 		<method name="setSerialNumber(Ljava/math/BigInteger;)V" />
 		<method name="setSubject(Ljava/lang/String;)V" />
 		<method name="setSubject(Ljavax/security/auth/x500/X500Principal;)V" />
 		<method name="setSubject([B)V" />
-		<method name="setSubjectAlternativeNames(Ljava/util/Collection&lt;java/util/List&lt;?>>;)V" />
+		<method name="setSubjectAlternativeNames(Ljava/util/Collection;)V" />
 		<method name="setSubjectKeyIdentifier([B)V" />
 		<method name="setSubjectPublicKey(Ljava/security/PublicKey;)V" />
 		<method name="setSubjectPublicKey([B)V" />
@@ -34314,8 +34294,8 @@
 		<method name="checkValidity()V" />
 		<method name="checkValidity(Ljava/util/Date;)V" />
 		<method name="getBasicConstraints()I" />
-		<method name="getExtendedKeyUsage()Ljava/util/List&lt;java/lang/String>;" />
-		<method name="getIssuerAlternativeNames()Ljava/util/Collection&lt;java/util/List&lt;?>>;" />
+		<method name="getExtendedKeyUsage()Ljava/util/List;" />
+		<method name="getIssuerAlternativeNames()Ljava/util/Collection;" />
 		<method name="getIssuerDN()Ljava/security/Principal;" />
 		<method name="getIssuerUniqueID()[Z" />
 		<method name="getIssuerX500Principal()Ljavax/security/auth/x500/X500Principal;" />
@@ -34327,7 +34307,7 @@
 		<method name="getSigAlgOID()Ljava/lang/String;" />
 		<method name="getSigAlgParams()[B" />
 		<method name="getSignature()[B" />
-		<method name="getSubjectAlternativeNames()Ljava/util/Collection&lt;java/util/List&lt;?>>;" />
+		<method name="getSubjectAlternativeNames()Ljava/util/Collection;" />
 		<method name="getSubjectDN()Ljava/security/Principal;" />
 		<method name="getSubjectUniqueID()[Z" />
 		<method name="getSubjectX500Principal()Ljavax/security/auth/x500/X500Principal;" />
@@ -34335,9 +34315,9 @@
 		<method name="getVersion()I" />
 	</class>
 	<class name="java/security/cert/X509Extension" since="1">
-		<method name="getCriticalExtensionOIDs()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getCriticalExtensionOIDs()Ljava/util/Set;" />
 		<method name="getExtensionValue(Ljava/lang/String;)[B" />
-		<method name="getNonCriticalExtensionOIDs()Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getNonCriticalExtensionOIDs()Ljava/util/Set;" />
 		<method name="hasUnsupportedCriticalExtension()Z" />
 	</class>
 	<class name="java/security/interfaces/DSAKey" since="1">
@@ -34618,14 +34598,14 @@
 		<method name="free()V" since="9" />
 		<method name="getArray()Ljava/lang/Object;" />
 		<method name="getArray(JI)Ljava/lang/Object;" />
-		<method name="getArray(JILjava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)Ljava/lang/Object;" />
-		<method name="getArray(Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)Ljava/lang/Object;" />
+		<method name="getArray(JILjava/util/Map;)Ljava/lang/Object;" />
+		<method name="getArray(Ljava/util/Map;)Ljava/lang/Object;" />
 		<method name="getBaseType()I" />
 		<method name="getBaseTypeName()Ljava/lang/String;" />
 		<method name="getResultSet()Ljava/sql/ResultSet;" />
 		<method name="getResultSet(JI)Ljava/sql/ResultSet;" />
-		<method name="getResultSet(JILjava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)Ljava/sql/ResultSet;" />
-		<method name="getResultSet(Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)Ljava/sql/ResultSet;" />
+		<method name="getResultSet(JILjava/util/Map;)Ljava/sql/ResultSet;" />
+		<method name="getResultSet(Ljava/util/Map;)Ljava/sql/ResultSet;" />
 	</class>
 	<class name="java/sql/BatchUpdateException" since="1">
 		<extends name="java/sql/SQLException" />
@@ -34693,9 +34673,9 @@
 		<method name="getNString(I)Ljava/lang/String;" since="9" />
 		<method name="getNString(Ljava/lang/String;)Ljava/lang/String;" since="9" />
 		<method name="getObject(I)Ljava/lang/Object;" />
-		<method name="getObject(ILjava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)Ljava/lang/Object;" />
+		<method name="getObject(ILjava/util/Map;)Ljava/lang/Object;" />
 		<method name="getObject(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="getObject(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)Ljava/lang/Object;" />
+		<method name="getObject(Ljava/lang/String;Ljava/util/Map;)Ljava/lang/Object;" />
 		<method name="getRef(I)Ljava/sql/Ref;" />
 		<method name="getRef(Ljava/lang/String;)Ljava/sql/Ref;" />
 		<method name="getRowId(I)Ljava/sql/RowId;" since="9" />
@@ -34773,10 +34753,10 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/sql/ClientInfoStatus;" />
 		<method name="values()[Ljava/sql/ClientInfoStatus;" />
-		<field name="REASON_UNKNOWN" />
-		<field name="REASON_UNKNOWN_PROPERTY" />
-		<field name="REASON_VALUE_INVALID" />
-		<field name="REASON_VALUE_TRUNCATED" />
+		<field name="REASON_UNKNOWN" since="14" />
+		<field name="REASON_UNKNOWN_PROPERTY" since="14" />
+		<field name="REASON_VALUE_INVALID" since="14" />
+		<field name="REASON_VALUE_TRUNCATED" since="14" />
 	</class>
 	<class name="java/sql/Clob" since="1">
 		<method name="free()V" since="9" />
@@ -34814,7 +34794,7 @@
 		<method name="getHoldability()I" />
 		<method name="getMetaData()Ljava/sql/DatabaseMetaData;" />
 		<method name="getTransactionIsolation()I" />
-		<method name="getTypeMap()Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;" />
+		<method name="getTypeMap()Ljava/util/Map;" />
 		<method name="getWarnings()Ljava/sql/SQLWarning;" />
 		<method name="isClosed()Z" />
 		<method name="isReadOnly()Z" />
@@ -34841,7 +34821,7 @@
 		<method name="setSavepoint()Ljava/sql/Savepoint;" />
 		<method name="setSavepoint(Ljava/lang/String;)Ljava/sql/Savepoint;" />
 		<method name="setTransactionIsolation(I)V" />
-		<method name="setTypeMap(Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)V" />
+		<method name="setTypeMap(Ljava/util/Map;)V" />
 		<field name="TRANSACTION_NONE" />
 		<field name="TRANSACTION_READ_COMMITTED" />
 		<field name="TRANSACTION_READ_UNCOMMITTED" />
@@ -35116,7 +35096,7 @@
 		<method name="getConnection(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/Connection;" />
 		<method name="getConnection(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;" />
 		<method name="getDriver(Ljava/lang/String;)Ljava/sql/Driver;" />
-		<method name="getDrivers()Ljava/util/Enumeration&lt;java/sql/Driver>;" />
+		<method name="getDrivers()Ljava/util/Enumeration;" />
 		<method name="getLogStream()Ljava/io/PrintStream;" />
 		<method name="getLogWriter()Ljava/io/PrintWriter;" />
 		<method name="getLoginTimeout()I" />
@@ -35218,7 +35198,7 @@
 	<class name="java/sql/Ref" since="1">
 		<method name="getBaseTypeName()Ljava/lang/String;" />
 		<method name="getObject()Ljava/lang/Object;" />
-		<method name="getObject(Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)Ljava/lang/Object;" />
+		<method name="getObject(Ljava/util/Map;)Ljava/lang/Object;" />
 		<method name="setObject(Ljava/lang/Object;)V" />
 	</class>
 	<class name="java/sql/ResultSet" since="1">
@@ -35279,9 +35259,9 @@
 		<method name="getNString(I)Ljava/lang/String;" since="9" />
 		<method name="getNString(Ljava/lang/String;)Ljava/lang/String;" since="9" />
 		<method name="getObject(I)Ljava/lang/Object;" />
-		<method name="getObject(ILjava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)Ljava/lang/Object;" />
+		<method name="getObject(ILjava/util/Map;)Ljava/lang/Object;" />
 		<method name="getObject(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="getObject(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)Ljava/lang/Object;" />
+		<method name="getObject(Ljava/lang/String;Ljava/util/Map;)Ljava/lang/Object;" />
 		<method name="getRef(I)Ljava/sql/Ref;" />
 		<method name="getRef(Ljava/lang/String;)Ljava/sql/Ref;" />
 		<method name="getRow()I" />
@@ -35458,24 +35438,24 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/sql/RowIdLifetime;" />
 		<method name="values()[Ljava/sql/RowIdLifetime;" />
-		<field name="ROWID_UNSUPPORTED" />
-		<field name="ROWID_VALID_FOREVER" />
-		<field name="ROWID_VALID_OTHER" />
-		<field name="ROWID_VALID_SESSION" />
-		<field name="ROWID_VALID_TRANSACTION" />
+		<field name="ROWID_UNSUPPORTED" since="14" />
+		<field name="ROWID_VALID_FOREVER" since="14" />
+		<field name="ROWID_VALID_OTHER" since="14" />
+		<field name="ROWID_VALID_SESSION" since="14" />
+		<field name="ROWID_VALID_TRANSACTION" since="14" />
 	</class>
 	<class name="java/sql/SQLClientInfoException" since="9">
 		<extends name="java/sql/SQLException" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;ILjava/util/Map&lt;java/lang/String, java$sql/ClientInfoStatus>;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;ILjava/util/Map&lt;java/lang/String, java$sql/ClientInfoStatus>;Ljava/lang/Throwable;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$sql/ClientInfoStatus>;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$sql/ClientInfoStatus>;Ljava/lang/Throwable;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$sql/ClientInfoStatus>;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$sql/ClientInfoStatus>;Ljava/lang/Throwable;)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;java/lang/String, java$sql/ClientInfoStatus>;)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;java/lang/String, java$sql/ClientInfoStatus>;Ljava/lang/Throwable;)V" />
-		<method name="getFailedProperties()Ljava/util/Map&lt;java/lang/String, java$sql/ClientInfoStatus>;" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;ILjava/util/Map;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;ILjava/util/Map;Ljava/lang/Throwable;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Throwable;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Map;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Map;Ljava/lang/Throwable;)V" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
+		<method name="&lt;init>(Ljava/util/Map;Ljava/lang/Throwable;)V" />
+		<method name="getFailedProperties()Ljava/util/Map;" />
 	</class>
 	<class name="java/sql/SQLData" since="1">
 		<method name="getSQLTypeName()Ljava/lang/String;" />
@@ -35508,7 +35488,7 @@
 		<method name="getErrorCode()I" />
 		<method name="getNextException()Ljava/sql/SQLException;" />
 		<method name="getSQLState()Ljava/lang/String;" />
-		<method name="iterator()Ljava/util/Iterator&lt;java/lang/Throwable>;" since="9" />
+		<method name="iterator()Ljava/util/Iterator;" since="9" />
 		<method name="setNextException(Ljava/sql/SQLException;)V" />
 	</class>
 	<class name="java/sql/SQLFeatureNotSupportedException" since="9">
@@ -35715,11 +35695,11 @@
 		<method name="free()V" />
 		<method name="getBinaryStream()Ljava/io/InputStream;" />
 		<method name="getCharacterStream()Ljava/io/Reader;" />
-		<method name="getSource(Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="getSource(Ljava/lang/Class;)LT;" />
 		<method name="getString()Ljava/lang/String;" />
 		<method name="setBinaryStream()Ljava/io/OutputStream;" />
 		<method name="setCharacterStream()Ljava/io/Writer;" />
-		<method name="setResult(Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="setResult(Ljava/lang/Class;)LT;" />
 		<method name="setString(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/sql/Savepoint" since="1">
@@ -35778,7 +35758,7 @@
 	</class>
 	<class name="java/sql/Struct" since="1">
 		<method name="getAttributes()[Ljava/lang/Object;" />
-		<method name="getAttributes(Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)[Ljava/lang/Object;" />
+		<method name="getAttributes(Ljava/util/Map;)[Ljava/lang/Object;" />
 		<method name="getSQLTypeName()Ljava/lang/String;" />
 	</class>
 	<class name="java/sql/Time" since="1">
@@ -35839,8 +35819,8 @@
 		<field name="VARCHAR" />
 	</class>
 	<class name="java/sql/Wrapper" since="9">
-		<method name="isWrapperFor(Ljava/lang/Class&lt;?>;)Z" />
-		<method name="unwrap(Ljava/lang/Class&lt;T>;)LT;" />
+		<method name="isWrapperFor(Ljava/lang/Class;)Z" />
+		<method name="unwrap(Ljava/lang/Class;)LT;" />
 	</class>
 	<class name="java/text/Annotation" since="1">
 		<extends name="java/lang/Object" />
@@ -35849,15 +35829,15 @@
 	</class>
 	<class name="java/text/AttributedCharacterIterator" since="1">
 		<implements name="java/text/CharacterIterator" />
-		<method name="getAllAttributeKeys()Ljava/util/Set&lt;java/text/AttributedCharacterIterator$Attribute>;" />
+		<method name="getAllAttributeKeys()Ljava/util/Set;" />
 		<method name="getAttribute(Ljava/text/AttributedCharacterIterator$Attribute;)Ljava/lang/Object;" />
-		<method name="getAttributes()Ljava/util/Map&lt;java/text/AttributedCharacterIterator$Attribute, java$lang/Object>;" />
+		<method name="getAttributes()Ljava/util/Map;" />
 		<method name="getRunLimit()I" />
 		<method name="getRunLimit(Ljava/text/AttributedCharacterIterator$Attribute;)I" />
-		<method name="getRunLimit(Ljava/util/Set&lt;? extends java/text/AttributedCharacterIterator$Attribute>;)I" />
+		<method name="getRunLimit(Ljava/util/Set;)I" />
 		<method name="getRunStart()I" />
 		<method name="getRunStart(Ljava/text/AttributedCharacterIterator$Attribute;)I" />
-		<method name="getRunStart(Ljava/util/Set&lt;? extends java/text/AttributedCharacterIterator$Attribute>;)I" />
+		<method name="getRunStart(Ljava/util/Set;)I" />
 	</class>
 	<class name="java/text/AttributedCharacterIterator$Attribute" since="1">
 		<extends name="java/lang/Object" />
@@ -35874,13 +35854,13 @@
 	<class name="java/text/AttributedString" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Map&lt;? extends java/text/AttributedCharacterIterator$Attribute, ?>;)V" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Map;)V" />
 		<method name="&lt;init>(Ljava/text/AttributedCharacterIterator;)V" />
 		<method name="&lt;init>(Ljava/text/AttributedCharacterIterator;II)V" />
 		<method name="&lt;init>(Ljava/text/AttributedCharacterIterator;II[Ljava/text/AttributedCharacterIterator$Attribute;)V" />
 		<method name="addAttribute(Ljava/text/AttributedCharacterIterator$Attribute;Ljava/lang/Object;)V" />
 		<method name="addAttribute(Ljava/text/AttributedCharacterIterator$Attribute;Ljava/lang/Object;II)V" />
-		<method name="addAttributes(Ljava/util/Map&lt;? extends java/text/AttributedCharacterIterator$Attribute, ?>;II)V" />
+		<method name="addAttributes(Ljava/util/Map;II)V" />
 		<method name="getIterator()Ljava/text/AttributedCharacterIterator;" />
 		<method name="getIterator([Ljava/text/AttributedCharacterIterator$Attribute;)Ljava/text/AttributedCharacterIterator;" />
 		<method name="getIterator([Ljava/text/AttributedCharacterIterator$Attribute;II)Ljava/text/AttributedCharacterIterator;" />
@@ -36260,10 +36240,10 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/text/Normalizer$Form;" />
 		<method name="values()[Ljava/text/Normalizer$Form;" />
-		<field name="NFC" />
-		<field name="NFD" />
-		<field name="NFKC" />
-		<field name="NFKD" />
+		<field name="NFC" since="14" />
+		<field name="NFD" since="14" />
+		<field name="NFKC" since="14" />
+		<field name="NFKD" since="14" />
 	</class>
 	<class name="java/text/NumberFormat" since="1">
 		<extends name="java/text/Format" />
@@ -36384,15 +36364,15 @@
 		<implements name="java/util/Collection" />
 		<method name="&lt;init>()V" />
 		<method name="add(LE;)Z" />
-		<method name="addAll(Ljava/util/Collection&lt;? extends E>;)Z" />
+		<method name="addAll(Ljava/util/Collection;)Z" />
 		<method name="clear()V" />
 		<method name="contains(Ljava/lang/Object;)Z" />
-		<method name="containsAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="containsAll(Ljava/util/Collection;)Z" />
 		<method name="isEmpty()Z" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="remove(Ljava/lang/Object;)Z" />
-		<method name="removeAll(Ljava/util/Collection&lt;?>;)Z" />
-		<method name="retainAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="removeAll(Ljava/util/Collection;)Z" />
+		<method name="retainAll(Ljava/util/Collection;)Z" />
 		<method name="size()I" />
 		<method name="toArray()[Ljava/lang/Object;" />
 		<method name="toArray([LT;)[LT;" />
@@ -36402,17 +36382,17 @@
 		<implements name="java/util/List" />
 		<method name="&lt;init>()V" />
 		<method name="add(ILE;)V" />
-		<method name="addAll(ILjava/util/Collection&lt;? extends E>;)Z" />
+		<method name="addAll(ILjava/util/Collection;)Z" />
 		<method name="get(I)LE;" />
 		<method name="indexOf(Ljava/lang/Object;)I" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="lastIndexOf(Ljava/lang/Object;)I" />
-		<method name="listIterator()Ljava/util/ListIterator&lt;E>;" />
-		<method name="listIterator(I)Ljava/util/ListIterator&lt;E>;" />
+		<method name="listIterator()Ljava/util/ListIterator;" />
+		<method name="listIterator(I)Ljava/util/ListIterator;" />
 		<method name="remove(I)LE;" />
 		<method name="removeRange(II)V" />
 		<method name="set(ILE;)LE;" />
-		<method name="subList(II)Ljava/util/List&lt;E>;" />
+		<method name="subList(II)Ljava/util/List;" />
 		<field name="modCount" />
 	</class>
 	<class name="java/util/AbstractMap" since="1">
@@ -36422,22 +36402,22 @@
 		<method name="clear()V" />
 		<method name="containsKey(Ljava/lang/Object;)Z" />
 		<method name="containsValue(Ljava/lang/Object;)Z" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
+		<method name="entrySet()Ljava/util/Set;" />
 		<method name="get(Ljava/lang/Object;)LV;" />
 		<method name="isEmpty()Z" />
-		<method name="keySet()Ljava/util/Set&lt;K>;" />
+		<method name="keySet()Ljava/util/Set;" />
 		<method name="put(LK;LV;)LV;" />
-		<method name="putAll(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
+		<method name="putAll(Ljava/util/Map;)V" />
 		<method name="remove(Ljava/lang/Object;)LV;" />
 		<method name="size()I" />
-		<method name="values()Ljava/util/Collection&lt;V>;" />
+		<method name="values()Ljava/util/Collection;" />
 	</class>
 	<class name="java/util/AbstractMap$SimpleEntry" since="9">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/Map$Entry" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(LK;LV;)V" />
-		<method name="&lt;init>(Ljava/util/Map$Entry&lt;? extends K, ? extends V>;)V" />
+		<method name="&lt;init>(Ljava/util/Map$Entry;)V" />
 		<method name="getKey()LK;" />
 		<method name="getValue()LV;" />
 		<method name="setValue(LV;)LV;" />
@@ -36447,7 +36427,7 @@
 		<implements name="java/util/Map$Entry" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(LK;LV;)V" />
-		<method name="&lt;init>(Ljava/util/Map$Entry&lt;? extends K, ? extends V>;)V" />
+		<method name="&lt;init>(Ljava/util/Map$Entry;)V" />
 		<method name="getKey()LK;" />
 		<method name="getValue()LV;" />
 		<method name="setValue(LV;)LV;" />
@@ -36463,7 +36443,7 @@
 		<extends name="java/util/AbstractList" />
 		<method name="&lt;init>()V" />
 		<method name="get(I)LE;" />
-		<method name="listIterator(I)Ljava/util/ListIterator&lt;E>;" />
+		<method name="listIterator(I)Ljava/util/ListIterator;" />
 	</class>
 	<class name="java/util/AbstractSet" since="1">
 		<extends name="java/util/AbstractCollection" />
@@ -36477,15 +36457,15 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
 		<method name="addFirst(LE;)V" />
 		<method name="addLast(LE;)V" />
-		<method name="clone()Ljava/util/ArrayDeque&lt;E>;" />
-		<method name="descendingIterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="clone()Ljava/util/ArrayDeque;" />
+		<method name="descendingIterator()Ljava/util/Iterator;" />
 		<method name="element()LE;" />
 		<method name="getFirst()LE;" />
 		<method name="getLast()LE;" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="offerFirst(LE;)Z" />
 		<method name="offerLast(LE;)Z" />
@@ -36512,7 +36492,7 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
 		<method name="clone()Ljava/lang/Object;" />
 		<method name="ensureCapacity(I)V" />
 		<method name="get(I)LE;" />
@@ -36521,7 +36501,7 @@
 	</class>
 	<class name="java/util/Arrays" since="1">
 		<extends name="java/lang/Object" />
-		<method name="asList([LT;)Ljava/util/List&lt;T>;" />
+		<method name="asList([LT;)Ljava/util/List;" />
 		<method name="binarySearch([BB)I" />
 		<method name="binarySearch([BIIB)I" since="9" />
 		<method name="binarySearch([CC)I" />
@@ -36534,8 +36514,8 @@
 		<method name="binarySearch([IIII)I" since="9" />
 		<method name="binarySearch([JIIJ)I" since="9" />
 		<method name="binarySearch([JJ)I" />
-		<method name="binarySearch([LT;IILT;Ljava/util/Comparator&lt;? super T>;)I" since="9" />
-		<method name="binarySearch([LT;LT;Ljava/util/Comparator&lt;? super T>;)I" />
+		<method name="binarySearch([LT;IILT;Ljava/util/Comparator;)I" since="9" />
+		<method name="binarySearch([LT;LT;Ljava/util/Comparator;)I" />
 		<method name="binarySearch([Ljava/lang/Object;IILjava/lang/Object;)I" since="9" />
 		<method name="binarySearch([Ljava/lang/Object;Ljava/lang/Object;)I" />
 		<method name="binarySearch([SIIS)I" since="9" />
@@ -36547,7 +36527,7 @@
 		<method name="copyOf([II)[I" since="9" />
 		<method name="copyOf([JI)[J" since="9" />
 		<method name="copyOf([LT;I)[LT;" since="9" />
-		<method name="copyOf([LU;ILjava/lang/Class&lt;? extends T[]>;)[LT;" since="9" />
+		<method name="copyOf([LU;ILjava/lang/Class;)[LT;" since="9" />
 		<method name="copyOf([SI)[S" since="9" />
 		<method name="copyOf([ZI)[Z" since="9" />
 		<method name="copyOfRange([BII)[B" since="9" />
@@ -36557,7 +36537,7 @@
 		<method name="copyOfRange([III)[I" since="9" />
 		<method name="copyOfRange([JII)[J" since="9" />
 		<method name="copyOfRange([LT;II)[LT;" since="9" />
-		<method name="copyOfRange([LU;IILjava/lang/Class&lt;? extends T[]>;)[LT;" since="9" />
+		<method name="copyOfRange([LU;IILjava/lang/Class;)[LT;" since="9" />
 		<method name="copyOfRange([SII)[S" since="9" />
 		<method name="copyOfRange([ZII)[Z" since="9" />
 		<method name="deepEquals([Ljava/lang/Object;[Ljava/lang/Object;)Z" />
@@ -36611,8 +36591,8 @@
 		<method name="sort([III)V" />
 		<method name="sort([J)V" />
 		<method name="sort([JII)V" />
-		<method name="sort([LT;IILjava/util/Comparator&lt;? super T>;)V" />
-		<method name="sort([LT;Ljava/util/Comparator&lt;? super T>;)V" />
+		<method name="sort([LT;IILjava/util/Comparator;)V" />
+		<method name="sort([LT;Ljava/util/Comparator;)V" />
 		<method name="sort([Ljava/lang/Object;)V" />
 		<method name="sort([Ljava/lang/Object;II)V" />
 		<method name="sort([S)V" />
@@ -36679,7 +36659,7 @@
 		<method name="getActualMinimum(I)I" />
 		<method name="getAvailableLocales()[Ljava/util/Locale;" />
 		<method name="getDisplayName(IILjava/util/Locale;)Ljava/lang/String;" since="9" />
-		<method name="getDisplayNames(IILjava/util/Locale;)Ljava/util/Map&lt;java/lang/String, java$lang/Integer>;" since="9" />
+		<method name="getDisplayNames(IILjava/util/Locale;)Ljava/util/Map;" since="9" />
 		<method name="getFirstDayOfWeek()I" />
 		<method name="getGreatestMinimum(I)I" />
 		<method name="getInstance()Ljava/util/Calendar;" />
@@ -36761,75 +36741,75 @@
 	<class name="java/util/Collection" since="1">
 		<implements name="java/lang/Iterable" />
 		<method name="add(LE;)Z" />
-		<method name="addAll(Ljava/util/Collection&lt;? extends E>;)Z" />
+		<method name="addAll(Ljava/util/Collection;)Z" />
 		<method name="clear()V" />
 		<method name="contains(Ljava/lang/Object;)Z" />
-		<method name="containsAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="containsAll(Ljava/util/Collection;)Z" />
 		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="hashCode()I" />
 		<method name="isEmpty()Z" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="remove(Ljava/lang/Object;)Z" />
-		<method name="removeAll(Ljava/util/Collection&lt;?>;)Z" />
-		<method name="retainAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="removeAll(Ljava/util/Collection;)Z" />
+		<method name="retainAll(Ljava/util/Collection;)Z" />
 		<method name="size()I" />
 		<method name="toArray()[Ljava/lang/Object;" />
 		<method name="toArray([LT;)[LT;" />
 	</class>
 	<class name="java/util/Collections" since="1">
 		<extends name="java/lang/Object" />
-		<method name="addAll(Ljava/util/Collection&lt;? super T>;[LT;)Z" />
-		<method name="asLifoQueue(Ljava/util/Deque&lt;T>;)Ljava/util/Queue&lt;T>;" since="9" />
-		<method name="binarySearch(Ljava/util/List&lt;? extends T>;LT;Ljava/util/Comparator&lt;? super T>;)I" />
-		<method name="binarySearch(Ljava/util/List&lt;? extends java/lang/Comparable&lt;? super T>>;LT;)I" />
-		<method name="checkedCollection(Ljava/util/Collection&lt;E>;Ljava/lang/Class&lt;E>;)Ljava/util/Collection&lt;E>;" />
-		<method name="checkedList(Ljava/util/List&lt;E>;Ljava/lang/Class&lt;E>;)Ljava/util/List&lt;E>;" />
-		<method name="checkedMap(Ljava/util/Map&lt;K, V>;Ljava/lang/Class&lt;K>;Ljava/lang/Class&lt;V>;)Ljava/util/Map&lt;K, V>;" />
-		<method name="checkedSet(Ljava/util/Set&lt;E>;Ljava/lang/Class&lt;E>;)Ljava/util/Set&lt;E>;" />
-		<method name="checkedSortedMap(Ljava/util/SortedMap&lt;K, V>;Ljava/lang/Class&lt;K>;Ljava/lang/Class&lt;V>;)Ljava/util/SortedMap&lt;K, V>;" />
-		<method name="checkedSortedSet(Ljava/util/SortedSet&lt;E>;Ljava/lang/Class&lt;E>;)Ljava/util/SortedSet&lt;E>;" />
-		<method name="copy(Ljava/util/List&lt;? super T>;Ljava/util/List&lt;? extends T>;)V" />
-		<method name="disjoint(Ljava/util/Collection&lt;?>;Ljava/util/Collection&lt;?>;)Z" />
-		<method name="emptyList()Ljava/util/List&lt;T>;" />
-		<method name="emptyMap()Ljava/util/Map&lt;K, V>;" />
-		<method name="emptySet()Ljava/util/Set&lt;T>;" />
-		<method name="enumeration(Ljava/util/Collection&lt;T>;)Ljava/util/Enumeration&lt;T>;" />
-		<method name="fill(Ljava/util/List&lt;? super T>;LT;)V" />
-		<method name="frequency(Ljava/util/Collection&lt;?>;Ljava/lang/Object;)I" />
-		<method name="indexOfSubList(Ljava/util/List&lt;?>;Ljava/util/List&lt;?>;)I" />
-		<method name="lastIndexOfSubList(Ljava/util/List&lt;?>;Ljava/util/List&lt;?>;)I" />
-		<method name="list(Ljava/util/Enumeration&lt;T>;)Ljava/util/ArrayList&lt;T>;" />
-		<method name="max(Ljava/util/Collection&lt;? extends T>;)LT;" />
-		<method name="max(Ljava/util/Collection&lt;? extends T>;Ljava/util/Comparator&lt;? super T>;)LT;" />
-		<method name="min(Ljava/util/Collection&lt;? extends T>;)LT;" />
-		<method name="min(Ljava/util/Collection&lt;? extends T>;Ljava/util/Comparator&lt;? super T>;)LT;" />
-		<method name="nCopies(ILT;)Ljava/util/List&lt;T>;" />
-		<method name="newSetFromMap(Ljava/util/Map&lt;E, java$lang/Boolean>;)Ljava/util/Set&lt;E>;" since="9" />
-		<method name="replaceAll(Ljava/util/List&lt;T>;LT;LT;)Z" />
-		<method name="reverse(Ljava/util/List&lt;?>;)V" />
-		<method name="reverseOrder()Ljava/util/Comparator&lt;T>;" />
-		<method name="reverseOrder(Ljava/util/Comparator&lt;T>;)Ljava/util/Comparator&lt;T>;" />
-		<method name="rotate(Ljava/util/List&lt;?>;I)V" />
-		<method name="shuffle(Ljava/util/List&lt;?>;)V" />
-		<method name="shuffle(Ljava/util/List&lt;?>;Ljava/util/Random;)V" />
-		<method name="singleton(LE;)Ljava/util/Set&lt;E>;" />
-		<method name="singletonList(LE;)Ljava/util/List&lt;E>;" />
-		<method name="singletonMap(LK;LV;)Ljava/util/Map&lt;K, V>;" />
-		<method name="sort(Ljava/util/List&lt;T>;)V" />
-		<method name="sort(Ljava/util/List&lt;T>;Ljava/util/Comparator&lt;? super T>;)V" />
-		<method name="swap(Ljava/util/List&lt;?>;II)V" />
-		<method name="synchronizedCollection(Ljava/util/Collection&lt;T>;)Ljava/util/Collection&lt;T>;" />
-		<method name="synchronizedList(Ljava/util/List&lt;T>;)Ljava/util/List&lt;T>;" />
-		<method name="synchronizedMap(Ljava/util/Map&lt;K, V>;)Ljava/util/Map&lt;K, V>;" />
-		<method name="synchronizedSet(Ljava/util/Set&lt;E>;)Ljava/util/Set&lt;E>;" />
-		<method name="synchronizedSortedMap(Ljava/util/SortedMap&lt;K, V>;)Ljava/util/SortedMap&lt;K, V>;" />
-		<method name="synchronizedSortedSet(Ljava/util/SortedSet&lt;E>;)Ljava/util/SortedSet&lt;E>;" />
-		<method name="unmodifiableCollection(Ljava/util/Collection&lt;? extends E>;)Ljava/util/Collection&lt;E>;" />
-		<method name="unmodifiableList(Ljava/util/List&lt;? extends E>;)Ljava/util/List&lt;E>;" />
-		<method name="unmodifiableMap(Ljava/util/Map&lt;? extends K, ? extends V>;)Ljava/util/Map&lt;K, V>;" />
-		<method name="unmodifiableSet(Ljava/util/Set&lt;? extends E>;)Ljava/util/Set&lt;E>;" />
-		<method name="unmodifiableSortedMap(Ljava/util/SortedMap&lt;K, ? extends V>;)Ljava/util/SortedMap&lt;K, V>;" />
-		<method name="unmodifiableSortedSet(Ljava/util/SortedSet&lt;E>;)Ljava/util/SortedSet&lt;E>;" />
+		<method name="addAll(Ljava/util/Collection;[LT;)Z" />
+		<method name="asLifoQueue(Ljava/util/Deque;)Ljava/util/Queue;" since="9" />
+		<method name="binarySearch(Ljava/util/List;LT;)I" />
+		<method name="binarySearch(Ljava/util/List;LT;Ljava/util/Comparator;)I" />
+		<method name="checkedCollection(Ljava/util/Collection;Ljava/lang/Class;)Ljava/util/Collection;" />
+		<method name="checkedList(Ljava/util/List;Ljava/lang/Class;)Ljava/util/List;" />
+		<method name="checkedMap(Ljava/util/Map;Ljava/lang/Class;Ljava/lang/Class;)Ljava/util/Map;" />
+		<method name="checkedSet(Ljava/util/Set;Ljava/lang/Class;)Ljava/util/Set;" />
+		<method name="checkedSortedMap(Ljava/util/SortedMap;Ljava/lang/Class;Ljava/lang/Class;)Ljava/util/SortedMap;" />
+		<method name="checkedSortedSet(Ljava/util/SortedSet;Ljava/lang/Class;)Ljava/util/SortedSet;" />
+		<method name="copy(Ljava/util/List;Ljava/util/List;)V" />
+		<method name="disjoint(Ljava/util/Collection;Ljava/util/Collection;)Z" />
+		<method name="emptyList()Ljava/util/List;" />
+		<method name="emptyMap()Ljava/util/Map;" />
+		<method name="emptySet()Ljava/util/Set;" />
+		<method name="enumeration(Ljava/util/Collection;)Ljava/util/Enumeration;" />
+		<method name="fill(Ljava/util/List;LT;)V" />
+		<method name="frequency(Ljava/util/Collection;Ljava/lang/Object;)I" />
+		<method name="indexOfSubList(Ljava/util/List;Ljava/util/List;)I" />
+		<method name="lastIndexOfSubList(Ljava/util/List;Ljava/util/List;)I" />
+		<method name="list(Ljava/util/Enumeration;)Ljava/util/ArrayList;" />
+		<method name="max(Ljava/util/Collection;)LT;" />
+		<method name="max(Ljava/util/Collection;Ljava/util/Comparator;)LT;" />
+		<method name="min(Ljava/util/Collection;)LT;" />
+		<method name="min(Ljava/util/Collection;Ljava/util/Comparator;)LT;" />
+		<method name="nCopies(ILT;)Ljava/util/List;" />
+		<method name="newSetFromMap(Ljava/util/Map;)Ljava/util/Set;" since="9" />
+		<method name="replaceAll(Ljava/util/List;LT;LT;)Z" />
+		<method name="reverse(Ljava/util/List;)V" />
+		<method name="reverseOrder()Ljava/util/Comparator;" />
+		<method name="reverseOrder(Ljava/util/Comparator;)Ljava/util/Comparator;" />
+		<method name="rotate(Ljava/util/List;I)V" />
+		<method name="shuffle(Ljava/util/List;)V" />
+		<method name="shuffle(Ljava/util/List;Ljava/util/Random;)V" />
+		<method name="singleton(LE;)Ljava/util/Set;" />
+		<method name="singletonList(LE;)Ljava/util/List;" />
+		<method name="singletonMap(LK;LV;)Ljava/util/Map;" />
+		<method name="sort(Ljava/util/List;)V" />
+		<method name="sort(Ljava/util/List;Ljava/util/Comparator;)V" />
+		<method name="swap(Ljava/util/List;II)V" />
+		<method name="synchronizedCollection(Ljava/util/Collection;)Ljava/util/Collection;" />
+		<method name="synchronizedList(Ljava/util/List;)Ljava/util/List;" />
+		<method name="synchronizedMap(Ljava/util/Map;)Ljava/util/Map;" />
+		<method name="synchronizedSet(Ljava/util/Set;)Ljava/util/Set;" />
+		<method name="synchronizedSortedMap(Ljava/util/SortedMap;)Ljava/util/SortedMap;" />
+		<method name="synchronizedSortedSet(Ljava/util/SortedSet;)Ljava/util/SortedSet;" />
+		<method name="unmodifiableCollection(Ljava/util/Collection;)Ljava/util/Collection;" />
+		<method name="unmodifiableList(Ljava/util/List;)Ljava/util/List;" />
+		<method name="unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;" />
+		<method name="unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;" />
+		<method name="unmodifiableSortedMap(Ljava/util/SortedMap;)Ljava/util/SortedMap;" />
+		<method name="unmodifiableSortedSet(Ljava/util/SortedSet;)Ljava/util/SortedSet;" />
 		<field name="EMPTY_LIST" />
 		<field name="EMPTY_MAP" />
 		<field name="EMPTY_SET" />
@@ -36895,11 +36875,11 @@
 		<method name="addFirst(LE;)V" />
 		<method name="addLast(LE;)V" />
 		<method name="contains(Ljava/lang/Object;)Z" since="11" />
-		<method name="descendingIterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="descendingIterator()Ljava/util/Iterator;" />
 		<method name="element()LE;" since="11" />
 		<method name="getFirst()LE;" />
 		<method name="getLast()LE;" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" since="11" />
+		<method name="iterator()Ljava/util/Iterator;" since="11" />
 		<method name="offer(LE;)Z" since="11" />
 		<method name="offerFirst(LE;)Z" />
 		<method name="offerLast(LE;)Z" />
@@ -36922,10 +36902,10 @@
 	<class name="java/util/Dictionary" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="elements()Ljava/util/Enumeration&lt;V>;" />
+		<method name="elements()Ljava/util/Enumeration;" />
 		<method name="get(Ljava/lang/Object;)LV;" />
 		<method name="isEmpty()Z" />
-		<method name="keys()Ljava/util/Enumeration&lt;K>;" />
+		<method name="keys()Ljava/util/Enumeration;" />
 		<method name="put(LK;LV;)LV;" />
 		<method name="remove(Ljava/lang/Object;)LV;" />
 		<method name="size()I" />
@@ -36944,29 +36924,29 @@
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/Map" />
 		<implements name="java/io/Serializable" />
-		<method name="&lt;init>(Ljava/lang/Class&lt;K>;)V" />
-		<method name="&lt;init>(Ljava/util/EnumMap&lt;K, ? extends V>;)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;K, ? extends V>;)V" />
-		<method name="clone()Ljava/util/EnumMap&lt;K, V>;" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
+		<method name="&lt;init>(Ljava/lang/Class;)V" />
+		<method name="&lt;init>(Ljava/util/EnumMap;)V" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
+		<method name="clone()Ljava/util/EnumMap;" />
+		<method name="entrySet()Ljava/util/Set;" />
 	</class>
 	<class name="java/util/EnumSet" since="1">
 		<extends name="java/util/AbstractSet" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
-		<method name="allOf(Ljava/lang/Class&lt;E>;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="clone()Ljava/util/EnumSet&lt;E>;" />
-		<method name="complementOf(Ljava/util/EnumSet&lt;E>;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="copyOf(Ljava/util/Collection&lt;E>;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="copyOf(Ljava/util/EnumSet&lt;E>;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="noneOf(Ljava/lang/Class&lt;E>;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="of(LE;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="of(LE;LE;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="of(LE;LE;LE;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="of(LE;LE;LE;LE;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="of(LE;LE;LE;LE;LE;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="of(LE;[LE;)Ljava/util/EnumSet&lt;E>;" />
-		<method name="range(LE;LE;)Ljava/util/EnumSet&lt;E>;" />
+		<method name="allOf(Ljava/lang/Class;)Ljava/util/EnumSet;" />
+		<method name="clone()Ljava/util/EnumSet;" />
+		<method name="complementOf(Ljava/util/EnumSet;)Ljava/util/EnumSet;" />
+		<method name="copyOf(Ljava/util/Collection;)Ljava/util/EnumSet;" />
+		<method name="copyOf(Ljava/util/EnumSet;)Ljava/util/EnumSet;" />
+		<method name="noneOf(Ljava/lang/Class;)Ljava/util/EnumSet;" />
+		<method name="of(LE;)Ljava/util/EnumSet;" />
+		<method name="of(LE;LE;)Ljava/util/EnumSet;" />
+		<method name="of(LE;LE;LE;)Ljava/util/EnumSet;" />
+		<method name="of(LE;LE;LE;LE;)Ljava/util/EnumSet;" />
+		<method name="of(LE;LE;LE;LE;LE;)Ljava/util/EnumSet;" />
+		<method name="of(LE;[LE;)Ljava/util/EnumSet;" />
+		<method name="range(LE;LE;)Ljava/util/EnumSet;" />
 	</class>
 	<class name="java/util/Enumeration" since="1">
 		<method name="hasMoreElements()Z" />
@@ -37033,8 +37013,8 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/util/Formatter$BigDecimalLayoutForm;" />
 		<method name="values()[Ljava/util/Formatter$BigDecimalLayoutForm;" />
-		<field name="DECIMAL_FLOAT" />
-		<field name="SCIENTIFIC" />
+		<field name="DECIMAL_FLOAT" since="14" />
+		<field name="SCIENTIFIC" since="14" />
 	</class>
 	<class name="java/util/FormatterClosedException" since="1">
 		<extends name="java/lang/IllegalStateException" />
@@ -37072,9 +37052,9 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
 		<method name="clone()Ljava/lang/Object;" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
+		<method name="entrySet()Ljava/util/Set;" />
 	</class>
 	<class name="java/util/HashSet" since="1">
 		<extends name="java/util/AbstractSet" />
@@ -37084,9 +37064,9 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
 		<method name="clone()Ljava/lang/Object;" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="size()I" />
 	</class>
 	<class name="java/util/Hashtable" since="1">
@@ -37097,24 +37077,24 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
 		<method name="clear()V" />
 		<method name="clone()Ljava/lang/Object;" />
 		<method name="contains(Ljava/lang/Object;)Z" />
 		<method name="containsKey(Ljava/lang/Object;)Z" />
 		<method name="containsValue(Ljava/lang/Object;)Z" />
-		<method name="elements()Ljava/util/Enumeration&lt;V>;" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
+		<method name="elements()Ljava/util/Enumeration;" />
+		<method name="entrySet()Ljava/util/Set;" />
 		<method name="get(Ljava/lang/Object;)LV;" />
 		<method name="isEmpty()Z" />
-		<method name="keySet()Ljava/util/Set&lt;K>;" />
-		<method name="keys()Ljava/util/Enumeration&lt;K>;" />
+		<method name="keySet()Ljava/util/Set;" />
+		<method name="keys()Ljava/util/Enumeration;" />
 		<method name="put(LK;LV;)LV;" />
-		<method name="putAll(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
+		<method name="putAll(Ljava/util/Map;)V" />
 		<method name="rehash()V" />
 		<method name="remove(Ljava/lang/Object;)LV;" />
 		<method name="size()I" />
-		<method name="values()Ljava/util/Collection&lt;V>;" />
+		<method name="values()Ljava/util/Collection;" />
 	</class>
 	<class name="java/util/IdentityHashMap" since="1">
 		<extends name="java/util/AbstractMap" />
@@ -37123,9 +37103,9 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
 		<method name="clone()Ljava/lang/Object;" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
+		<method name="entrySet()Ljava/util/Set;" />
 	</class>
 	<class name="java/util/IllegalFormatCodePointException" since="1">
 		<extends name="java/util/IllegalFormatException" />
@@ -37136,8 +37116,8 @@
 	<class name="java/util/IllegalFormatConversionException" since="1">
 		<extends name="java/util/IllegalFormatException" />
 		<implements name="java/io/Serializable" />
-		<method name="&lt;init>(CLjava/lang/Class&lt;?>;)V" />
-		<method name="getArgumentClass()Ljava/lang/Class&lt;?>;" />
+		<method name="&lt;init>(CLjava/lang/Class;)V" />
+		<method name="getArgumentClass()Ljava/lang/Class;" />
 		<method name="getConversion()C" />
 	</class>
 	<class name="java/util/IllegalFormatException" since="1">
@@ -37182,8 +37162,8 @@
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" />
 		<method name="&lt;init>(IFZ)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
-		<method name="removeEldestEntry(Ljava/util/Map$Entry&lt;K, V>;)Z" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
+		<method name="removeEldestEntry(Ljava/util/Map$Entry;)Z" />
 	</class>
 	<class name="java/util/LinkedHashSet" since="1">
 		<extends name="java/util/HashSet" />
@@ -37193,7 +37173,7 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
 	</class>
 	<class name="java/util/LinkedList" since="1">
 		<extends name="java/util/AbstractSequentialList" />
@@ -37203,15 +37183,15 @@
 		<implements name="java/io/Serializable" />
 		<implements name="java/util/Deque" since="9" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
 		<method name="addFirst(LE;)V" />
 		<method name="addLast(LE;)V" />
 		<method name="clone()Ljava/lang/Object;" />
-		<method name="descendingIterator()Ljava/util/Iterator&lt;E>;" since="9" />
+		<method name="descendingIterator()Ljava/util/Iterator;" since="9" />
 		<method name="element()LE;" />
 		<method name="getFirst()LE;" />
 		<method name="getLast()LE;" />
-		<method name="listIterator(I)Ljava/util/ListIterator&lt;E>;" />
+		<method name="listIterator(I)Ljava/util/ListIterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="offerFirst(LE;)Z" since="9" />
 		<method name="offerLast(LE;)Z" since="9" />
@@ -37234,27 +37214,27 @@
 		<implements name="java/util/Collection" />
 		<method name="add(ILE;)V" />
 		<method name="add(LE;)Z" />
-		<method name="addAll(ILjava/util/Collection&lt;? extends E>;)Z" />
-		<method name="addAll(Ljava/util/Collection&lt;? extends E>;)Z" />
+		<method name="addAll(ILjava/util/Collection;)Z" />
+		<method name="addAll(Ljava/util/Collection;)Z" />
 		<method name="clear()V" />
 		<method name="contains(Ljava/lang/Object;)Z" />
-		<method name="containsAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="containsAll(Ljava/util/Collection;)Z" />
 		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="get(I)LE;" />
 		<method name="hashCode()I" />
 		<method name="indexOf(Ljava/lang/Object;)I" />
 		<method name="isEmpty()Z" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="lastIndexOf(Ljava/lang/Object;)I" />
-		<method name="listIterator()Ljava/util/ListIterator&lt;E>;" />
-		<method name="listIterator(I)Ljava/util/ListIterator&lt;E>;" />
+		<method name="listIterator()Ljava/util/ListIterator;" />
+		<method name="listIterator(I)Ljava/util/ListIterator;" />
 		<method name="remove(I)LE;" />
 		<method name="remove(Ljava/lang/Object;)Z" />
-		<method name="removeAll(Ljava/util/Collection&lt;?>;)Z" />
-		<method name="retainAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="removeAll(Ljava/util/Collection;)Z" />
+		<method name="retainAll(Ljava/util/Collection;)Z" />
 		<method name="set(ILE;)LE;" />
 		<method name="size()I" />
-		<method name="subList(II)Ljava/util/List&lt;E>;" />
+		<method name="subList(II)Ljava/util/List;" />
 		<method name="toArray()[Ljava/lang/Object;" />
 		<method name="toArray([LT;)[LT;" />
 	</class>
@@ -37274,7 +37254,7 @@
 		<extends name="java/util/ResourceBundle" />
 		<method name="&lt;init>()V" />
 		<method name="getContents()[[Ljava/lang/Object;" />
-		<method name="getKeys()Ljava/util/Enumeration&lt;java/lang/String>;" />
+		<method name="getKeys()Ljava/util/Enumeration;" />
 		<method name="handleGetObject(Ljava/lang/String;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/Locale" since="1">
@@ -37331,17 +37311,17 @@
 		<method name="clear()V" />
 		<method name="containsKey(Ljava/lang/Object;)Z" />
 		<method name="containsValue(Ljava/lang/Object;)Z" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
+		<method name="entrySet()Ljava/util/Set;" />
 		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="get(Ljava/lang/Object;)LV;" />
 		<method name="hashCode()I" />
 		<method name="isEmpty()Z" />
-		<method name="keySet()Ljava/util/Set&lt;K>;" />
+		<method name="keySet()Ljava/util/Set;" />
 		<method name="put(LK;LV;)LV;" />
-		<method name="putAll(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
+		<method name="putAll(Ljava/util/Map;)V" />
 		<method name="remove(Ljava/lang/Object;)LV;" />
 		<method name="size()I" />
-		<method name="values()Ljava/util/Collection&lt;V>;" />
+		<method name="values()Ljava/util/Collection;" />
 	</class>
 	<class name="java/util/Map$Entry" since="1">
 		<method name="equals(Ljava/lang/Object;)Z" />
@@ -37368,45 +37348,45 @@
 	</class>
 	<class name="java/util/NavigableMap" since="9">
 		<implements name="java/util/SortedMap" />
-		<method name="ceilingEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="ceilingEntry(LK;)Ljava/util/Map$Entry;" />
 		<method name="ceilingKey(LK;)LK;" />
-		<method name="descendingKeySet()Ljava/util/NavigableSet&lt;K>;" />
-		<method name="descendingMap()Ljava/util/NavigableMap&lt;K, V>;" />
-		<method name="firstEntry()Ljava/util/Map$Entry&lt;K, V>;" />
-		<method name="floorEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="descendingKeySet()Ljava/util/NavigableSet;" />
+		<method name="descendingMap()Ljava/util/NavigableMap;" />
+		<method name="firstEntry()Ljava/util/Map$Entry;" />
+		<method name="floorEntry(LK;)Ljava/util/Map$Entry;" />
 		<method name="floorKey(LK;)LK;" />
-		<method name="headMap(LK;)Ljava/util/SortedMap&lt;K, V>;" since="11" />
-		<method name="headMap(LK;Z)Ljava/util/NavigableMap&lt;K, V>;" />
-		<method name="higherEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="headMap(LK;)Ljava/util/SortedMap;" since="11" />
+		<method name="headMap(LK;Z)Ljava/util/NavigableMap;" />
+		<method name="higherEntry(LK;)Ljava/util/Map$Entry;" />
 		<method name="higherKey(LK;)LK;" />
-		<method name="lastEntry()Ljava/util/Map$Entry&lt;K, V>;" />
-		<method name="lowerEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="lastEntry()Ljava/util/Map$Entry;" />
+		<method name="lowerEntry(LK;)Ljava/util/Map$Entry;" />
 		<method name="lowerKey(LK;)LK;" />
-		<method name="navigableKeySet()Ljava/util/NavigableSet&lt;K>;" />
-		<method name="pollFirstEntry()Ljava/util/Map$Entry&lt;K, V>;" />
-		<method name="pollLastEntry()Ljava/util/Map$Entry&lt;K, V>;" />
-		<method name="subMap(LK;LK;)Ljava/util/SortedMap&lt;K, V>;" since="11" />
-		<method name="subMap(LK;ZLK;Z)Ljava/util/NavigableMap&lt;K, V>;" />
-		<method name="tailMap(LK;)Ljava/util/SortedMap&lt;K, V>;" since="11" />
-		<method name="tailMap(LK;Z)Ljava/util/NavigableMap&lt;K, V>;" />
+		<method name="navigableKeySet()Ljava/util/NavigableSet;" />
+		<method name="pollFirstEntry()Ljava/util/Map$Entry;" />
+		<method name="pollLastEntry()Ljava/util/Map$Entry;" />
+		<method name="subMap(LK;LK;)Ljava/util/SortedMap;" since="11" />
+		<method name="subMap(LK;ZLK;Z)Ljava/util/NavigableMap;" />
+		<method name="tailMap(LK;)Ljava/util/SortedMap;" since="11" />
+		<method name="tailMap(LK;Z)Ljava/util/NavigableMap;" />
 	</class>
 	<class name="java/util/NavigableSet" since="9">
 		<implements name="java/util/SortedSet" />
 		<method name="ceiling(LE;)LE;" />
-		<method name="descendingIterator()Ljava/util/Iterator&lt;E>;" />
-		<method name="descendingSet()Ljava/util/NavigableSet&lt;E>;" />
+		<method name="descendingIterator()Ljava/util/Iterator;" />
+		<method name="descendingSet()Ljava/util/NavigableSet;" />
 		<method name="floor(LE;)LE;" />
-		<method name="headSet(LE;)Ljava/util/SortedSet&lt;E>;" since="11" />
-		<method name="headSet(LE;Z)Ljava/util/NavigableSet&lt;E>;" />
+		<method name="headSet(LE;)Ljava/util/SortedSet;" since="11" />
+		<method name="headSet(LE;Z)Ljava/util/NavigableSet;" />
 		<method name="higher(LE;)LE;" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" since="11" />
+		<method name="iterator()Ljava/util/Iterator;" since="11" />
 		<method name="lower(LE;)LE;" />
 		<method name="pollFirst()LE;" />
 		<method name="pollLast()LE;" />
-		<method name="subSet(LE;LE;)Ljava/util/SortedSet&lt;E>;" since="11" />
-		<method name="subSet(LE;ZLE;Z)Ljava/util/NavigableSet&lt;E>;" />
-		<method name="tailSet(LE;)Ljava/util/SortedSet&lt;E>;" since="11" />
-		<method name="tailSet(LE;Z)Ljava/util/NavigableSet&lt;E>;" />
+		<method name="subSet(LE;LE;)Ljava/util/SortedSet;" since="11" />
+		<method name="subSet(LE;ZLE;Z)Ljava/util/NavigableSet;" />
+		<method name="tailSet(LE;)Ljava/util/SortedSet;" since="11" />
+		<method name="tailSet(LE;Z)Ljava/util/NavigableSet;" />
 	</class>
 	<class name="java/util/NoSuchElementException" since="1">
 		<extends name="java/lang/RuntimeException" />
@@ -37434,12 +37414,12 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="&lt;init>(ILjava/util/Comparator&lt;? super E>;)V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
-		<method name="&lt;init>(Ljava/util/PriorityQueue&lt;? extends E>;)V" />
-		<method name="&lt;init>(Ljava/util/SortedSet&lt;? extends E>;)V" />
-		<method name="comparator()Ljava/util/Comparator&lt;? super E>;" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="&lt;init>(ILjava/util/Comparator;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
+		<method name="&lt;init>(Ljava/util/PriorityQueue;)V" />
+		<method name="&lt;init>(Ljava/util/SortedSet;)V" />
+		<method name="comparator()Ljava/util/Comparator;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="peek()LE;" />
 		<method name="poll()LE;" />
@@ -37456,14 +37436,14 @@
 		<method name="load(Ljava/io/InputStream;)V" />
 		<method name="load(Ljava/io/Reader;)V" since="9" />
 		<method name="loadFromXML(Ljava/io/InputStream;)V" />
-		<method name="propertyNames()Ljava/util/Enumeration&lt;?>;" />
+		<method name="propertyNames()Ljava/util/Enumeration;" />
 		<method name="save(Ljava/io/OutputStream;Ljava/lang/String;)V" />
 		<method name="setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="store(Ljava/io/OutputStream;Ljava/lang/String;)V" />
 		<method name="store(Ljava/io/Writer;Ljava/lang/String;)V" since="9" />
 		<method name="storeToXML(Ljava/io/OutputStream;Ljava/lang/String;)V" />
 		<method name="storeToXML(Ljava/io/OutputStream;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="stringPropertyNames()Ljava/util/Set&lt;java/lang/String>;" since="9" />
+		<method name="stringPropertyNames()Ljava/util/Set;" since="9" />
 		<field name="defaults" />
 	</class>
 	<class name="java/util/PropertyPermission" since="1">
@@ -37474,7 +37454,7 @@
 		<extends name="java/util/ResourceBundle" />
 		<method name="&lt;init>(Ljava/io/InputStream;)V" />
 		<method name="&lt;init>(Ljava/io/Reader;)V" since="9" />
-		<method name="getKeys()Ljava/util/Enumeration&lt;java/lang/String>;" />
+		<method name="getKeys()Ljava/util/Enumeration;" />
 		<method name="handleGetObject(Ljava/lang/String;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/Queue" since="1">
@@ -37516,25 +37496,25 @@
 		<method name="getBundle(Ljava/lang/String;Ljava/util/Locale;Ljava/lang/ClassLoader;Ljava/util/ResourceBundle$Control;)Ljava/util/ResourceBundle;" since="9" />
 		<method name="getBundle(Ljava/lang/String;Ljava/util/Locale;Ljava/util/ResourceBundle$Control;)Ljava/util/ResourceBundle;" since="9" />
 		<method name="getBundle(Ljava/lang/String;Ljava/util/ResourceBundle$Control;)Ljava/util/ResourceBundle;" since="9" />
-		<method name="getKeys()Ljava/util/Enumeration&lt;java/lang/String>;" />
+		<method name="getKeys()Ljava/util/Enumeration;" />
 		<method name="getLocale()Ljava/util/Locale;" />
 		<method name="getObject(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="getString(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getStringArray(Ljava/lang/String;)[Ljava/lang/String;" />
 		<method name="handleGetObject(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="handleKeySet()Ljava/util/Set&lt;java/lang/String>;" since="9" />
-		<method name="keySet()Ljava/util/Set&lt;java/lang/String>;" since="9" />
+		<method name="handleKeySet()Ljava/util/Set;" since="9" />
+		<method name="keySet()Ljava/util/Set;" since="9" />
 		<method name="setParent(Ljava/util/ResourceBundle;)V" />
 		<field name="parent" />
 	</class>
 	<class name="java/util/ResourceBundle$Control" since="9">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="getCandidateLocales(Ljava/lang/String;Ljava/util/Locale;)Ljava/util/List&lt;java/util/Locale>;" />
-		<method name="getControl(Ljava/util/List&lt;java/lang/String>;)Ljava/util/ResourceBundle$Control;" />
+		<method name="getCandidateLocales(Ljava/lang/String;Ljava/util/Locale;)Ljava/util/List;" />
+		<method name="getControl(Ljava/util/List;)Ljava/util/ResourceBundle$Control;" />
 		<method name="getFallbackLocale(Ljava/lang/String;Ljava/util/Locale;)Ljava/util/Locale;" />
-		<method name="getFormats(Ljava/lang/String;)Ljava/util/List&lt;java/lang/String>;" />
-		<method name="getNoFallbackControl(Ljava/util/List&lt;java/lang/String>;)Ljava/util/ResourceBundle$Control;" />
+		<method name="getFormats(Ljava/lang/String;)Ljava/util/List;" />
+		<method name="getNoFallbackControl(Ljava/util/List;)Ljava/util/ResourceBundle$Control;" />
 		<method name="getTimeToLive(Ljava/lang/String;Ljava/util/Locale;)J" />
 		<method name="needsReload(Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/ResourceBundle;J)Z" />
 		<method name="newBundle(Ljava/lang/String;Ljava/util/Locale;Ljava/lang/String;Ljava/lang/ClassLoader;Z)Ljava/util/ResourceBundle;" />
@@ -37620,26 +37600,26 @@
 	<class name="java/util/ServiceLoader" since="9">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Iterable" />
-		<method name="iterator()Ljava/util/Iterator&lt;S>;" />
-		<method name="load(Ljava/lang/Class&lt;S>;)Ljava/util/ServiceLoader&lt;S>;" />
-		<method name="load(Ljava/lang/Class&lt;S>;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader&lt;S>;" />
-		<method name="loadInstalled(Ljava/lang/Class&lt;S>;)Ljava/util/ServiceLoader&lt;S>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
+		<method name="load(Ljava/lang/Class;)Ljava/util/ServiceLoader;" />
+		<method name="load(Ljava/lang/Class;Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader;" />
+		<method name="loadInstalled(Ljava/lang/Class;)Ljava/util/ServiceLoader;" />
 		<method name="reload()V" />
 	</class>
 	<class name="java/util/Set" since="1">
 		<implements name="java/util/Collection" />
 		<method name="add(LE;)Z" />
-		<method name="addAll(Ljava/util/Collection&lt;? extends E>;)Z" />
+		<method name="addAll(Ljava/util/Collection;)Z" />
 		<method name="clear()V" />
 		<method name="contains(Ljava/lang/Object;)Z" />
-		<method name="containsAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="containsAll(Ljava/util/Collection;)Z" />
 		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="hashCode()I" />
 		<method name="isEmpty()Z" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="remove(Ljava/lang/Object;)Z" />
-		<method name="removeAll(Ljava/util/Collection&lt;?>;)Z" />
-		<method name="retainAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="removeAll(Ljava/util/Collection;)Z" />
+		<method name="retainAll(Ljava/util/Collection;)Z" />
 		<method name="size()I" />
 		<method name="toArray()[Ljava/lang/Object;" />
 		<method name="toArray([LT;)[LT;" />
@@ -37669,21 +37649,21 @@
 	</class>
 	<class name="java/util/SortedMap" since="1">
 		<implements name="java/util/Map" />
-		<method name="comparator()Ljava/util/Comparator&lt;? super K>;" />
+		<method name="comparator()Ljava/util/Comparator;" />
 		<method name="firstKey()LK;" />
-		<method name="headMap(LK;)Ljava/util/SortedMap&lt;K, V>;" />
+		<method name="headMap(LK;)Ljava/util/SortedMap;" />
 		<method name="lastKey()LK;" />
-		<method name="subMap(LK;LK;)Ljava/util/SortedMap&lt;K, V>;" />
-		<method name="tailMap(LK;)Ljava/util/SortedMap&lt;K, V>;" />
+		<method name="subMap(LK;LK;)Ljava/util/SortedMap;" />
+		<method name="tailMap(LK;)Ljava/util/SortedMap;" />
 	</class>
 	<class name="java/util/SortedSet" since="1">
 		<implements name="java/util/Set" />
-		<method name="comparator()Ljava/util/Comparator&lt;? super E>;" />
+		<method name="comparator()Ljava/util/Comparator;" />
 		<method name="first()LE;" />
-		<method name="headSet(LE;)Ljava/util/SortedSet&lt;E>;" />
+		<method name="headSet(LE;)Ljava/util/SortedSet;" />
 		<method name="last()LE;" />
-		<method name="subSet(LE;LE;)Ljava/util/SortedSet&lt;E>;" />
-		<method name="tailSet(LE;)Ljava/util/SortedSet&lt;E>;" />
+		<method name="subSet(LE;LE;)Ljava/util/SortedSet;" />
+		<method name="tailSet(LE;)Ljava/util/SortedSet;" />
 	</class>
 	<class name="java/util/Stack" since="1">
 		<extends name="java/util/Vector" />
@@ -37770,35 +37750,35 @@
 		<implements name="java/util/SortedMap" />
 		<implements name="java/util/NavigableMap" since="9" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Comparator&lt;? super K>;)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
-		<method name="&lt;init>(Ljava/util/SortedMap&lt;K, ? extends V>;)V" />
-		<method name="ceilingEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" since="9" />
+		<method name="&lt;init>(Ljava/util/Comparator;)V" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
+		<method name="&lt;init>(Ljava/util/SortedMap;)V" />
+		<method name="ceilingEntry(LK;)Ljava/util/Map$Entry;" since="9" />
 		<method name="ceilingKey(LK;)LK;" since="9" />
 		<method name="clone()Ljava/lang/Object;" />
-		<method name="comparator()Ljava/util/Comparator&lt;? super K>;" />
-		<method name="descendingKeySet()Ljava/util/NavigableSet&lt;K>;" since="9" />
-		<method name="descendingMap()Ljava/util/NavigableMap&lt;K, V>;" since="9" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
-		<method name="firstEntry()Ljava/util/Map$Entry&lt;K, V>;" since="9" />
+		<method name="comparator()Ljava/util/Comparator;" />
+		<method name="descendingKeySet()Ljava/util/NavigableSet;" since="9" />
+		<method name="descendingMap()Ljava/util/NavigableMap;" since="9" />
+		<method name="entrySet()Ljava/util/Set;" />
+		<method name="firstEntry()Ljava/util/Map$Entry;" since="9" />
 		<method name="firstKey()LK;" />
-		<method name="floorEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" since="9" />
+		<method name="floorEntry(LK;)Ljava/util/Map$Entry;" since="9" />
 		<method name="floorKey(LK;)LK;" since="9" />
-		<method name="headMap(LK;)Ljava/util/SortedMap&lt;K, V>;" />
-		<method name="headMap(LK;Z)Ljava/util/NavigableMap&lt;K, V>;" since="9" />
-		<method name="higherEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" since="9" />
+		<method name="headMap(LK;)Ljava/util/SortedMap;" />
+		<method name="headMap(LK;Z)Ljava/util/NavigableMap;" since="9" />
+		<method name="higherEntry(LK;)Ljava/util/Map$Entry;" since="9" />
 		<method name="higherKey(LK;)LK;" since="9" />
-		<method name="lastEntry()Ljava/util/Map$Entry&lt;K, V>;" since="9" />
+		<method name="lastEntry()Ljava/util/Map$Entry;" since="9" />
 		<method name="lastKey()LK;" />
-		<method name="lowerEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" since="9" />
+		<method name="lowerEntry(LK;)Ljava/util/Map$Entry;" since="9" />
 		<method name="lowerKey(LK;)LK;" since="9" />
-		<method name="navigableKeySet()Ljava/util/NavigableSet&lt;K>;" since="9" />
-		<method name="pollFirstEntry()Ljava/util/Map$Entry&lt;K, V>;" since="9" />
-		<method name="pollLastEntry()Ljava/util/Map$Entry&lt;K, V>;" since="9" />
-		<method name="subMap(LK;LK;)Ljava/util/SortedMap&lt;K, V>;" />
-		<method name="subMap(LK;ZLK;Z)Ljava/util/NavigableMap&lt;K, V>;" since="9" />
-		<method name="tailMap(LK;)Ljava/util/SortedMap&lt;K, V>;" />
-		<method name="tailMap(LK;Z)Ljava/util/NavigableMap&lt;K, V>;" since="9" />
+		<method name="navigableKeySet()Ljava/util/NavigableSet;" since="9" />
+		<method name="pollFirstEntry()Ljava/util/Map$Entry;" since="9" />
+		<method name="pollLastEntry()Ljava/util/Map$Entry;" since="9" />
+		<method name="subMap(LK;LK;)Ljava/util/SortedMap;" />
+		<method name="subMap(LK;ZLK;Z)Ljava/util/NavigableMap;" since="9" />
+		<method name="tailMap(LK;)Ljava/util/SortedMap;" />
+		<method name="tailMap(LK;Z)Ljava/util/NavigableMap;" since="9" />
 	</class>
 	<class name="java/util/TreeSet" since="1">
 		<extends name="java/util/AbstractSet" />
@@ -37807,29 +37787,29 @@
 		<implements name="java/util/SortedSet" />
 		<implements name="java/util/NavigableSet" since="9" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
-		<method name="&lt;init>(Ljava/util/Comparator&lt;? super E>;)V" />
-		<method name="&lt;init>(Ljava/util/SortedSet&lt;E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
+		<method name="&lt;init>(Ljava/util/Comparator;)V" />
+		<method name="&lt;init>(Ljava/util/SortedSet;)V" />
 		<method name="ceiling(LE;)LE;" since="9" />
 		<method name="clone()Ljava/lang/Object;" />
-		<method name="comparator()Ljava/util/Comparator&lt;? super E>;" />
-		<method name="descendingIterator()Ljava/util/Iterator&lt;E>;" since="9" />
-		<method name="descendingSet()Ljava/util/NavigableSet&lt;E>;" since="9" />
+		<method name="comparator()Ljava/util/Comparator;" />
+		<method name="descendingIterator()Ljava/util/Iterator;" since="9" />
+		<method name="descendingSet()Ljava/util/NavigableSet;" since="9" />
 		<method name="first()LE;" />
 		<method name="floor(LE;)LE;" since="9" />
-		<method name="headSet(LE;)Ljava/util/SortedSet&lt;E>;" />
-		<method name="headSet(LE;Z)Ljava/util/NavigableSet&lt;E>;" since="9" />
+		<method name="headSet(LE;)Ljava/util/SortedSet;" />
+		<method name="headSet(LE;Z)Ljava/util/NavigableSet;" since="9" />
 		<method name="higher(LE;)LE;" since="9" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="last()LE;" />
 		<method name="lower(LE;)LE;" since="9" />
 		<method name="pollFirst()LE;" since="9" />
 		<method name="pollLast()LE;" since="9" />
 		<method name="size()I" />
-		<method name="subSet(LE;LE;)Ljava/util/SortedSet&lt;E>;" />
-		<method name="subSet(LE;ZLE;Z)Ljava/util/NavigableSet&lt;E>;" since="9" />
-		<method name="tailSet(LE;)Ljava/util/SortedSet&lt;E>;" />
-		<method name="tailSet(LE;Z)Ljava/util/NavigableSet&lt;E>;" since="9" />
+		<method name="subSet(LE;LE;)Ljava/util/SortedSet;" />
+		<method name="subSet(LE;ZLE;Z)Ljava/util/NavigableSet;" since="9" />
+		<method name="tailSet(LE;)Ljava/util/SortedSet;" />
+		<method name="tailSet(LE;Z)Ljava/util/NavigableSet;" since="9" />
 	</class>
 	<class name="java/util/UUID" since="1">
 		<extends name="java/lang/Object" />
@@ -37867,13 +37847,13 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(II)V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
 		<method name="addElement(LE;)V" />
 		<method name="capacity()I" />
 		<method name="clone()Ljava/lang/Object;" />
 		<method name="copyInto([Ljava/lang/Object;)V" />
 		<method name="elementAt(I)LE;" />
-		<method name="elements()Ljava/util/Enumeration&lt;E>;" />
+		<method name="elements()Ljava/util/Enumeration;" />
 		<method name="ensureCapacity(I)V" />
 		<method name="firstElement()LE;" />
 		<method name="get(I)LE;" />
@@ -37898,26 +37878,22 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
+		<method name="entrySet()Ljava/util/Set;" />
 	</class>
 	<class name="java/util/concurrent/AbstractExecutorService" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/ExecutorService" />
 		<method name="&lt;init>()V" />
-		<method name="invokeAll(Ljava/util/Collection&lt;? extends java/util/concurrent/Callable&lt;T>>;)Ljava/util/List&lt;java/util/concurrent/Future&lt;T>>;" since="9" />
-		<method name="invokeAll(Ljava/util/Collection&lt;? extends java/util/concurrent/Callable&lt;T>>;JLjava/util/concurrent/TimeUnit;)Ljava/util/List&lt;java/util/concurrent/Future&lt;T>>;" since="9" />
-		<method name="invokeAll(Ljava/util/Collection&lt;java/util/concurrent/Callable&lt;T>>;)Ljava/util/List&lt;java/util/concurrent/Future&lt;T>>;" />
-		<method name="invokeAll(Ljava/util/Collection&lt;java/util/concurrent/Callable&lt;T>>;JLjava/util/concurrent/TimeUnit;)Ljava/util/List&lt;java/util/concurrent/Future&lt;T>>;" />
-		<method name="invokeAny(Ljava/util/Collection&lt;? extends java/util/concurrent/Callable&lt;T>>;)LT;" since="9" />
-		<method name="invokeAny(Ljava/util/Collection&lt;? extends java/util/concurrent/Callable&lt;T>>;JLjava/util/concurrent/TimeUnit;)LT;" since="9" />
-		<method name="invokeAny(Ljava/util/Collection&lt;java/util/concurrent/Callable&lt;T>>;)LT;" />
-		<method name="invokeAny(Ljava/util/Collection&lt;java/util/concurrent/Callable&lt;T>>;JLjava/util/concurrent/TimeUnit;)LT;" />
-		<method name="newTaskFor(Ljava/lang/Runnable;LT;)Ljava/util/concurrent/RunnableFuture&lt;T>;" since="9" />
-		<method name="newTaskFor(Ljava/util/concurrent/Callable&lt;T>;)Ljava/util/concurrent/RunnableFuture&lt;T>;" since="9" />
-		<method name="submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future&lt;?>;" />
-		<method name="submit(Ljava/lang/Runnable;LT;)Ljava/util/concurrent/Future&lt;T>;" />
-		<method name="submit(Ljava/util/concurrent/Callable&lt;T>;)Ljava/util/concurrent/Future&lt;T>;" />
+		<method name="invokeAll(Ljava/util/Collection;)Ljava/util/List;" />
+		<method name="invokeAll(Ljava/util/Collection;JLjava/util/concurrent/TimeUnit;)Ljava/util/List;" />
+		<method name="invokeAny(Ljava/util/Collection;)LT;" />
+		<method name="invokeAny(Ljava/util/Collection;JLjava/util/concurrent/TimeUnit;)LT;" />
+		<method name="newTaskFor(Ljava/lang/Runnable;LT;)Ljava/util/concurrent/RunnableFuture;" since="9" />
+		<method name="newTaskFor(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/RunnableFuture;" since="9" />
+		<method name="submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;" />
+		<method name="submit(Ljava/lang/Runnable;LT;)Ljava/util/concurrent/Future;" />
+		<method name="submit(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;" />
 	</class>
 	<class name="java/util/concurrent/ArrayBlockingQueue" since="1">
 		<extends name="java/util/AbstractQueue" />
@@ -37925,10 +37901,10 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IZ)V" />
-		<method name="&lt;init>(IZLjava/util/Collection&lt;? extends E>;)V" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;)I" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;I)I" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="&lt;init>(IZLjava/util/Collection;)V" />
+		<method name="drainTo(Ljava/util/Collection;)I" />
+		<method name="drainTo(Ljava/util/Collection;I)I" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="offer(LE;JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="peek()LE;" />
@@ -37947,7 +37923,7 @@
 		<method name="addLast(LE;)V" />
 		<method name="contains(Ljava/lang/Object;)Z" />
 		<method name="element()LE;" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="offer(LE;JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="offerFirst(LE;)Z" />
@@ -37976,8 +37952,8 @@
 		<implements name="java/util/Queue" />
 		<method name="add(LE;)Z" />
 		<method name="contains(Ljava/lang/Object;)Z" since="5" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;)I" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;I)I" />
+		<method name="drainTo(Ljava/util/Collection;)I" />
+		<method name="drainTo(Ljava/util/Collection;I)I" />
 		<method name="offer(LE;)Z" />
 		<method name="offer(LE;JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="poll(JLjava/util/concurrent/TimeUnit;)LE;" />
@@ -38000,11 +37976,11 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/util/concurrent/CompletionService" since="1">
-		<method name="poll()Ljava/util/concurrent/Future&lt;V>;" />
-		<method name="poll(JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/Future&lt;V>;" />
-		<method name="submit(Ljava/lang/Runnable;LV;)Ljava/util/concurrent/Future&lt;V>;" />
-		<method name="submit(Ljava/util/concurrent/Callable&lt;V>;)Ljava/util/concurrent/Future&lt;V>;" />
-		<method name="take()Ljava/util/concurrent/Future&lt;V>;" />
+		<method name="poll()Ljava/util/concurrent/Future;" />
+		<method name="poll(JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/Future;" />
+		<method name="submit(Ljava/lang/Runnable;LV;)Ljava/util/concurrent/Future;" />
+		<method name="submit(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;" />
+		<method name="take()Ljava/util/concurrent/Future;" />
 	</class>
 	<class name="java/util/concurrent/ConcurrentHashMap" since="1">
 		<extends name="java/util/AbstractMap" />
@@ -38014,11 +37990,11 @@
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" since="9" />
 		<method name="&lt;init>(IFI)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
 		<method name="contains(Ljava/lang/Object;)Z" />
-		<method name="elements()Ljava/util/Enumeration&lt;V>;" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
-		<method name="keys()Ljava/util/Enumeration&lt;K>;" />
+		<method name="elements()Ljava/util/Enumeration;" />
+		<method name="entrySet()Ljava/util/Set;" />
+		<method name="keys()Ljava/util/Enumeration;" />
 		<method name="putIfAbsent(LK;LV;)LV;" />
 		<method name="remove(Ljava/lang/Object;Ljava/lang/Object;)Z" />
 		<method name="replace(LK;LV;)LV;" />
@@ -38029,8 +38005,8 @@
 		<implements name="java/util/Queue" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="peek()LE;" />
 		<method name="poll()LE;" />
@@ -38046,16 +38022,16 @@
 	<class name="java/util/concurrent/ConcurrentNavigableMap" since="9">
 		<implements name="java/util/concurrent/ConcurrentMap" />
 		<implements name="java/util/NavigableMap" />
-		<method name="descendingKeySet()Ljava/util/NavigableSet&lt;K>;" />
-		<method name="descendingMap()Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="headMap(LK;)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="headMap(LK;Z)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="keySet()Ljava/util/NavigableSet&lt;K>;" />
-		<method name="navigableKeySet()Ljava/util/NavigableSet&lt;K>;" />
-		<method name="subMap(LK;LK;)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="subMap(LK;ZLK;Z)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="tailMap(LK;)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="tailMap(LK;Z)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
+		<method name="descendingKeySet()Ljava/util/NavigableSet;" />
+		<method name="descendingMap()Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="headMap(LK;)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="headMap(LK;Z)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="keySet()Ljava/util/NavigableSet;" />
+		<method name="navigableKeySet()Ljava/util/NavigableSet;" />
+		<method name="subMap(LK;LK;)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="subMap(LK;ZLK;Z)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="tailMap(LK;)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="tailMap(LK;Z)Ljava/util/concurrent/ConcurrentNavigableMap;" />
 	</class>
 	<class name="java/util/concurrent/ConcurrentSkipListMap" since="9">
 		<extends name="java/util/AbstractMap" />
@@ -38063,39 +38039,39 @@
 		<implements name="java/util/concurrent/ConcurrentNavigableMap" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Comparator&lt;? super K>;)V" />
-		<method name="&lt;init>(Ljava/util/Map&lt;? extends K, ? extends V>;)V" />
-		<method name="&lt;init>(Ljava/util/SortedMap&lt;K, ? extends V>;)V" />
-		<method name="ceilingEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="&lt;init>(Ljava/util/Comparator;)V" />
+		<method name="&lt;init>(Ljava/util/Map;)V" />
+		<method name="&lt;init>(Ljava/util/SortedMap;)V" />
+		<method name="ceilingEntry(LK;)Ljava/util/Map$Entry;" />
 		<method name="ceilingKey(LK;)LK;" />
-		<method name="clone()Ljava/util/concurrent/ConcurrentSkipListMap&lt;K, V>;" />
-		<method name="comparator()Ljava/util/Comparator&lt;? super K>;" />
-		<method name="descendingKeySet()Ljava/util/NavigableSet&lt;K>;" />
-		<method name="descendingMap()Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;K, V>>;" />
-		<method name="firstEntry()Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="clone()Ljava/util/concurrent/ConcurrentSkipListMap;" />
+		<method name="comparator()Ljava/util/Comparator;" />
+		<method name="descendingKeySet()Ljava/util/NavigableSet;" />
+		<method name="descendingMap()Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="entrySet()Ljava/util/Set;" />
+		<method name="firstEntry()Ljava/util/Map$Entry;" />
 		<method name="firstKey()LK;" />
-		<method name="floorEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="floorEntry(LK;)Ljava/util/Map$Entry;" />
 		<method name="floorKey(LK;)LK;" />
-		<method name="headMap(LK;)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="headMap(LK;Z)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="higherEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="headMap(LK;)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="headMap(LK;Z)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="higherEntry(LK;)Ljava/util/Map$Entry;" />
 		<method name="higherKey(LK;)LK;" />
-		<method name="lastEntry()Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="lastEntry()Ljava/util/Map$Entry;" />
 		<method name="lastKey()LK;" />
-		<method name="lowerEntry(LK;)Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="lowerEntry(LK;)Ljava/util/Map$Entry;" />
 		<method name="lowerKey(LK;)LK;" />
-		<method name="navigableKeySet()Ljava/util/NavigableSet&lt;K>;" />
-		<method name="pollFirstEntry()Ljava/util/Map$Entry&lt;K, V>;" />
-		<method name="pollLastEntry()Ljava/util/Map$Entry&lt;K, V>;" />
+		<method name="navigableKeySet()Ljava/util/NavigableSet;" />
+		<method name="pollFirstEntry()Ljava/util/Map$Entry;" />
+		<method name="pollLastEntry()Ljava/util/Map$Entry;" />
 		<method name="putIfAbsent(LK;LV;)LV;" />
 		<method name="remove(Ljava/lang/Object;Ljava/lang/Object;)Z" />
 		<method name="replace(LK;LV;)LV;" />
 		<method name="replace(LK;LV;LV;)Z" />
-		<method name="subMap(LK;LK;)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="subMap(LK;ZLK;Z)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="tailMap(LK;)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
-		<method name="tailMap(LK;Z)Ljava/util/concurrent/ConcurrentNavigableMap&lt;K, V>;" />
+		<method name="subMap(LK;LK;)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="subMap(LK;ZLK;Z)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="tailMap(LK;)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="tailMap(LK;Z)Ljava/util/concurrent/ConcurrentNavigableMap;" />
 	</class>
 	<class name="java/util/concurrent/ConcurrentSkipListSet" since="9">
 		<extends name="java/util/AbstractSet" />
@@ -38103,29 +38079,29 @@
 		<implements name="java/util/NavigableSet" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
-		<method name="&lt;init>(Ljava/util/Comparator&lt;? super E>;)V" />
-		<method name="&lt;init>(Ljava/util/SortedSet&lt;E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
+		<method name="&lt;init>(Ljava/util/Comparator;)V" />
+		<method name="&lt;init>(Ljava/util/SortedSet;)V" />
 		<method name="ceiling(LE;)LE;" />
-		<method name="clone()Ljava/util/concurrent/ConcurrentSkipListSet&lt;E>;" />
-		<method name="comparator()Ljava/util/Comparator&lt;? super E>;" />
-		<method name="descendingIterator()Ljava/util/Iterator&lt;E>;" />
-		<method name="descendingSet()Ljava/util/NavigableSet&lt;E>;" />
+		<method name="clone()Ljava/util/concurrent/ConcurrentSkipListSet;" />
+		<method name="comparator()Ljava/util/Comparator;" />
+		<method name="descendingIterator()Ljava/util/Iterator;" />
+		<method name="descendingSet()Ljava/util/NavigableSet;" />
 		<method name="first()LE;" />
 		<method name="floor(LE;)LE;" />
-		<method name="headSet(LE;)Ljava/util/NavigableSet&lt;E>;" />
-		<method name="headSet(LE;Z)Ljava/util/NavigableSet&lt;E>;" />
+		<method name="headSet(LE;)Ljava/util/NavigableSet;" />
+		<method name="headSet(LE;Z)Ljava/util/NavigableSet;" />
 		<method name="higher(LE;)LE;" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="last()LE;" />
 		<method name="lower(LE;)LE;" />
 		<method name="pollFirst()LE;" />
 		<method name="pollLast()LE;" />
 		<method name="size()I" />
-		<method name="subSet(LE;LE;)Ljava/util/NavigableSet&lt;E>;" />
-		<method name="subSet(LE;ZLE;Z)Ljava/util/NavigableSet&lt;E>;" />
-		<method name="tailSet(LE;)Ljava/util/NavigableSet&lt;E>;" />
-		<method name="tailSet(LE;Z)Ljava/util/NavigableSet&lt;E>;" />
+		<method name="subSet(LE;LE;)Ljava/util/NavigableSet;" />
+		<method name="subSet(LE;ZLE;Z)Ljava/util/NavigableSet;" />
+		<method name="tailSet(LE;)Ljava/util/NavigableSet;" />
+		<method name="tailSet(LE;Z)Ljava/util/NavigableSet;" />
 	</class>
 	<class name="java/util/concurrent/CopyOnWriteArrayList" since="1">
 		<extends name="java/lang/Object" />
@@ -38134,34 +38110,34 @@
 		<implements name="java/util/RandomAccess" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
 		<method name="&lt;init>([LE;)V" />
 		<method name="add(ILE;)V" />
 		<method name="add(LE;)Z" />
-		<method name="addAll(ILjava/util/Collection&lt;? extends E>;)Z" />
-		<method name="addAll(Ljava/util/Collection&lt;? extends E>;)Z" />
-		<method name="addAllAbsent(Ljava/util/Collection&lt;? extends E>;)I" />
+		<method name="addAll(ILjava/util/Collection;)Z" />
+		<method name="addAll(Ljava/util/Collection;)Z" />
+		<method name="addAllAbsent(Ljava/util/Collection;)I" />
 		<method name="addIfAbsent(LE;)Z" />
 		<method name="clear()V" />
 		<method name="clone()Ljava/lang/Object;" />
 		<method name="contains(Ljava/lang/Object;)Z" />
-		<method name="containsAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="containsAll(Ljava/util/Collection;)Z" />
 		<method name="get(I)LE;" />
 		<method name="indexOf(LE;I)I" />
 		<method name="indexOf(Ljava/lang/Object;)I" />
 		<method name="isEmpty()Z" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="lastIndexOf(LE;I)I" />
 		<method name="lastIndexOf(Ljava/lang/Object;)I" />
-		<method name="listIterator()Ljava/util/ListIterator&lt;E>;" />
-		<method name="listIterator(I)Ljava/util/ListIterator&lt;E>;" />
+		<method name="listIterator()Ljava/util/ListIterator;" />
+		<method name="listIterator(I)Ljava/util/ListIterator;" />
 		<method name="remove(I)LE;" />
 		<method name="remove(Ljava/lang/Object;)Z" />
-		<method name="removeAll(Ljava/util/Collection&lt;?>;)Z" />
-		<method name="retainAll(Ljava/util/Collection&lt;?>;)Z" />
+		<method name="removeAll(Ljava/util/Collection;)Z" />
+		<method name="retainAll(Ljava/util/Collection;)Z" />
 		<method name="set(ILE;)LE;" />
 		<method name="size()I" />
-		<method name="subList(II)Ljava/util/List&lt;E>;" />
+		<method name="subList(II)Ljava/util/List;" />
 		<method name="toArray()[Ljava/lang/Object;" />
 		<method name="toArray([LT;)[LT;" />
 	</class>
@@ -38169,8 +38145,8 @@
 		<extends name="java/util/AbstractSet" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="size()I" />
 	</class>
 	<class name="java/util/concurrent/CountDownLatch" since="1">
@@ -38196,10 +38172,10 @@
 		<extends name="java/util/AbstractQueue" />
 		<implements name="java/util/concurrent/BlockingQueue" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;)I" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;I)I" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
+		<method name="drainTo(Ljava/util/Collection;)I" />
+		<method name="drainTo(Ljava/util/Collection;I)I" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="offer(LE;JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="peek()LE;" />
@@ -38234,40 +38210,34 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/CompletionService" />
 		<method name="&lt;init>(Ljava/util/concurrent/Executor;)V" />
-		<method name="&lt;init>(Ljava/util/concurrent/Executor;Ljava/util/concurrent/BlockingQueue&lt;java/util/concurrent/Future&lt;V>>;)V" />
-		<method name="poll()Ljava/util/concurrent/Future&lt;V>;" />
-		<method name="poll(JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/Future&lt;V>;" />
-		<method name="submit(Ljava/lang/Runnable;LV;)Ljava/util/concurrent/Future&lt;V>;" />
-		<method name="submit(Ljava/util/concurrent/Callable&lt;V>;)Ljava/util/concurrent/Future&lt;V>;" />
-		<method name="take()Ljava/util/concurrent/Future&lt;V>;" />
+		<method name="&lt;init>(Ljava/util/concurrent/Executor;Ljava/util/concurrent/BlockingQueue;)V" />
+		<method name="poll()Ljava/util/concurrent/Future;" />
+		<method name="poll(JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/Future;" />
+		<method name="submit(Ljava/lang/Runnable;LV;)Ljava/util/concurrent/Future;" />
+		<method name="submit(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;" />
+		<method name="take()Ljava/util/concurrent/Future;" />
 	</class>
 	<class name="java/util/concurrent/ExecutorService" since="1">
 		<implements name="java/util/concurrent/Executor" />
 		<method name="awaitTermination(JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="invokeAll(Ljava/util/Collection&lt;? extends java/util/concurrent/Callable&lt;T>>;)Ljava/util/List&lt;java/util/concurrent/Future&lt;T>>;" since="9" />
-		<method name="invokeAll(Ljava/util/Collection&lt;? extends java/util/concurrent/Callable&lt;T>>;JLjava/util/concurrent/TimeUnit;)Ljava/util/List&lt;java/util/concurrent/Future&lt;T>>;" since="9" />
-		<method name="invokeAll(Ljava/util/Collection&lt;java/util/concurrent/Callable&lt;T>>;)Ljava/util/List&lt;java/util/concurrent/Future&lt;T>>;" />
-		<method name="invokeAll(Ljava/util/Collection&lt;java/util/concurrent/Callable&lt;T>>;JLjava/util/concurrent/TimeUnit;)Ljava/util/List&lt;java/util/concurrent/Future&lt;T>>;" />
-		<method name="invokeAny(Ljava/util/Collection&lt;? extends java/util/concurrent/Callable&lt;T>>;)LT;" since="9" />
-		<method name="invokeAny(Ljava/util/Collection&lt;? extends java/util/concurrent/Callable&lt;T>>;JLjava/util/concurrent/TimeUnit;)LT;" since="9" />
-		<method name="invokeAny(Ljava/util/Collection&lt;java/util/concurrent/Callable&lt;T>>;)LT;" />
-		<method name="invokeAny(Ljava/util/Collection&lt;java/util/concurrent/Callable&lt;T>>;JLjava/util/concurrent/TimeUnit;)LT;" />
+		<method name="invokeAll(Ljava/util/Collection;)Ljava/util/List;" />
+		<method name="invokeAll(Ljava/util/Collection;JLjava/util/concurrent/TimeUnit;)Ljava/util/List;" />
+		<method name="invokeAny(Ljava/util/Collection;)LT;" />
+		<method name="invokeAny(Ljava/util/Collection;JLjava/util/concurrent/TimeUnit;)LT;" />
 		<method name="isShutdown()Z" />
 		<method name="isTerminated()Z" />
 		<method name="shutdown()V" />
-		<method name="shutdownNow()Ljava/util/List&lt;java/lang/Runnable>;" />
-		<method name="submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future&lt;?>;" />
-		<method name="submit(Ljava/lang/Runnable;LT;)Ljava/util/concurrent/Future&lt;T>;" />
-		<method name="submit(Ljava/util/concurrent/Callable&lt;T>;)Ljava/util/concurrent/Future&lt;T>;" />
+		<method name="shutdownNow()Ljava/util/List;" />
+		<method name="submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;" />
+		<method name="submit(Ljava/lang/Runnable;LT;)Ljava/util/concurrent/Future;" />
+		<method name="submit(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;" />
 	</class>
 	<class name="java/util/concurrent/Executors" since="1">
 		<extends name="java/lang/Object" />
-		<method name="callable(Ljava/lang/Runnable;)Ljava/util/concurrent/Callable&lt;java/lang/Object>;" />
-		<method name="callable(Ljava/lang/Runnable;LT;)Ljava/util/concurrent/Callable&lt;T>;" />
-		<method name="callable(Ljava/security/PrivilegedAction;)Ljava/util/concurrent/Callable&lt;java/lang/Object>;" />
-		<method name="callable(Ljava/security/PrivilegedAction&lt;?>;)Ljava/util/concurrent/Callable&lt;java/lang/Object>;" since="9" />
-		<method name="callable(Ljava/security/PrivilegedExceptionAction;)Ljava/util/concurrent/Callable&lt;java/lang/Object>;" />
-		<method name="callable(Ljava/security/PrivilegedExceptionAction&lt;?>;)Ljava/util/concurrent/Callable&lt;java/lang/Object>;" since="9" />
+		<method name="callable(Ljava/lang/Runnable;)Ljava/util/concurrent/Callable;" />
+		<method name="callable(Ljava/lang/Runnable;LT;)Ljava/util/concurrent/Callable;" />
+		<method name="callable(Ljava/security/PrivilegedAction;)Ljava/util/concurrent/Callable;" />
+		<method name="callable(Ljava/security/PrivilegedExceptionAction;)Ljava/util/concurrent/Callable;" />
 		<method name="defaultThreadFactory()Ljava/util/concurrent/ThreadFactory;" />
 		<method name="newCachedThreadPool()Ljava/util/concurrent/ExecutorService;" />
 		<method name="newCachedThreadPool(Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ExecutorService;" />
@@ -38279,8 +38249,8 @@
 		<method name="newSingleThreadExecutor(Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ExecutorService;" />
 		<method name="newSingleThreadScheduledExecutor()Ljava/util/concurrent/ScheduledExecutorService;" />
 		<method name="newSingleThreadScheduledExecutor(Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;" />
-		<method name="privilegedCallable(Ljava/util/concurrent/Callable&lt;T>;)Ljava/util/concurrent/Callable&lt;T>;" />
-		<method name="privilegedCallableUsingCurrentClassLoader(Ljava/util/concurrent/Callable&lt;T>;)Ljava/util/concurrent/Callable&lt;T>;" />
+		<method name="privilegedCallable(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Callable;" />
+		<method name="privilegedCallableUsingCurrentClassLoader(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Callable;" />
 		<method name="privilegedThreadFactory()Ljava/util/concurrent/ThreadFactory;" />
 		<method name="unconfigurableExecutorService(Ljava/util/concurrent/ExecutorService;)Ljava/util/concurrent/ExecutorService;" />
 		<method name="unconfigurableScheduledExecutorService(Ljava/util/concurrent/ScheduledExecutorService;)Ljava/util/concurrent/ScheduledExecutorService;" />
@@ -38298,7 +38268,7 @@
 		<implements name="java/lang/Runnable" />
 		<implements name="java/util/concurrent/RunnableFuture" since="9" />
 		<method name="&lt;init>(Ljava/lang/Runnable;LV;)V" />
-		<method name="&lt;init>(Ljava/util/concurrent/Callable&lt;V>;)V" />
+		<method name="&lt;init>(Ljava/util/concurrent/Callable;)V" />
 		<method name="cancel(Z)Z" />
 		<method name="done()V" />
 		<method name="get()LV;" />
@@ -38316,15 +38286,15 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
 		<method name="addFirst(LE;)V" />
 		<method name="addLast(LE;)V" />
-		<method name="descendingIterator()Ljava/util/Iterator&lt;E>;" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;)I" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;I)I" />
+		<method name="descendingIterator()Ljava/util/Iterator;" />
+		<method name="drainTo(Ljava/util/Collection;)I" />
+		<method name="drainTo(Ljava/util/Collection;I)I" />
 		<method name="getFirst()LE;" />
 		<method name="getLast()LE;" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="offer(LE;JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="offerFirst(LE;)Z" />
@@ -38361,10 +38331,10 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;)I" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;I)I" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
+		<method name="drainTo(Ljava/util/Collection;)I" />
+		<method name="drainTo(Ljava/util/Collection;I)I" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="offer(LE;JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="peek()LE;" />
@@ -38381,12 +38351,12 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="&lt;init>(ILjava/util/Comparator&lt;? super E>;)V" />
-		<method name="&lt;init>(Ljava/util/Collection&lt;? extends E>;)V" />
-		<method name="comparator()Ljava/util/Comparator&lt;? super E>;" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;)I" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;I)I" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="&lt;init>(ILjava/util/Comparator;)V" />
+		<method name="&lt;init>(Ljava/util/Collection;)V" />
+		<method name="comparator()Ljava/util/Comparator;" />
+		<method name="drainTo(Ljava/util/Collection;)I" />
+		<method name="drainTo(Ljava/util/Collection;I)I" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="offer(LE;JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="peek()LE;" />
@@ -38419,10 +38389,10 @@
 	</class>
 	<class name="java/util/concurrent/ScheduledExecutorService" since="1">
 		<implements name="java/util/concurrent/ExecutorService" />
-		<method name="schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture&lt;?>;" />
-		<method name="schedule(Ljava/util/concurrent/Callable&lt;V>;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture&lt;V>;" />
-		<method name="scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture&lt;?>;" />
-		<method name="scheduleWithFixedDelay(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture&lt;?>;" />
+		<method name="schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;" />
+		<method name="schedule(Ljava/util/concurrent/Callable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;" />
+		<method name="scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;" />
+		<method name="scheduleWithFixedDelay(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;" />
 	</class>
 	<class name="java/util/concurrent/ScheduledFuture" since="1">
 		<implements name="java/util/concurrent/Delayed" />
@@ -38435,14 +38405,14 @@
 		<method name="&lt;init>(ILjava/util/concurrent/RejectedExecutionHandler;)V" />
 		<method name="&lt;init>(ILjava/util/concurrent/ThreadFactory;)V" />
 		<method name="&lt;init>(ILjava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)V" />
-		<method name="decorateTask(Ljava/lang/Runnable;Ljava/util/concurrent/RunnableScheduledFuture&lt;V>;)Ljava/util/concurrent/RunnableScheduledFuture&lt;V>;" since="9" />
-		<method name="decorateTask(Ljava/util/concurrent/Callable&lt;V>;Ljava/util/concurrent/RunnableScheduledFuture&lt;V>;)Ljava/util/concurrent/RunnableScheduledFuture&lt;V>;" since="9" />
+		<method name="decorateTask(Ljava/lang/Runnable;Ljava/util/concurrent/RunnableScheduledFuture;)Ljava/util/concurrent/RunnableScheduledFuture;" since="9" />
+		<method name="decorateTask(Ljava/util/concurrent/Callable;Ljava/util/concurrent/RunnableScheduledFuture;)Ljava/util/concurrent/RunnableScheduledFuture;" since="9" />
 		<method name="getContinueExistingPeriodicTasksAfterShutdownPolicy()Z" />
 		<method name="getExecuteExistingDelayedTasksAfterShutdownPolicy()Z" />
-		<method name="schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture&lt;?>;" />
-		<method name="schedule(Ljava/util/concurrent/Callable&lt;V>;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture&lt;V>;" />
-		<method name="scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture&lt;?>;" />
-		<method name="scheduleWithFixedDelay(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture&lt;?>;" />
+		<method name="schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;" />
+		<method name="schedule(Ljava/util/concurrent/Callable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;" />
+		<method name="scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;" />
+		<method name="scheduleWithFixedDelay(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;" />
 		<method name="setContinueExistingPeriodicTasksAfterShutdownPolicy(Z)V" />
 		<method name="setExecuteExistingDelayedTasksAfterShutdownPolicy(Z)V" />
 	</class>
@@ -38458,7 +38428,7 @@
 		<method name="availablePermits()I" />
 		<method name="drainPermits()I" />
 		<method name="getQueueLength()I" />
-		<method name="getQueuedThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getQueuedThreads()Ljava/util/Collection;" />
 		<method name="hasQueuedThreads()Z" />
 		<method name="isFair()Z" />
 		<method name="reducePermits(I)V" />
@@ -38475,9 +38445,9 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Z)V" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;)I" />
-		<method name="drainTo(Ljava/util/Collection&lt;? super E>;I)I" />
-		<method name="iterator()Ljava/util/Iterator&lt;E>;" />
+		<method name="drainTo(Ljava/util/Collection;)I" />
+		<method name="drainTo(Ljava/util/Collection;I)I" />
+		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="offer(LE;)Z" />
 		<method name="offer(LE;JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="peek()LE;" />
@@ -38493,10 +38463,10 @@
 	</class>
 	<class name="java/util/concurrent/ThreadPoolExecutor" since="1">
 		<extends name="java/util/concurrent/AbstractExecutorService" />
-		<method name="&lt;init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue&lt;java/lang/Runnable>;)V" />
-		<method name="&lt;init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue&lt;java/lang/Runnable>;Ljava/util/concurrent/RejectedExecutionHandler;)V" />
-		<method name="&lt;init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue&lt;java/lang/Runnable>;Ljava/util/concurrent/ThreadFactory;)V" />
-		<method name="&lt;init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue&lt;java/lang/Runnable>;Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)V" />
+		<method name="&lt;init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;)V" />
+		<method name="&lt;init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/RejectedExecutionHandler;)V" />
+		<method name="&lt;init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V" />
+		<method name="&lt;init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;Ljava/util/concurrent/RejectedExecutionHandler;)V" />
 		<method name="afterExecute(Ljava/lang/Runnable;Ljava/lang/Throwable;)V" />
 		<method name="allowCoreThreadTimeOut(Z)V" since="9" />
 		<method name="allowsCoreThreadTimeOut()Z" since="9" />
@@ -38510,7 +38480,7 @@
 		<method name="getLargestPoolSize()I" />
 		<method name="getMaximumPoolSize()I" />
 		<method name="getPoolSize()I" />
-		<method name="getQueue()Ljava/util/concurrent/BlockingQueue&lt;java/lang/Runnable>;" />
+		<method name="getQueue()Ljava/util/concurrent/BlockingQueue;" />
 		<method name="getRejectedExecutionHandler()Ljava/util/concurrent/RejectedExecutionHandler;" />
 		<method name="getTaskCount()J" />
 		<method name="getThreadFactory()Ljava/util/concurrent/ThreadFactory;" />
@@ -38527,7 +38497,7 @@
 		<method name="setRejectedExecutionHandler(Ljava/util/concurrent/RejectedExecutionHandler;)V" />
 		<method name="setThreadFactory(Ljava/util/concurrent/ThreadFactory;)V" />
 		<method name="shutdown()V" />
-		<method name="shutdownNow()Ljava/util/List&lt;java/lang/Runnable>;" />
+		<method name="shutdownNow()Ljava/util/List;" />
 		<method name="terminated()V" />
 	</class>
 	<class name="java/util/concurrent/ThreadPoolExecutor$AbortPolicy" since="1">
@@ -38569,13 +38539,13 @@
 		<method name="toSeconds(J)J" />
 		<method name="valueOf(Ljava/lang/String;)Ljava/util/concurrent/TimeUnit;" />
 		<method name="values()[Ljava/util/concurrent/TimeUnit;" />
-		<field name="DAYS" since="9" />
-		<field name="HOURS" since="9" />
-		<field name="MICROSECONDS" />
-		<field name="MILLISECONDS" />
-		<field name="MINUTES" since="9" />
-		<field name="NANOSECONDS" />
-		<field name="SECONDS" />
+		<field name="DAYS" since="14" />
+		<field name="HOURS" since="14" />
+		<field name="MICROSECONDS" since="14" />
+		<field name="MILLISECONDS" since="14" />
+		<field name="MINUTES" since="14" />
+		<field name="NANOSECONDS" since="14" />
+		<field name="SECONDS" since="14" />
 	</class>
 	<class name="java/util/concurrent/TimeoutException" since="1">
 		<extends name="java/lang/Exception" />
@@ -38648,7 +38618,7 @@
 		<method name="getAndSet(LT;I)I" />
 		<method name="incrementAndGet(LT;)I" />
 		<method name="lazySet(LT;I)V" since="9" />
-		<method name="newUpdater(Ljava/lang/Class&lt;U>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater&lt;U>;" />
+		<method name="newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;" />
 		<method name="set(LT;I)V" />
 		<method name="weakCompareAndSet(LT;II)Z" />
 	</class>
@@ -38706,7 +38676,7 @@
 		<method name="getAndSet(LT;J)J" />
 		<method name="incrementAndGet(LT;)J" />
 		<method name="lazySet(LT;J)V" since="9" />
-		<method name="newUpdater(Ljava/lang/Class&lt;U>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater&lt;U>;" />
+		<method name="newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;" />
 		<method name="set(LT;J)V" />
 		<method name="weakCompareAndSet(LT;JJ)Z" />
 	</class>
@@ -38753,7 +38723,7 @@
 		<method name="get(LT;)LV;" />
 		<method name="getAndSet(LT;LV;)LV;" />
 		<method name="lazySet(LT;LV;)V" since="9" />
-		<method name="newUpdater(Ljava/lang/Class&lt;U>;Ljava/lang/Class&lt;W>;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater&lt;U, W>;" />
+		<method name="newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;" />
 		<method name="set(LT;LV;)V" />
 		<method name="weakCompareAndSet(LT;LV;LV;)Z" />
 	</class>
@@ -38784,14 +38754,14 @@
 		<method name="acquireShared(J)V" />
 		<method name="acquireSharedInterruptibly(J)V" />
 		<method name="compareAndSetState(JJ)Z" />
-		<method name="getExclusiveQueuedThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getExclusiveQueuedThreads()Ljava/util/Collection;" />
 		<method name="getFirstQueuedThread()Ljava/lang/Thread;" />
 		<method name="getQueueLength()I" />
-		<method name="getQueuedThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
-		<method name="getSharedQueuedThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getQueuedThreads()Ljava/util/Collection;" />
+		<method name="getSharedQueuedThreads()Ljava/util/Collection;" />
 		<method name="getState()J" />
 		<method name="getWaitQueueLength(Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)I" />
-		<method name="getWaitingThreads(Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getWaitingThreads(Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)Ljava/util/Collection;" />
 		<method name="hasContended()Z" />
 		<method name="hasQueuedThreads()Z" />
 		<method name="hasWaiters(Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)Z" />
@@ -38819,7 +38789,7 @@
 		<method name="awaitUninterruptibly()V" />
 		<method name="awaitUntil(Ljava/util/Date;)Z" />
 		<method name="getWaitQueueLength()I" />
-		<method name="getWaitingThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getWaitingThreads()Ljava/util/Collection;" />
 		<method name="hasWaiters()Z" />
 		<method name="signal()V" />
 		<method name="signalAll()V" />
@@ -38834,14 +38804,14 @@
 		<method name="acquireShared(I)V" />
 		<method name="acquireSharedInterruptibly(I)V" />
 		<method name="compareAndSetState(II)Z" />
-		<method name="getExclusiveQueuedThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getExclusiveQueuedThreads()Ljava/util/Collection;" />
 		<method name="getFirstQueuedThread()Ljava/lang/Thread;" />
 		<method name="getQueueLength()I" />
-		<method name="getQueuedThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
-		<method name="getSharedQueuedThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getQueuedThreads()Ljava/util/Collection;" />
+		<method name="getSharedQueuedThreads()Ljava/util/Collection;" />
 		<method name="getState()I" />
 		<method name="getWaitQueueLength(Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)I" />
-		<method name="getWaitingThreads(Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getWaitingThreads(Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)Ljava/util/Collection;" />
 		<method name="hasContended()Z" />
 		<method name="hasQueuedThreads()Z" />
 		<method name="hasWaiters(Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)Z" />
@@ -38869,7 +38839,7 @@
 		<method name="awaitUninterruptibly()V" />
 		<method name="awaitUntil(Ljava/util/Date;)Z" />
 		<method name="getWaitQueueLength()I" />
-		<method name="getWaitingThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getWaitingThreads()Ljava/util/Collection;" />
 		<method name="hasWaiters()Z" />
 		<method name="signal()V" />
 		<method name="signalAll()V" />
@@ -38915,9 +38885,9 @@
 		<method name="getHoldCount()I" />
 		<method name="getOwner()Ljava/lang/Thread;" />
 		<method name="getQueueLength()I" />
-		<method name="getQueuedThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getQueuedThreads()Ljava/util/Collection;" />
 		<method name="getWaitQueueLength(Ljava/util/concurrent/locks/Condition;)I" />
-		<method name="getWaitingThreads(Ljava/util/concurrent/locks/Condition;)Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getWaitingThreads(Ljava/util/concurrent/locks/Condition;)Ljava/util/Collection;" />
 		<method name="hasQueuedThread(Ljava/lang/Thread;)Z" />
 		<method name="hasQueuedThreads()Z" />
 		<method name="hasWaiters(Ljava/util/concurrent/locks/Condition;)Z" />
@@ -38939,13 +38909,13 @@
 		<method name="&lt;init>(Z)V" />
 		<method name="getOwner()Ljava/lang/Thread;" />
 		<method name="getQueueLength()I" />
-		<method name="getQueuedReaderThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
-		<method name="getQueuedThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
-		<method name="getQueuedWriterThreads()Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getQueuedReaderThreads()Ljava/util/Collection;" />
+		<method name="getQueuedThreads()Ljava/util/Collection;" />
+		<method name="getQueuedWriterThreads()Ljava/util/Collection;" />
 		<method name="getReadHoldCount()I" since="9" />
 		<method name="getReadLockCount()I" />
 		<method name="getWaitQueueLength(Ljava/util/concurrent/locks/Condition;)I" />
-		<method name="getWaitingThreads(Ljava/util/concurrent/locks/Condition;)Ljava/util/Collection&lt;java/lang/Thread>;" />
+		<method name="getWaitingThreads(Ljava/util/concurrent/locks/Condition;)Ljava/util/Collection;" />
 		<method name="getWriteHoldCount()I" />
 		<method name="hasQueuedThread(Ljava/lang/Thread;)Z" />
 		<method name="hasQueuedThreads()Z" />
@@ -38993,18 +38963,18 @@
 		<method name="clone()Ljava/lang/Object;" />
 		<method name="containsKey(Ljava/lang/Object;)Z" />
 		<method name="containsValue(Ljava/lang/Object;)Z" />
-		<method name="entrySet()Ljava/util/Set&lt;java/util/Map$Entry&lt;java/lang/Object, java$lang/Object>>;" />
+		<method name="entrySet()Ljava/util/Set;" />
 		<method name="get(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="getValue(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getValue(Ljava/util/jar/Attributes$Name;)Ljava/lang/String;" />
 		<method name="isEmpty()Z" />
-		<method name="keySet()Ljava/util/Set&lt;java/lang/Object>;" />
+		<method name="keySet()Ljava/util/Set;" />
 		<method name="put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
-		<method name="putAll(Ljava/util/Map&lt;?, ?>;)V" />
+		<method name="putAll(Ljava/util/Map;)V" />
 		<method name="putValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="remove(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="size()I" />
-		<method name="values()Ljava/util/Collection&lt;java/lang/Object>;" />
+		<method name="values()Ljava/util/Collection;" />
 		<field name="map" />
 	</class>
 	<class name="java/util/jar/Attributes$Name" since="1">
@@ -39074,7 +39044,7 @@
 		<method name="clear()V" />
 		<method name="clone()Ljava/lang/Object;" />
 		<method name="getAttributes(Ljava/lang/String;)Ljava/util/jar/Attributes;" />
-		<method name="getEntries()Ljava/util/Map&lt;java/lang/String, java$util/jar/Attributes>;" />
+		<method name="getEntries()Ljava/util/Map;" />
 		<method name="getMainAttributes()Ljava/util/jar/Attributes;" />
 		<method name="read(Ljava/io/InputStream;)V" />
 		<method name="write(Ljava/io/OutputStream;)V" />
@@ -39088,7 +39058,7 @@
 		<method name="addPropertyChangeListener(Ljava/beans/PropertyChangeListener;)V" since="3" />
 		<method name="pack(Ljava/util/jar/JarFile;Ljava/io/OutputStream;)V" />
 		<method name="pack(Ljava/util/jar/JarInputStream;Ljava/io/OutputStream;)V" />
-		<method name="properties()Ljava/util/SortedMap&lt;java/lang/String, java$lang/String>;" />
+		<method name="properties()Ljava/util/SortedMap;" />
 		<method name="removePropertyChangeListener(Ljava/beans/PropertyChangeListener;)V" since="3" />
 		<field name="CLASS_ATTRIBUTE_PFX" />
 		<field name="CODE_ATTRIBUTE_PFX" />
@@ -39112,7 +39082,7 @@
 	</class>
 	<class name="java/util/jar/Pack200$Unpacker" since="1">
 		<method name="addPropertyChangeListener(Ljava/beans/PropertyChangeListener;)V" since="3" />
-		<method name="properties()Ljava/util/SortedMap&lt;java/lang/String, java$lang/String>;" />
+		<method name="properties()Ljava/util/SortedMap;" />
 		<method name="removePropertyChangeListener(Ljava/beans/PropertyChangeListener;)V" since="3" />
 		<method name="unpack(Ljava/io/File;Ljava/util/jar/JarOutputStream;)V" />
 		<method name="unpack(Ljava/io/InputStream;Ljava/util/jar/JarOutputStream;)V" />
@@ -39204,7 +39174,7 @@
 		<method name="checkAccess()V" />
 		<method name="getLogManager()Ljava/util/logging/LogManager;" />
 		<method name="getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;" />
-		<method name="getLoggerNames()Ljava/util/Enumeration&lt;java/lang/String>;" />
+		<method name="getLoggerNames()Ljava/util/Enumeration;" />
 		<method name="getLoggingMXBean()Ljava/util/logging/LoggingMXBean;" since="3" />
 		<method name="getProperty(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="readConfiguration()V" />
@@ -39295,7 +39265,7 @@
 	</class>
 	<class name="java/util/logging/LoggingMXBean" since="1">
 		<method name="getLoggerLevel(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getLoggerNames()Ljava/util/List&lt;java/lang/String>;" />
+		<method name="getLoggerNames()Ljava/util/List;" />
 		<method name="getParentLoggerName(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="setLoggerLevel(Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
@@ -39464,10 +39434,10 @@
 		<method name="removeNodeChangeListener(Ljava/util/prefs/NodeChangeListener;)V" />
 		<method name="removePreferenceChangeListener(Ljava/util/prefs/PreferenceChangeListener;)V" />
 		<method name="sync()V" />
-		<method name="systemNodeForPackage(Ljava/lang/Class&lt;?>;)Ljava/util/prefs/Preferences;" />
+		<method name="systemNodeForPackage(Ljava/lang/Class;)Ljava/util/prefs/Preferences;" />
 		<method name="systemRoot()Ljava/util/prefs/Preferences;" />
 		<method name="toString()Ljava/lang/String;" />
-		<method name="userNodeForPackage(Ljava/lang/Class&lt;?>;)Ljava/util/prefs/Preferences;" />
+		<method name="userNodeForPackage(Ljava/lang/Class;)Ljava/util/prefs/Preferences;" />
 		<method name="userRoot()Ljava/util/prefs/Preferences;" />
 		<field name="MAX_KEY_LENGTH" />
 		<field name="MAX_NAME_LENGTH" />
@@ -39734,7 +39704,7 @@
 		<method name="&lt;init>(Ljava/io/File;I)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="close()V" />
-		<method name="entries()Ljava/util/Enumeration&lt;? extends java/util/zip/ZipEntry>;" />
+		<method name="entries()Ljava/util/Enumeration;" />
 		<method name="getEntry(Ljava/lang/String;)Ljava/util/zip/ZipEntry;" />
 		<method name="getInputStream(Ljava/util/zip/ZipEntry;)Ljava/io/InputStream;" />
 		<method name="getName()Ljava/lang/String;" />
@@ -41133,9 +41103,7 @@
 		<implements name="javax/net/ssl/ManagerFactoryParameters" />
 		<method name="&lt;init>(Ljava/security/KeyStore$Builder;)V" />
 		<method name="&lt;init>(Ljava/util/List;)V" />
-		<method name="&lt;init>(Ljava/util/List&lt;java/security/KeyStore$Builder>;)V" since="9" />
 		<method name="getParameters()Ljava/util/List;" />
-		<method name="getParameters()Ljava/util/List&lt;java/security/KeyStore$Builder>;" since="9" />
 	</class>
 	<class name="javax/net/ssl/ManagerFactoryParameters" since="1">
 	</class>
@@ -41221,20 +41189,20 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;" />
 		<method name="values()[Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;" />
-		<field name="FINISHED" />
-		<field name="NEED_TASK" />
-		<field name="NEED_UNWRAP" />
-		<field name="NEED_WRAP" />
-		<field name="NOT_HANDSHAKING" />
+		<field name="FINISHED" since="14" />
+		<field name="NEED_TASK" since="14" />
+		<field name="NEED_UNWRAP" since="14" />
+		<field name="NEED_WRAP" since="14" />
+		<field name="NOT_HANDSHAKING" since="14" />
 	</class>
 	<class name="javax/net/ssl/SSLEngineResult$Status" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Ljavax/net/ssl/SSLEngineResult$Status;" />
 		<method name="values()[Ljavax/net/ssl/SSLEngineResult$Status;" />
-		<field name="BUFFER_OVERFLOW" />
-		<field name="BUFFER_UNDERFLOW" />
-		<field name="CLOSED" />
-		<field name="OK" />
+		<field name="BUFFER_OVERFLOW" since="14" />
+		<field name="BUFFER_UNDERFLOW" since="14" />
+		<field name="CLOSED" since="14" />
+		<field name="OK" since="14" />
 	</class>
 	<class name="javax/net/ssl/SSLException" since="1">
 		<extends name="java/io/IOException" />
@@ -41342,7 +41310,6 @@
 	</class>
 	<class name="javax/net/ssl/SSLSessionContext" since="1">
 		<method name="getIds()Ljava/util/Enumeration;" />
-		<method name="getIds()Ljava/util/Enumeration&lt;byte[]>;" since="9" />
 		<method name="getSession([B)Ljavax/net/ssl/SSLSession;" />
 		<method name="getSessionCacheSize()I" />
 		<method name="getSessionTimeout()I" />
@@ -41457,21 +41424,21 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(ZLjava/util/Set&lt;? extends java/security/Principal>;Ljava/util/Set&lt;?>;Ljava/util/Set&lt;?>;)V" />
+		<method name="&lt;init>(ZLjava/util/Set;Ljava/util/Set;Ljava/util/Set;)V" />
+		<method name="doAs(Ljavax/security/auth/Subject;Ljava/security/PrivilegedAction;)LT;" since="9" />
 		<method name="doAs(Ljavax/security/auth/Subject;Ljava/security/PrivilegedAction;)Ljava/lang/Object;" />
-		<method name="doAs(Ljavax/security/auth/Subject;Ljava/security/PrivilegedAction&lt;T>;)LT;" since="9" />
+		<method name="doAs(Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction;)LT;" since="9" />
 		<method name="doAs(Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;" />
-		<method name="doAs(Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction&lt;T>;)LT;" since="9" />
+		<method name="doAsPrivileged(Ljavax/security/auth/Subject;Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;)LT;" since="9" />
 		<method name="doAsPrivileged(Ljavax/security/auth/Subject;Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;" />
-		<method name="doAsPrivileged(Ljavax/security/auth/Subject;Ljava/security/PrivilegedAction&lt;T>;Ljava/security/AccessControlContext;)LT;" since="9" />
+		<method name="doAsPrivileged(Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;)LT;" since="9" />
 		<method name="doAsPrivileged(Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;" />
-		<method name="doAsPrivileged(Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction&lt;T>;Ljava/security/AccessControlContext;)LT;" since="9" />
-		<method name="getPrincipals()Ljava/util/Set&lt;java/security/Principal>;" />
-		<method name="getPrincipals(Ljava/lang/Class&lt;T>;)Ljava/util/Set&lt;T>;" />
-		<method name="getPrivateCredentials()Ljava/util/Set&lt;java/lang/Object>;" />
-		<method name="getPrivateCredentials(Ljava/lang/Class&lt;T>;)Ljava/util/Set&lt;T>;" />
-		<method name="getPublicCredentials()Ljava/util/Set&lt;java/lang/Object>;" />
-		<method name="getPublicCredentials(Ljava/lang/Class&lt;T>;)Ljava/util/Set&lt;T>;" />
+		<method name="getPrincipals()Ljava/util/Set;" />
+		<method name="getPrincipals(Ljava/lang/Class;)Ljava/util/Set;" />
+		<method name="getPrivateCredentials()Ljava/util/Set;" />
+		<method name="getPrivateCredentials(Ljava/lang/Class;)Ljava/util/Set;" />
+		<method name="getPublicCredentials()Ljava/util/Set;" />
+		<method name="getPublicCredentials(Ljava/lang/Class;)Ljava/util/Set;" />
 		<method name="getSubject(Ljava/security/AccessControlContext;)Ljavax/security/auth/Subject;" />
 		<method name="isReadOnly()Z" />
 		<method name="setReadOnly()V" />
@@ -41516,12 +41483,12 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(Ljava/io/InputStream;)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)V" since="9" />
+		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Map;)V" since="9" />
 		<method name="&lt;init>([B)V" />
 		<method name="getEncoded()[B" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getName(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getName(Ljava/lang/String;Ljava/util/Map&lt;java/lang/String, java$lang/String>;)Ljava/lang/String;" since="9" />
+		<method name="getName(Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;" since="9" />
 		<field name="CANONICAL" />
 		<field name="RFC1779" />
 		<field name="RFC2253" />
@@ -41635,7 +41602,7 @@
 		<method name="getPassword()Ljava/lang/String;" />
 		<method name="getQueryTimeout()I" />
 		<method name="getTransactionIsolation()I" />
-		<method name="getTypeMap()Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;" />
+		<method name="getTypeMap()Ljava/util/Map;" />
 		<method name="getUrl()Ljava/lang/String;" />
 		<method name="getUsername()Ljava/lang/String;" />
 		<method name="isReadOnly()Z" />
@@ -41735,7 +41702,7 @@
 		<method name="setTimestamp(Ljava/lang/String;Ljava/sql/Timestamp;Ljava/util/Calendar;)V" since="9" />
 		<method name="setTransactionIsolation(I)V" />
 		<method name="setType(I)V" />
-		<method name="setTypeMap(Ljava/util/Map&lt;java/lang/String, java$lang/Class&lt;?>>;)V" />
+		<method name="setTypeMap(Ljava/util/Map;)V" />
 		<method name="setURL(ILjava/net/URL;)V" since="9" />
 		<method name="setUrl(Ljava/lang/String;)V" />
 		<method name="setUsername(Ljava/lang/String;)V" />
@@ -42965,9 +42932,9 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="getAuthScheme(Ljava/lang/String;Lorg/apache/http/params/HttpParams;)Lorg/apache/http/auth/AuthScheme;" />
-		<method name="getSchemeNames()Ljava/util/List&lt;java/lang/String>;" />
+		<method name="getSchemeNames()Ljava/util/List;" />
 		<method name="register(Ljava/lang/String;Lorg/apache/http/auth/AuthSchemeFactory;)V" />
-		<method name="setItems(Ljava/util/Map&lt;java/lang/String, org$apache/http/auth/AuthSchemeFactory>;)V" />
+		<method name="setItems(Ljava/util/Map;)V" />
 		<method name="unregister(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/auth/AuthScope" since="1">
@@ -43069,9 +43036,9 @@
 		<method name="setCredentialCharset(Lorg/apache/http/params/HttpParams;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/client/AuthenticationHandler" since="1">
-		<method name="getChallenges(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Ljava/util/Map&lt;java/lang/String, org$apache/http/Header>;" />
+		<method name="getChallenges(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Ljava/util/Map;" />
 		<method name="isAuthenticationRequested(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
-		<method name="selectScheme(Ljava/util/Map&lt;java/lang/String, org$apache/http/Header>;Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/auth/AuthScheme;" />
+		<method name="selectScheme(Ljava/util/Map;Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/auth/AuthScheme;" />
 	</class>
 	<class name="org/apache/http/client/CircularRedirectException" since="1">
 		<extends name="org/apache/http/client/RedirectException" />
@@ -43090,7 +43057,7 @@
 		<method name="addCookie(Lorg/apache/http/cookie/Cookie;)V" />
 		<method name="clear()V" />
 		<method name="clearExpired(Ljava/util/Date;)Z" />
-		<method name="getCookies()Ljava/util/List&lt;org/apache/http/cookie/Cookie>;" />
+		<method name="getCookies()Ljava/util/List;" />
 	</class>
 	<class name="org/apache/http/client/CredentialsProvider" since="1">
 		<method name="clear()V" />
@@ -43099,12 +43066,12 @@
 	</class>
 	<class name="org/apache/http/client/HttpClient" since="1">
 		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;)Lorg/apache/http/HttpResponse;" />
-		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;)LT;" />
-		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;Lorg/apache/http/protocol/HttpContext;)LT;" />
+		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler;)LT;" />
+		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler;Lorg/apache/http/protocol/HttpContext;)LT;" />
 		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;)Lorg/apache/http/HttpResponse;" />
-		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;)LT;" />
-		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;Lorg/apache/http/protocol/HttpContext;)LT;" />
+		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler;)LT;" />
+		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler;Lorg/apache/http/protocol/HttpContext;)LT;" />
 		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 		<method name="getConnectionManager()Lorg/apache/http/conn/ClientConnectionManager;" />
 		<method name="getParams()Lorg/apache/http/params/HttpParams;" />
@@ -43143,8 +43110,8 @@
 	</class>
 	<class name="org/apache/http/client/entity/UrlEncodedFormEntity" since="1">
 		<extends name="org/apache/http/entity/StringEntity" />
-		<method name="&lt;init>(Ljava/util/List&lt;? extends org/apache/http/NameValuePair>;)V" />
-		<method name="&lt;init>(Ljava/util/List&lt;? extends org/apache/http/NameValuePair>;Ljava/lang/String;)V" />
+		<method name="&lt;init>(Ljava/util/List;)V" />
+		<method name="&lt;init>(Ljava/util/List;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/client/methods/AbortableHttpRequest" since="1">
 		<method name="abort()V" />
@@ -43188,7 +43155,7 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/net/URI;)V" />
-		<method name="getAllowedMethods(Lorg/apache/http/HttpResponse;)Ljava/util/Set&lt;java/lang/String>;" />
+		<method name="getAllowedMethods(Lorg/apache/http/HttpResponse;)Ljava/util/Set;" />
 		<method name="getMethod()Ljava/lang/String;" />
 		<field name="METHOD_NAME" />
 	</class>
@@ -43276,7 +43243,7 @@
 		<method name="setConnectionManagerFactory(Lorg/apache/http/conn/ClientConnectionManagerFactory;)V" />
 		<method name="setConnectionManagerFactoryClassName(Ljava/lang/String;)V" />
 		<method name="setCookiePolicy(Ljava/lang/String;)V" />
-		<method name="setDefaultHeaders(Ljava/util/Collection&lt;org/apache/http/Header>;)V" />
+		<method name="setDefaultHeaders(Ljava/util/Collection;)V" />
 		<method name="setDefaultHost(Lorg/apache/http/HttpHost;)V" />
 		<method name="setHandleAuthentication(Z)V" />
 		<method name="setHandleRedirects(Z)V" />
@@ -43317,7 +43284,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/client/protocol/ClientContext" />
 		<method name="&lt;init>(Lorg/apache/http/protocol/HttpContext;)V" />
-		<method name="setAuthSchemePref(Ljava/util/List&lt;java/lang/String>;)V" />
+		<method name="setAuthSchemePref(Ljava/util/List;)V" />
 		<method name="setAuthSchemeRegistry(Lorg/apache/http/auth/AuthSchemeRegistry;)V" />
 		<method name="setCookieSpecRegistry(Lorg/apache/http/cookie/CookieSpecRegistry;)V" />
 		<method name="setCookieStore(Lorg/apache/http/client/CookieStore;)V" />
@@ -43368,11 +43335,11 @@
 	<class name="org/apache/http/client/utils/URLEncodedUtils" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="format(Ljava/util/List&lt;? extends org/apache/http/NameValuePair>;Ljava/lang/String;)Ljava/lang/String;" />
+		<method name="format(Ljava/util/List;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="isEncoded(Lorg/apache/http/HttpEntity;)Z" />
-		<method name="parse(Ljava/net/URI;Ljava/lang/String;)Ljava/util/List&lt;org/apache/http/NameValuePair>;" />
-		<method name="parse(Ljava/util/List&lt;org/apache/http/NameValuePair>;Ljava/util/Scanner;Ljava/lang/String;)V" />
-		<method name="parse(Lorg/apache/http/HttpEntity;)Ljava/util/List&lt;org/apache/http/NameValuePair>;" />
+		<method name="parse(Ljava/net/URI;Ljava/lang/String;)Ljava/util/List;" />
+		<method name="parse(Ljava/util/List;Ljava/util/Scanner;Ljava/lang/String;)V" />
+		<method name="parse(Lorg/apache/http/HttpEntity;)Ljava/util/List;" />
 		<field name="CONTENT_TYPE" />
 	</class>
 	<class name="org/apache/http/conn/BasicEofSensorWatcher" since="1">
@@ -43539,7 +43506,7 @@
 		<method name="getMaxForRoute(Lorg/apache/http/conn/routing/HttpRoute;)I" />
 		<method name="setDefaultMaxPerRoute(I)V" />
 		<method name="setMaxForRoute(Lorg/apache/http/conn/routing/HttpRoute;I)V" />
-		<method name="setMaxForRoutes(Ljava/util/Map&lt;org/apache/http/conn/routing/HttpRoute, java$lang/Integer>;)V" />
+		<method name="setMaxForRoutes(Ljava/util/Map;)V" />
 		<field name="DEFAULT_MAX_CONNECTIONS_PER_ROUTE" />
 	</class>
 	<class name="org/apache/http/conn/params/ConnRoutePNames" since="1">
@@ -43628,15 +43595,15 @@
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Lorg/apache/http/conn/routing/RouteInfo$LayerType;" />
 		<method name="values()[Lorg/apache/http/conn/routing/RouteInfo$LayerType;" />
-		<field name="LAYERED" />
-		<field name="PLAIN" />
+		<field name="LAYERED" since="14" />
+		<field name="PLAIN" since="14" />
 	</class>
 	<class name="org/apache/http/conn/routing/RouteInfo$TunnelType" since="1">
 		<extends name="java/lang/Enum" />
 		<method name="valueOf(Ljava/lang/String;)Lorg/apache/http/conn/routing/RouteInfo$TunnelType;" />
 		<method name="values()[Lorg/apache/http/conn/routing/RouteInfo$TunnelType;" />
-		<field name="PLAIN" />
-		<field name="TUNNELLED" />
+		<field name="PLAIN" since="14" />
+		<field name="TUNNELLED" since="14" />
 	</class>
 	<class name="org/apache/http/conn/routing/RouteTracker" since="1">
 		<extends name="java/lang/Object" />
@@ -43700,9 +43667,9 @@
 		<method name="get(Ljava/lang/String;)Lorg/apache/http/conn/scheme/Scheme;" />
 		<method name="getScheme(Ljava/lang/String;)Lorg/apache/http/conn/scheme/Scheme;" />
 		<method name="getScheme(Lorg/apache/http/HttpHost;)Lorg/apache/http/conn/scheme/Scheme;" />
-		<method name="getSchemeNames()Ljava/util/List&lt;java/lang/String>;" />
+		<method name="getSchemeNames()Ljava/util/List;" />
 		<method name="register(Lorg/apache/http/conn/scheme/Scheme;)Lorg/apache/http/conn/scheme/Scheme;" />
-		<method name="setItems(Ljava/util/Map&lt;java/lang/String, org$apache/http/conn/scheme/Scheme>;)V" />
+		<method name="setItems(Ljava/util/Map;)V" />
 		<method name="unregister(Ljava/lang/String;)Lorg/apache/http/conn/scheme/Scheme;" />
 	</class>
 	<class name="org/apache/http/conn/scheme/SocketFactory" since="1">
@@ -43833,11 +43800,11 @@
 		<method name="compare(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/Cookie;)I" />
 	</class>
 	<class name="org/apache/http/cookie/CookieSpec" since="1">
-		<method name="formatCookies(Ljava/util/List&lt;org/apache/http/cookie/Cookie>;)Ljava/util/List&lt;org/apache/http/Header>;" />
+		<method name="formatCookies(Ljava/util/List;)Ljava/util/List;" />
 		<method name="getVersion()I" />
 		<method name="getVersionHeader()Lorg/apache/http/Header;" />
 		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List&lt;org/apache/http/cookie/Cookie>;" />
+		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List;" />
 		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/cookie/CookieSpecFactory" since="1">
@@ -43848,9 +43815,9 @@
 		<method name="&lt;init>()V" />
 		<method name="getCookieSpec(Ljava/lang/String;)Lorg/apache/http/cookie/CookieSpec;" />
 		<method name="getCookieSpec(Ljava/lang/String;Lorg/apache/http/params/HttpParams;)Lorg/apache/http/cookie/CookieSpec;" />
-		<method name="getSpecNames()Ljava/util/List&lt;java/lang/String>;" />
+		<method name="getSpecNames()Ljava/util/List;" />
 		<method name="register(Ljava/lang/String;Lorg/apache/http/cookie/CookieSpecFactory;)V" />
-		<method name="setItems(Ljava/util/Map&lt;java/lang/String, org$apache/http/cookie/CookieSpecFactory>;)V" />
+		<method name="setItems(Ljava/util/Map;)V" />
 		<method name="unregister(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/cookie/MalformedCookieException" since="1">
@@ -43888,7 +43855,7 @@
 	<class name="org/apache/http/cookie/params/CookieSpecParamBean" since="1">
 		<extends name="org/apache/http/params/HttpAbstractParamBean" />
 		<method name="&lt;init>(Lorg/apache/http/params/HttpParams;)V" />
-		<method name="setDatePatterns(Ljava/util/Collection&lt;java/lang/String>;)V" />
+		<method name="setDatePatterns(Ljava/util/Collection;)V" />
 		<method name="setSingleHeader(Z)V" />
 	</class>
 	<class name="org/apache/http/entity/AbstractHttpEntity" since="1">
@@ -44220,7 +44187,7 @@
 		<extends name="org/apache/http/impl/auth/AuthSchemeBase" />
 		<method name="&lt;init>()V" />
 		<method name="getParameter(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getParameters()Ljava/util/Map&lt;java/lang/String, java$lang/String>;" />
+		<method name="getParameters()Ljava/util/Map;" />
 		<method name="getRealm()Ljava/lang/String;" />
 		<method name="parseChallenge(Lorg/apache/http/util/CharArrayBuffer;II)V" />
 	</class>
@@ -44234,9 +44201,9 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/client/AuthenticationHandler" />
 		<method name="&lt;init>()V" />
-		<method name="getAuthPreferences()Ljava/util/List&lt;java/lang/String>;" />
-		<method name="parseChallenges([Lorg/apache/http/Header;)Ljava/util/Map&lt;java/lang/String, org$apache/http/Header>;" />
-		<method name="selectScheme(Ljava/util/Map&lt;java/lang/String, org$apache/http/Header>;Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/auth/AuthScheme;" />
+		<method name="getAuthPreferences()Ljava/util/List;" />
+		<method name="parseChallenges([Lorg/apache/http/Header;)Ljava/util/Map;" />
+		<method name="selectScheme(Ljava/util/Map;Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/auth/AuthScheme;" />
 	</class>
 	<class name="org/apache/http/impl/client/AbstractHttpClient" since="1">
 		<extends name="java/lang/Object" />
@@ -44268,12 +44235,12 @@
 		<method name="createUserTokenHandler()Lorg/apache/http/client/UserTokenHandler;" />
 		<method name="determineParams(Lorg/apache/http/HttpRequest;)Lorg/apache/http/params/HttpParams;" />
 		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;)Lorg/apache/http/HttpResponse;" />
-		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;)LT;" />
-		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;Lorg/apache/http/protocol/HttpContext;)LT;" />
+		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler;)LT;" />
+		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler;Lorg/apache/http/protocol/HttpContext;)LT;" />
 		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;)Lorg/apache/http/HttpResponse;" />
-		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;)LT;" />
-		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler&lt;? extends T>;Lorg/apache/http/protocol/HttpContext;)LT;" />
+		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler;)LT;" />
+		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler;Lorg/apache/http/protocol/HttpContext;)LT;" />
 		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 		<method name="getAuthSchemes()Lorg/apache/http/auth/AuthSchemeRegistry;" />
 		<method name="getConnectionKeepAliveStrategy()Lorg/apache/http/conn/ConnectionKeepAliveStrategy;" />
@@ -44295,8 +44262,8 @@
 		<method name="getRoutePlanner()Lorg/apache/http/conn/routing/HttpRoutePlanner;" />
 		<method name="getTargetAuthenticationHandler()Lorg/apache/http/client/AuthenticationHandler;" />
 		<method name="getUserTokenHandler()Lorg/apache/http/client/UserTokenHandler;" />
-		<method name="removeRequestInterceptorByClass(Ljava/lang/Class&lt;? extends org/apache/http/HttpRequestInterceptor>;)V" />
-		<method name="removeResponseInterceptorByClass(Ljava/lang/Class&lt;? extends org/apache/http/HttpResponseInterceptor>;)V" />
+		<method name="removeRequestInterceptorByClass(Ljava/lang/Class;)V" />
+		<method name="removeResponseInterceptorByClass(Ljava/lang/Class;)V" />
 		<method name="setAuthSchemes(Lorg/apache/http/auth/AuthSchemeRegistry;)V" />
 		<method name="setCookieSpecs(Lorg/apache/http/cookie/CookieSpecRegistry;)V" />
 		<method name="setCookieStore(Lorg/apache/http/client/CookieStore;)V" />
@@ -44319,7 +44286,7 @@
 		<method name="addCookies([Lorg/apache/http/cookie/Cookie;)V" />
 		<method name="clear()V" />
 		<method name="clearExpired(Ljava/util/Date;)Z" />
-		<method name="getCookies()Ljava/util/List&lt;org/apache/http/cookie/Cookie>;" />
+		<method name="getCookies()Ljava/util/List;" />
 	</class>
 	<class name="org/apache/http/impl/client/BasicCredentialsProvider" since="1">
 		<extends name="java/lang/Object" />
@@ -44394,7 +44361,7 @@
 	<class name="org/apache/http/impl/client/DefaultProxyAuthenticationHandler" since="1">
 		<extends name="org/apache/http/impl/client/AbstractAuthenticationHandler" />
 		<method name="&lt;init>()V" />
-		<method name="getChallenges(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Ljava/util/Map&lt;java/lang/String, org$apache/http/Header>;" />
+		<method name="getChallenges(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Ljava/util/Map;" />
 		<method name="isAuthenticationRequested(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/impl/client/DefaultRedirectHandler" since="1">
@@ -44431,7 +44398,7 @@
 	<class name="org/apache/http/impl/client/DefaultTargetAuthenticationHandler" since="1">
 		<extends name="org/apache/http/impl/client/AbstractAuthenticationHandler" />
 		<method name="&lt;init>()V" />
-		<method name="getChallenges(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Ljava/util/Map&lt;java/lang/String, org$apache/http/Header>;" />
+		<method name="getChallenges(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Ljava/util/Map;" />
 		<method name="isAuthenticationRequested(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/impl/client/DefaultUserTokenHandler" since="1">
@@ -44621,7 +44588,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/routing/HttpRoutePlanner" />
 		<method name="&lt;init>(Lorg/apache/http/conn/scheme/SchemeRegistry;Ljava/net/ProxySelector;)V" />
-		<method name="chooseProxy(Ljava/util/List&lt;java/net/Proxy>;Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Ljava/net/Proxy;" />
+		<method name="chooseProxy(Ljava/util/List;Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Ljava/net/Proxy;" />
 		<method name="determineProxy(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpHost;" />
 		<method name="determineRoute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/conn/routing/HttpRoute;" />
 		<method name="getHost(Ljava/net/InetSocketAddress;)Ljava/lang/String;" />
@@ -44703,14 +44670,14 @@
 	</class>
 	<class name="org/apache/http/impl/conn/tsccm/BasicPoolEntry" since="1">
 		<extends name="org/apache/http/impl/conn/AbstractPoolEntry" />
-		<method name="&lt;init>(Lorg/apache/http/conn/ClientConnectionOperator;Lorg/apache/http/conn/routing/HttpRoute;Ljava/lang/ref/ReferenceQueue&lt;java/lang/Object>;)V" />
+		<method name="&lt;init>(Lorg/apache/http/conn/ClientConnectionOperator;Lorg/apache/http/conn/routing/HttpRoute;Ljava/lang/ref/ReferenceQueue;)V" />
 		<method name="getConnection()Lorg/apache/http/conn/OperatedClientConnection;" />
 		<method name="getPlannedRoute()Lorg/apache/http/conn/routing/HttpRoute;" />
 		<method name="getWeakRef()Lorg/apache/http/impl/conn/tsccm/BasicPoolEntryRef;" />
 	</class>
 	<class name="org/apache/http/impl/conn/tsccm/BasicPoolEntryRef" since="1">
 		<extends name="java/lang/ref/WeakReference" />
-		<method name="&lt;init>(Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;Ljava/lang/ref/ReferenceQueue&lt;java/lang/Object>;)V" />
+		<method name="&lt;init>(Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;Ljava/lang/ref/ReferenceQueue;)V" />
 		<method name="getRoute()Lorg/apache/http/conn/routing/HttpRoute;" />
 	</class>
 	<class name="org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter" since="1">
@@ -44722,9 +44689,9 @@
 		<extends name="org/apache/http/impl/conn/tsccm/AbstractConnPool" />
 		<method name="&lt;init>(Lorg/apache/http/conn/ClientConnectionOperator;Lorg/apache/http/params/HttpParams;)V" />
 		<method name="createEntry(Lorg/apache/http/impl/conn/tsccm/RouteSpecificPool;Lorg/apache/http/conn/ClientConnectionOperator;)Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;" />
-		<method name="createFreeConnQueue()Ljava/util/Queue&lt;org/apache/http/impl/conn/tsccm/BasicPoolEntry>;" />
-		<method name="createRouteToPoolMap()Ljava/util/Map&lt;org/apache/http/conn/routing/HttpRoute, org$apache/http/impl/conn/tsccm/RouteSpecificPool>;" />
-		<method name="createWaitingThreadQueue()Ljava/util/Queue&lt;org/apache/http/impl/conn/tsccm/WaitingThread>;" />
+		<method name="createFreeConnQueue()Ljava/util/Queue;" />
+		<method name="createRouteToPoolMap()Ljava/util/Map;" />
+		<method name="createWaitingThreadQueue()Ljava/util/Queue;" />
 		<method name="deleteClosedConnections()V" />
 		<method name="deleteEntry(Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;)V" />
 		<method name="deleteLeastUsedEntry()V" />
@@ -44749,12 +44716,12 @@
 		<method name="getPoolEntry(JLjava/util/concurrent/TimeUnit;)Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;" />
 	</class>
 	<class name="org/apache/http/impl/conn/tsccm/RefQueueHandler" since="1">
-		<method name="handleReference(Ljava/lang/ref/Reference&lt;?>;)V" />
+		<method name="handleReference(Ljava/lang/ref/Reference;)V" />
 	</class>
 	<class name="org/apache/http/impl/conn/tsccm/RefQueueWorker" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Runnable" />
-		<method name="&lt;init>(Ljava/lang/ref/ReferenceQueue&lt;?>;Lorg/apache/http/impl/conn/tsccm/RefQueueHandler;)V" />
+		<method name="&lt;init>(Ljava/lang/ref/ReferenceQueue;Lorg/apache/http/impl/conn/tsccm/RefQueueHandler;)V" />
 		<method name="run()V" />
 		<method name="shutdown()V" />
 		<field name="refHandler" />
@@ -44831,7 +44798,7 @@
 		<method name="&lt;init>()V" />
 		<method name="findAttribHandler(Ljava/lang/String;)Lorg/apache/http/cookie/CookieAttributeHandler;" />
 		<method name="getAttribHandler(Ljava/lang/String;)Lorg/apache/http/cookie/CookieAttributeHandler;" />
-		<method name="getAttribHandlers()Ljava/util/Collection&lt;org/apache/http/cookie/CookieAttributeHandler>;" />
+		<method name="getAttribHandlers()Ljava/util/Collection;" />
 		<method name="registerAttribHandler(Ljava/lang/String;Lorg/apache/http/cookie/CookieAttributeHandler;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BasicClientCookie" since="1">
@@ -44913,11 +44880,11 @@
 		<implements name="org/apache/http/cookie/CookieSpec" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>([Ljava/lang/String;Z)V" />
-		<method name="formatCookies(Ljava/util/List&lt;org/apache/http/cookie/Cookie>;)Ljava/util/List&lt;org/apache/http/Header>;" />
+		<method name="formatCookies(Ljava/util/List;)Ljava/util/List;" />
 		<method name="getVersion()I" />
 		<method name="getVersionHeader()Lorg/apache/http/Header;" />
 		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List&lt;org/apache/http/cookie/Cookie>;" />
+		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List;" />
 		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BestMatchSpecFactory" since="1">
@@ -44930,10 +44897,10 @@
 		<extends name="org/apache/http/impl/cookie/CookieSpecBase" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>([Ljava/lang/String;)V" />
-		<method name="formatCookies(Ljava/util/List&lt;org/apache/http/cookie/Cookie>;)Ljava/util/List&lt;org/apache/http/Header>;" />
+		<method name="formatCookies(Ljava/util/List;)Ljava/util/List;" />
 		<method name="getVersion()I" />
 		<method name="getVersionHeader()Lorg/apache/http/Header;" />
-		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List&lt;org/apache/http/cookie/Cookie>;" />
+		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List;" />
 		<field name="DATE_PATTERNS" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BrowserCompatSpecFactory" since="1">
@@ -44948,7 +44915,7 @@
 		<method name="getDefaultDomain(Lorg/apache/http/cookie/CookieOrigin;)Ljava/lang/String;" />
 		<method name="getDefaultPath(Lorg/apache/http/cookie/CookieOrigin;)Ljava/lang/String;" />
 		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse([Lorg/apache/http/HeaderElement;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List&lt;org/apache/http/cookie/Cookie>;" />
+		<method name="parse([Lorg/apache/http/HeaderElement;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List;" />
 		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/DateParseException" since="1">
@@ -44982,10 +44949,10 @@
 		<extends name="org/apache/http/impl/cookie/CookieSpecBase" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>([Ljava/lang/String;)V" />
-		<method name="formatCookies(Ljava/util/List&lt;org/apache/http/cookie/Cookie>;)Ljava/util/List&lt;org/apache/http/Header>;" />
+		<method name="formatCookies(Ljava/util/List;)Ljava/util/List;" />
 		<method name="getVersion()I" />
 		<method name="getVersionHeader()Lorg/apache/http/Header;" />
-		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List&lt;org/apache/http/cookie/Cookie>;" />
+		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List;" />
 		<field name="EXPIRES_PATTERN" />
 	</class>
 	<class name="org/apache/http/impl/cookie/NetscapeDraftSpecFactory" since="1">
@@ -45007,11 +44974,11 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>([Ljava/lang/String;Z)V" />
 		<method name="formatCookieAsVer(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/cookie/Cookie;I)V" />
-		<method name="formatCookies(Ljava/util/List&lt;org/apache/http/cookie/Cookie>;)Ljava/util/List&lt;org/apache/http/Header>;" />
+		<method name="formatCookies(Ljava/util/List;)Ljava/util/List;" />
 		<method name="formatParamAsVer(Lorg/apache/http/util/CharArrayBuffer;Ljava/lang/String;Ljava/lang/String;I)V" />
 		<method name="getVersion()I" />
 		<method name="getVersionHeader()Lorg/apache/http/Header;" />
-		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List&lt;org/apache/http/cookie/Cookie>;" />
+		<method name="parse(Lorg/apache/http/Header;Lorg/apache/http/cookie/CookieOrigin;)Ljava/util/List;" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2109SpecFactory" since="1">
 		<extends name="java/lang/Object" />