From 9649bee7b2482f7905f7e1ae33f3dc1052cee7f6 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Tue, 22 May 2012 12:40:39 -0700
Subject: [PATCH] Update API file with proper content.

This doesn't contain API 16 just yet. This is just a new version
based on reading all the android.jar instead of the text-based
files.

This new mechanism filters out all methods coming from super
classes as well as interfaces in an effort to make the file
smaller.

Change-Id: Ieefa7d01c29944b2b77b22e8cb81ee2e67afd555
---
 sdk/api-versions.xml | 5711 ++++++++++++++----------------------------
 1 file changed, 1935 insertions(+), 3776 deletions(-)

diff --git a/sdk/api-versions.xml b/sdk/api-versions.xml
index e52fb1a42..658aa6cd1 100644
--- a/sdk/api-versions.xml
+++ b/sdk/api-versions.xml
@@ -1980,7 +1980,6 @@
 		<extends name="android/app/Service" />
 		<method name="&lt;init>()V" />
 		<method name="onAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V" />
-		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
 		<method name="onInterrupt()V" />
 		<method name="onServiceConnected()V" />
 		<method name="setServiceInfo(Landroid/accessibilityservice/AccessibilityServiceInfo;)V" />
@@ -1991,7 +1990,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="feedbackTypeToString(I)Ljava/lang/String;" since="14" />
 		<method name="flagToString(I)Ljava/lang/String;" since="14" />
 		<method name="getCanRetrieveWindowContent()Z" since="14" />
@@ -1999,7 +1997,6 @@
 		<method name="getId()Ljava/lang/String;" since="14" />
 		<method name="getResolveInfo()Landroid/content/pm/ResolveInfo;" since="14" />
 		<method name="getSettingsActivityName()Ljava/lang/String;" since="14" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="DEFAULT" />
 		<field name="FEEDBACK_ALL_MASK" since="14" />
@@ -2032,8 +2029,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="name" />
 		<field name="type" />
@@ -2047,15 +2042,14 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
-		<method name="describeContents()I" />
 		<method name="onError(ILjava/lang/String;)V" />
 		<method name="onRequestContinued()V" />
 		<method name="onResult(Landroid/os/Bundle;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/accounts/AccountManager" since="5">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<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" />
@@ -2115,12 +2109,14 @@
 		<field name="LOGIN_ACCOUNTS_CHANGED_ACTION" />
 	</class>
 	<class name="android/accounts/AccountManagerCallback" since="5">
+		<extends name="java/lang/Object" />
 		<method name="run(Landroid/accounts/AccountManagerFuture;)V" />
 	</class>
 	<class name="android/accounts/AccountManagerFuture" since="5">
+		<extends name="java/lang/Object" />
 		<method name="cancel(Z)Z" />
-		<method name="getResult()LV;" />
-		<method name="getResult(JLjava/util/concurrent/TimeUnit;)LV;" />
+		<method name="getResult()Ljava/lang/Object;" />
+		<method name="getResult(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;" />
 		<method name="isCancelled()Z" />
 		<method name="isDone()Z" />
 	</class>
@@ -2136,9 +2132,7 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;IIII)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;IIIIZ)V" since="11" />
-		<method name="describeContents()I" />
 		<method name="newKey(Ljava/lang/String;)Landroid/accounts/AuthenticatorDescription;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="accountPreferencesId" />
 		<field name="customTokens" since="11" />
@@ -2163,6 +2157,7 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="android/accounts/OnAccountsUpdateListener" since="5">
+		<extends name="java/lang/Object" />
 		<method name="onAccountsUpdated([Landroid/accounts/Account;)V" />
 	</class>
 	<class name="android/accounts/OperationCanceledException" since="5">
@@ -2196,6 +2191,7 @@
 		<method name="start()V" />
 	</class>
 	<class name="android/animation/Animator$AnimatorListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onAnimationCancel(Landroid/animation/Animator;)V" />
 		<method name="onAnimationEnd(Landroid/animation/Animator;)V" />
 		<method name="onAnimationRepeat(Landroid/animation/Animator;)V" />
@@ -2210,29 +2206,22 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/animation/Animator$AnimatorListener" />
 		<method name="&lt;init>()V" />
-		<method name="onAnimationCancel(Landroid/animation/Animator;)V" />
-		<method name="onAnimationEnd(Landroid/animation/Animator;)V" />
-		<method name="onAnimationRepeat(Landroid/animation/Animator;)V" />
-		<method name="onAnimationStart(Landroid/animation/Animator;)V" />
 	</class>
 	<class name="android/animation/AnimatorSet" since="11">
 		<extends name="android/animation/Animator" />
 		<method name="&lt;init>()V" />
+		<method name="clone()Landroid/animation/AnimatorSet;" />
 		<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;)V" />
 		<method name="playSequentially([Landroid/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" />
-		<method name="setStartDelay(J)V" />
 	</class>
 	<class name="android/animation/AnimatorSet$Builder" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/animation/AnimatorSet;)V" />
 		<method name="after(J)Landroid/animation/AnimatorSet$Builder;" />
 		<method name="after(Landroid/animation/Animator;)Landroid/animation/AnimatorSet$Builder;" />
 		<method name="before(Landroid/animation/Animator;)Landroid/animation/AnimatorSet$Builder;" />
@@ -2242,21 +2231,18 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/animation/TypeEvaluator" />
 		<method name="&lt;init>()V" />
-		<method name="evaluate(FLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
 	</class>
 	<class name="android/animation/FloatEvaluator" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/animation/TypeEvaluator" />
 		<method name="&lt;init>()V" />
 		<method name="evaluate(FLjava/lang/Number;Ljava/lang/Number;)Ljava/lang/Float;" since="14" />
-		<method name="evaluate(FLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
 	</class>
 	<class name="android/animation/IntEvaluator" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/animation/TypeEvaluator" />
 		<method name="&lt;init>()V" />
 		<method name="evaluate(FLjava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/Integer;" since="14" />
-		<method name="evaluate(FLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
 	</class>
 	<class name="android/animation/Keyframe" since="11">
 		<extends name="java/lang/Object" />
@@ -2308,27 +2294,31 @@
 		<field name="DISAPPEARING" />
 	</class>
 	<class name="android/animation/LayoutTransition$TransitionListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="endTransition(Landroid/animation/LayoutTransition;Landroid/view/ViewGroup;Landroid/view/View;I)V" />
 		<method name="startTransition(Landroid/animation/LayoutTransition;Landroid/view/ViewGroup;Landroid/view/View;I)V" />
 	</class>
 	<class name="android/animation/ObjectAnimator" since="11">
 		<extends name="android/animation/ValueAnimator" />
 		<method name="&lt;init>()V" />
+		<method name="clone()Landroid/animation/ObjectAnimator;" />
 		<method name="getPropertyName()Ljava/lang/String;" />
 		<method name="getTarget()Ljava/lang/Object;" />
-		<method name="ofFloat(LT;Landroid/util/Property;[F)Landroid/animation/ObjectAnimator;" since="14" />
+		<method name="ofFloat(Ljava/lang/Object;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;[I)Landroid/animation/ObjectAnimator;" since="14" />
+		<method name="ofInt(Ljava/lang/Object;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;Landroid/animation/TypeEvaluator;[LV;)Landroid/animation/ObjectAnimator;" since="14" />
+		<method name="ofObject(Ljava/lang/Object;Landroid/util/Property;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)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="setDuration(J)Landroid/animation/ObjectAnimator;" />
 		<method name="setProperty(Landroid/util/Property;)V" since="14" />
 		<method name="setPropertyName(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/animation/PropertyValuesHolder" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
+		<method name="&lt;init>()V" />
 		<method name="clone()Landroid/animation/PropertyValuesHolder;" />
 		<method name="getPropertyName()Ljava/lang/String;" />
 		<method name="ofFloat(Landroid/util/Property;[F)Landroid/animation/PropertyValuesHolder;" since="14" />
@@ -2337,7 +2327,7 @@
 		<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;[LV;)Landroid/animation/PropertyValuesHolder;" since="14" />
+		<method name="ofObject(Landroid/util/Property;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)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" />
@@ -2348,28 +2338,27 @@
 		<method name="setPropertyName(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/animation/TimeInterpolator" since="11">
+		<extends name="java/lang/Object" />
 		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/animation/TypeEvaluator" since="11">
-		<method name="evaluate(FLT;LT;)LT;" since="14" />
+		<extends name="java/lang/Object" />
 		<method name="evaluate(FLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
 	</class>
 	<class name="android/animation/ValueAnimator" since="11">
 		<extends name="android/animation/Animator" />
 		<method name="&lt;init>()V" />
 		<method name="addUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V" />
+		<method name="clone()Landroid/animation/ValueAnimator;" />
 		<method name="getAnimatedFraction()F" since="12" />
 		<method name="getAnimatedValue()Ljava/lang/Object;" />
 		<method name="getAnimatedValue(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="getCurrentPlayTime()J" />
-		<method name="getDuration()J" />
 		<method name="getFrameDelay()J" />
 		<method name="getInterpolator()Landroid/animation/TimeInterpolator;" />
 		<method name="getRepeatCount()I" />
 		<method name="getRepeatMode()I" />
-		<method name="getStartDelay()J" />
 		<method name="getValues()[Landroid/animation/PropertyValuesHolder;" />
-		<method name="isRunning()Z" />
 		<method name="ofFloat([F)Landroid/animation/ValueAnimator;" />
 		<method name="ofInt([I)Landroid/animation/ValueAnimator;" />
 		<method name="ofObject(Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)Landroid/animation/ValueAnimator;" />
@@ -2383,17 +2372,16 @@
 		<method name="setFloatValues([F)V" />
 		<method name="setFrameDelay(J)V" />
 		<method name="setIntValues([I)V" />
-		<method name="setInterpolator(Landroid/animation/TimeInterpolator;)V" />
 		<method name="setObjectValues([Ljava/lang/Object;)V" />
 		<method name="setRepeatCount(I)V" />
 		<method name="setRepeatMode(I)V" />
-		<method name="setStartDelay(J)V" />
 		<method name="setValues([Landroid/animation/PropertyValuesHolder;)V" />
 		<field name="INFINITE" />
 		<field name="RESTART" />
 		<field name="REVERSE" />
 	</class>
 	<class name="android/animation/ValueAnimator$AnimatorUpdateListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onAnimationUpdate(Landroid/animation/ValueAnimator;)V" />
 	</class>
 	<class name="android/app/ActionBar" since="11">
@@ -2470,9 +2458,11 @@
 		<field name="gravity" />
 	</class>
 	<class name="android/app/ActionBar$OnMenuVisibilityListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onMenuVisibilityChanged(Z)V" />
 	</class>
 	<class name="android/app/ActionBar$OnNavigationListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onNavigationItemSelected(IJ)Z" />
 	</class>
 	<class name="android/app/ActionBar$Tab" since="11">
@@ -2498,6 +2488,7 @@
 		<field name="INVALID_POSITION" />
 	</class>
 	<class name="android/app/ActionBar$TabListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onTabReselected(Landroid/app/ActionBar$Tab;Landroid/app/FragmentTransaction;)V" />
 		<method name="onTabSelected(Landroid/app/ActionBar$Tab;Landroid/app/FragmentTransaction;)V" />
 		<method name="onTabUnselected(Landroid/app/ActionBar$Tab;Landroid/app/FragmentTransaction;)V" />
@@ -2505,24 +2496,18 @@
 	<class name="android/app/Activity" since="1">
 		<extends name="android/view/ContextThemeWrapper" />
 		<implements name="android/content/ComponentCallbacks" />
+		<implements name="android/content/ComponentCallbacks2" since="14" />
 		<implements name="android/view/KeyEvent$Callback" />
 		<implements name="android/view/LayoutInflater$Factory" />
+		<implements name="android/view/LayoutInflater$Factory2" since="11" />
 		<implements name="android/view/View$OnCreateContextMenuListener" />
 		<implements name="android/view/Window$Callback" />
-		<implements name="android/view/LayoutInflater$Factory2" since="11" />
-		<implements name="android/content/ComponentCallbacks2" since="14" />
 		<method name="&lt;init>()V" />
 		<method name="addContentView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V" />
 		<method name="closeContextMenu()V" since="3" />
 		<method name="closeOptionsMenu()V" />
 		<method name="createPendingResult(ILandroid/content/Intent;I)Landroid/app/PendingIntent;" />
 		<method name="dismissDialog(I)V" />
-		<method name="dispatchGenericMotionEvent(Landroid/view/MotionEvent;)Z" since="12" />
-		<method name="dispatchKeyEvent(Landroid/view/KeyEvent;)Z" />
-		<method name="dispatchKeyShortcutEvent(Landroid/view/KeyEvent;)Z" since="11" />
-		<method name="dispatchPopulateAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)Z" since="4" />
-		<method name="dispatchTouchEvent(Landroid/view/MotionEvent;)Z" />
-		<method name="dispatchTrackballEvent(Landroid/view/MotionEvent;)Z" />
 		<method name="dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V" since="11" />
 		<method name="findViewById(I)Landroid/view/View;" />
 		<method name="finish()V" />
@@ -2561,67 +2546,42 @@
 		<method name="isTaskRoot()Z" />
 		<method name="managedQuery(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;" />
 		<method name="moveTaskToBack(Z)Z" />
-		<method name="onActionModeFinished(Landroid/view/ActionMode;)V" since="11" />
-		<method name="onActionModeStarted(Landroid/view/ActionMode;)V" since="11" />
 		<method name="onActivityResult(IILandroid/content/Intent;)V" />
 		<method name="onAttachFragment(Landroid/app/Fragment;)V" since="11" />
-		<method name="onAttachedToWindow()V" since="5" />
 		<method name="onBackPressed()V" since="5" />
 		<method name="onChildTitleChanged(Landroid/app/Activity;Ljava/lang/CharSequence;)V" />
-		<method name="onConfigurationChanged(Landroid/content/res/Configuration;)V" />
-		<method name="onContentChanged()V" />
 		<method name="onContextItemSelected(Landroid/view/MenuItem;)Z" />
 		<method name="onContextMenuClosed(Landroid/view/Menu;)V" />
 		<method name="onCreate(Landroid/os/Bundle;)V" />
-		<method name="onCreateContextMenu(Landroid/view/ContextMenu;Landroid/view/View;Landroid/view/ContextMenu$ContextMenuInfo;)V" />
 		<method name="onCreateDescription()Ljava/lang/CharSequence;" />
 		<method name="onCreateDialog(I)Landroid/app/Dialog;" />
 		<method name="onCreateDialog(ILandroid/os/Bundle;)Landroid/app/Dialog;" since="8" />
 		<method name="onCreateOptionsMenu(Landroid/view/Menu;)Z" />
-		<method name="onCreatePanelMenu(ILandroid/view/Menu;)Z" />
-		<method name="onCreatePanelView(I)Landroid/view/View;" />
 		<method name="onCreateThumbnail(Landroid/graphics/Bitmap;Landroid/graphics/Canvas;)Z" />
-		<method name="onCreateView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;" since="11" />
-		<method name="onCreateView(Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;" />
 		<method name="onDestroy()V" />
-		<method name="onDetachedFromWindow()V" since="5" />
 		<method name="onGenericMotionEvent(Landroid/view/MotionEvent;)Z" since="12" />
-		<method name="onKeyDown(ILandroid/view/KeyEvent;)Z" />
-		<method name="onKeyLongPress(ILandroid/view/KeyEvent;)Z" since="5" />
-		<method name="onKeyMultiple(IILandroid/view/KeyEvent;)Z" />
 		<method name="onKeyShortcut(ILandroid/view/KeyEvent;)Z" since="11" />
-		<method name="onKeyUp(ILandroid/view/KeyEvent;)Z" />
-		<method name="onLowMemory()V" />
-		<method name="onMenuItemSelected(ILandroid/view/MenuItem;)Z" />
-		<method name="onMenuOpened(ILandroid/view/Menu;)Z" />
 		<method name="onNewIntent(Landroid/content/Intent;)V" />
 		<method name="onOptionsItemSelected(Landroid/view/MenuItem;)Z" />
 		<method name="onOptionsMenuClosed(Landroid/view/Menu;)V" />
-		<method name="onPanelClosed(ILandroid/view/Menu;)V" />
 		<method name="onPause()V" />
 		<method name="onPostCreate(Landroid/os/Bundle;)V" />
 		<method name="onPostResume()V" />
 		<method name="onPrepareDialog(ILandroid/app/Dialog;)V" />
 		<method name="onPrepareDialog(ILandroid/app/Dialog;Landroid/os/Bundle;)V" since="8" />
 		<method name="onPrepareOptionsMenu(Landroid/view/Menu;)Z" />
-		<method name="onPreparePanel(ILandroid/view/View;Landroid/view/Menu;)Z" />
 		<method name="onRestart()V" />
 		<method name="onRestoreInstanceState(Landroid/os/Bundle;)V" />
 		<method name="onResume()V" />
 		<method name="onRetainNonConfigurationInstance()Ljava/lang/Object;" />
 		<method name="onSaveInstanceState(Landroid/os/Bundle;)V" />
-		<method name="onSearchRequested()Z" />
 		<method name="onStart()V" />
 		<method name="onStop()V" />
 		<method name="onTitleChanged(Ljava/lang/CharSequence;I)V" />
 		<method name="onTouchEvent(Landroid/view/MotionEvent;)Z" />
 		<method name="onTrackballEvent(Landroid/view/MotionEvent;)Z" />
-		<method name="onTrimMemory(I)V" since="14" />
 		<method name="onUserInteraction()V" since="3" />
 		<method name="onUserLeaveHint()V" since="3" />
-		<method name="onWindowAttributesChanged(Landroid/view/WindowManager$LayoutParams;)V" />
-		<method name="onWindowFocusChanged(Z)V" />
-		<method name="onWindowStartingActionMode(Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode;" since="11" />
 		<method name="openContextMenu(Landroid/view/View;)V" />
 		<method name="openOptionsMenu()V" />
 		<method name="overridePendingTransition(II)V" since="5" />
@@ -2689,6 +2649,7 @@
 	</class>
 	<class name="android/app/ActivityManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getDeviceConfigurationInfo()Landroid/content/pm/ConfigurationInfo;" since="3" />
 		<method name="getLargeMemoryClass()I" since="11" />
 		<method name="getLauncherLargeIconDensity()I" since="11" />
@@ -2716,9 +2677,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="availMem" />
 		<field name="lowMemory" />
@@ -2728,9 +2687,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CRASHED" />
 		<field name="CREATOR" />
 		<field name="NOT_RESPONDING" />
@@ -2749,9 +2706,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="baseIntent" />
 		<field name="description" since="11" />
@@ -2764,9 +2719,7 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;I[Ljava/lang/String;)V" />
-		<method name="describeContents()I" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="IMPORTANCE_BACKGROUND" />
 		<field name="IMPORTANCE_EMPTY" />
@@ -2791,9 +2744,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="FLAG_FOREGROUND" since="5" />
 		<field name="FLAG_PERSISTENT_PROCESS" since="5" />
@@ -2818,9 +2769,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="baseActivity" />
 		<field name="description" />
@@ -2832,6 +2781,7 @@
 	</class>
 	<class name="android/app/AlarmManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="cancel(Landroid/app/PendingIntent;)V" />
 		<method name="set(IJLandroid/app/PendingIntent;)V" />
 		<method name="setInexactRepeating(IJJLandroid/app/PendingIntent;)V" since="3" />
@@ -2926,15 +2876,13 @@
 		<implements name="android/content/ComponentCallbacks" />
 		<implements name="android/content/ComponentCallbacks2" since="14" />
 		<method name="&lt;init>()V" />
-		<method name="onConfigurationChanged(Landroid/content/res/Configuration;)V" />
 		<method name="onCreate()V" />
-		<method name="onLowMemory()V" />
 		<method name="onTerminate()V" />
-		<method name="onTrimMemory(I)V" since="14" />
 		<method name="registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V" since="14" />
 		<method name="unregisterActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V" since="14" />
 	</class>
 	<class name="android/app/Application$ActivityLifecycleCallbacks" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V" />
 		<method name="onActivityDestroyed(Landroid/app/Activity;)V" />
 		<method name="onActivityPaused(Landroid/app/Activity;)V" />
@@ -2944,13 +2892,12 @@
 		<method name="onActivityStopped(Landroid/app/Activity;)V" />
 	</class>
 	<class name="android/app/ApplicationErrorReport" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="getErrorReportReceiver(Landroid/content/Context;Ljava/lang/String;I)Landroid/content/ComponentName;" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="TYPE_ANR" />
 		<field name="TYPE_BATTERY" />
@@ -2969,6 +2916,7 @@
 		<field name="type" />
 	</class>
 	<class name="android/app/ApplicationErrorReport$AnrInfo" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
@@ -2978,6 +2926,7 @@
 		<field name="info" />
 	</class>
 	<class name="android/app/ApplicationErrorReport$BatteryInfo" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
@@ -2988,6 +2937,7 @@
 		<field name="usagePercent" />
 	</class>
 	<class name="android/app/ApplicationErrorReport$CrashInfo" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
@@ -3002,6 +2952,7 @@
 		<field name="throwMethodName" />
 	</class>
 	<class name="android/app/ApplicationErrorReport$RunningServiceInfo" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
@@ -3011,16 +2962,15 @@
 	</class>
 	<class name="android/app/DatePickerDialog" since="1">
 		<extends name="android/app/AlertDialog" />
-		<implements name="android/widget/DatePicker$OnDateChangedListener" />
 		<implements name="android/content/DialogInterface$OnClickListener" />
+		<implements name="android/widget/DatePicker$OnDateChangedListener" />
 		<method name="&lt;init>(Landroid/content/Context;ILandroid/app/DatePickerDialog$OnDateSetListener;III)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/app/DatePickerDialog$OnDateSetListener;III)V" />
 		<method name="getDatePicker()Landroid/widget/DatePicker;" since="11" />
-		<method name="onClick(Landroid/content/DialogInterface;I)V" />
-		<method name="onDateChanged(Landroid/widget/DatePicker;III)V" />
 		<method name="updateDate(III)V" />
 	</class>
 	<class name="android/app/DatePickerDialog$OnDateSetListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onDateSet(Landroid/widget/DatePicker;III)V" />
 	</class>
 	<class name="android/app/Dialog" since="1">
@@ -3033,15 +2983,7 @@
 		<method name="&lt;init>(Landroid/content/Context;I)V" />
 		<method name="&lt;init>(Landroid/content/Context;ZLandroid/content/DialogInterface$OnCancelListener;)V" />
 		<method name="addContentView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V" />
-		<method name="cancel()V" />
 		<method name="closeOptionsMenu()V" />
-		<method name="dismiss()V" />
-		<method name="dispatchGenericMotionEvent(Landroid/view/MotionEvent;)Z" since="12" />
-		<method name="dispatchKeyEvent(Landroid/view/KeyEvent;)Z" />
-		<method name="dispatchKeyShortcutEvent(Landroid/view/KeyEvent;)Z" since="11" />
-		<method name="dispatchPopulateAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)Z" since="4" />
-		<method name="dispatchTouchEvent(Landroid/view/MotionEvent;)Z" />
-		<method name="dispatchTrackballEvent(Landroid/view/MotionEvent;)Z" />
 		<method name="findViewById(I)Landroid/view/View;" />
 		<method name="getActionBar()Landroid/app/ActionBar;" since="11" />
 		<method name="getContext()Landroid/content/Context;" />
@@ -3053,42 +2995,22 @@
 		<method name="hide()V" />
 		<method name="invalidateOptionsMenu()V" since="11" />
 		<method name="isShowing()Z" />
-		<method name="onActionModeFinished(Landroid/view/ActionMode;)V" since="11" />
-		<method name="onActionModeStarted(Landroid/view/ActionMode;)V" since="11" />
-		<method name="onAttachedToWindow()V" since="5" />
 		<method name="onBackPressed()V" since="5" />
-		<method name="onContentChanged()V" />
 		<method name="onContextItemSelected(Landroid/view/MenuItem;)Z" />
 		<method name="onContextMenuClosed(Landroid/view/Menu;)V" />
 		<method name="onCreate(Landroid/os/Bundle;)V" />
-		<method name="onCreateContextMenu(Landroid/view/ContextMenu;Landroid/view/View;Landroid/view/ContextMenu$ContextMenuInfo;)V" />
 		<method name="onCreateOptionsMenu(Landroid/view/Menu;)Z" />
-		<method name="onCreatePanelMenu(ILandroid/view/Menu;)Z" />
-		<method name="onCreatePanelView(I)Landroid/view/View;" />
-		<method name="onDetachedFromWindow()V" since="5" />
 		<method name="onGenericMotionEvent(Landroid/view/MotionEvent;)Z" since="12" />
-		<method name="onKeyDown(ILandroid/view/KeyEvent;)Z" />
-		<method name="onKeyLongPress(ILandroid/view/KeyEvent;)Z" since="5" />
-		<method name="onKeyMultiple(IILandroid/view/KeyEvent;)Z" />
 		<method name="onKeyShortcut(ILandroid/view/KeyEvent;)Z" since="11" />
-		<method name="onKeyUp(ILandroid/view/KeyEvent;)Z" />
-		<method name="onMenuItemSelected(ILandroid/view/MenuItem;)Z" />
-		<method name="onMenuOpened(ILandroid/view/Menu;)Z" />
 		<method name="onOptionsItemSelected(Landroid/view/MenuItem;)Z" />
 		<method name="onOptionsMenuClosed(Landroid/view/Menu;)V" />
-		<method name="onPanelClosed(ILandroid/view/Menu;)V" />
 		<method name="onPrepareOptionsMenu(Landroid/view/Menu;)Z" />
-		<method name="onPreparePanel(ILandroid/view/View;Landroid/view/Menu;)Z" />
 		<method name="onRestoreInstanceState(Landroid/os/Bundle;)V" />
 		<method name="onSaveInstanceState()Landroid/os/Bundle;" />
-		<method name="onSearchRequested()Z" />
 		<method name="onStart()V" />
 		<method name="onStop()V" />
 		<method name="onTouchEvent(Landroid/view/MotionEvent;)Z" />
 		<method name="onTrackballEvent(Landroid/view/MotionEvent;)Z" />
-		<method name="onWindowAttributesChanged(Landroid/view/WindowManager$LayoutParams;)V" />
-		<method name="onWindowFocusChanged(Z)V" />
-		<method name="onWindowStartingActionMode(Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode;" since="11" />
 		<method name="openContextMenu(Landroid/view/View;)V" />
 		<method name="openOptionsMenu()V" />
 		<method name="registerForContextMenu(Landroid/view/View;)V" />
@@ -3127,9 +3049,7 @@
 		<method name="getShowsDialog()Z" />
 		<method name="getTheme()I" />
 		<method name="isCancelable()Z" />
-		<method name="onCancel(Landroid/content/DialogInterface;)V" />
 		<method name="onCreateDialog(Landroid/os/Bundle;)Landroid/app/Dialog;" />
-		<method name="onDismiss(Landroid/content/DialogInterface;)V" />
 		<method name="setCancelable(Z)V" />
 		<method name="setShowsDialog(Z)V" />
 		<method name="setStyle(II)V" />
@@ -3142,6 +3062,7 @@
 	</class>
 	<class name="android/app/DownloadManager" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="addCompletedDownload(Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;JZ)J" since="12" />
 		<method name="enqueue(Landroid/app/DownloadManager$Request;)J" />
 		<method name="getMaxBytesOverMobile(Landroid/content/Context;)Ljava/lang/Long;" since="11" />
@@ -3220,18 +3141,15 @@
 	</class>
 	<class name="android/app/ExpandableListActivity" since="1">
 		<extends name="android/app/Activity" />
+		<implements name="android/view/View$OnCreateContextMenuListener" />
 		<implements name="android/widget/ExpandableListView$OnChildClickListener" />
 		<implements name="android/widget/ExpandableListView$OnGroupCollapseListener" />
 		<implements name="android/widget/ExpandableListView$OnGroupExpandListener" />
-		<implements name="android/view/View$OnCreateContextMenuListener" />
 		<method name="&lt;init>()V" />
 		<method name="getExpandableListAdapter()Landroid/widget/ExpandableListAdapter;" />
 		<method name="getExpandableListView()Landroid/widget/ExpandableListView;" />
 		<method name="getSelectedId()J" />
 		<method name="getSelectedPosition()J" />
-		<method name="onChildClick(Landroid/widget/ExpandableListView;Landroid/view/View;IIJ)Z" />
-		<method name="onGroupCollapse(I)V" />
-		<method name="onGroupExpand(I)V" />
 		<method name="setListAdapter(Landroid/widget/ExpandableListAdapter;)V" />
 		<method name="setSelectedChild(IIZ)Z" />
 		<method name="setSelectedGroup(I)V" />
@@ -3239,11 +3157,10 @@
 	<class name="android/app/Fragment" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/content/ComponentCallbacks" />
-		<implements name="android/view/View$OnCreateContextMenuListener" />
 		<implements name="android/content/ComponentCallbacks2" since="14" />
+		<implements name="android/view/View$OnCreateContextMenuListener" />
 		<method name="&lt;init>()V" />
 		<method name="dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="getActivity()Landroid/app/Activity;" />
 		<method name="getArguments()Landroid/os/Bundle;" />
 		<method name="getFragmentManager()Landroid/app/FragmentManager;" />
@@ -3259,7 +3176,6 @@
 		<method name="getText(I)Ljava/lang/CharSequence;" />
 		<method name="getUserVisibleHint()Z" since="15" />
 		<method name="getView()Landroid/view/View;" />
-		<method name="hashCode()I" />
 		<method name="instantiate(Landroid/content/Context;Ljava/lang/String;)Landroid/app/Fragment;" />
 		<method name="instantiate(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Landroid/app/Fragment;" />
 		<method name="isAdded()Z" />
@@ -3272,11 +3188,9 @@
 		<method name="onActivityCreated(Landroid/os/Bundle;)V" />
 		<method name="onActivityResult(IILandroid/content/Intent;)V" />
 		<method name="onAttach(Landroid/app/Activity;)V" />
-		<method name="onConfigurationChanged(Landroid/content/res/Configuration;)V" />
 		<method name="onContextItemSelected(Landroid/view/MenuItem;)Z" />
 		<method name="onCreate(Landroid/os/Bundle;)V" />
 		<method name="onCreateAnimator(IZI)Landroid/animation/Animator;" />
-		<method name="onCreateContextMenu(Landroid/view/ContextMenu;Landroid/view/View;Landroid/view/ContextMenu$ContextMenuInfo;)V" />
 		<method name="onCreateOptionsMenu(Landroid/view/Menu;Landroid/view/MenuInflater;)V" />
 		<method name="onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;" />
 		<method name="onDestroy()V" />
@@ -3286,7 +3200,6 @@
 		<method name="onHiddenChanged(Z)V" />
 		<method name="onInflate(Landroid/app/Activity;Landroid/util/AttributeSet;Landroid/os/Bundle;)V" since="12" />
 		<method name="onInflate(Landroid/util/AttributeSet;Landroid/os/Bundle;)V" />
-		<method name="onLowMemory()V" />
 		<method name="onOptionsItemSelected(Landroid/view/MenuItem;)Z" />
 		<method name="onOptionsMenuClosed(Landroid/view/Menu;)V" />
 		<method name="onPause()V" />
@@ -3295,7 +3208,6 @@
 		<method name="onSaveInstanceState(Landroid/os/Bundle;)V" />
 		<method name="onStart()V" />
 		<method name="onStop()V" />
-		<method name="onTrimMemory(I)V" since="14" />
 		<method name="onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V" since="13" />
 		<method name="registerForContextMenu(Landroid/view/View;)V" />
 		<method name="setArguments(Landroid/os/Bundle;)V" />
@@ -3316,8 +3228,7 @@
 	<class name="android/app/Fragment$SavedState" since="13">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
+		<method name="&lt;init>()V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/app/FragmentBreadCrumbs" since="11">
@@ -3326,8 +3237,6 @@
 		<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="onBackStackChanged()V" />
-		<method name="onLayout(ZIIII)V" />
 		<method name="setActivity(Landroid/app/Activity;)V" />
 		<method name="setMaxVisible(I)V" />
 		<method name="setOnBreadCrumbClickListener(Landroid/app/FragmentBreadCrumbs$OnBreadCrumbClickListener;)V" since="12" />
@@ -3335,6 +3244,7 @@
 		<method name="setTitle(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V" />
 	</class>
 	<class name="android/app/FragmentBreadCrumbs$OnBreadCrumbClickListener" since="12">
+		<extends name="java/lang/Object" />
 		<method name="onBreadCrumbClick(Landroid/app/FragmentManager$BackStackEntry;I)Z" />
 	</class>
 	<class name="android/app/FragmentManager" since="11">
@@ -3363,6 +3273,7 @@
 		<field name="POP_BACK_STACK_INCLUSIVE" />
 	</class>
 	<class name="android/app/FragmentManager$BackStackEntry" since="11">
+		<extends name="java/lang/Object" />
 		<method name="getBreadCrumbShortTitle()Ljava/lang/CharSequence;" />
 		<method name="getBreadCrumbShortTitleRes()I" />
 		<method name="getBreadCrumbTitle()Ljava/lang/CharSequence;" />
@@ -3371,6 +3282,7 @@
 		<method name="getName()Ljava/lang/String;" since="14" />
 	</class>
 	<class name="android/app/FragmentManager$OnBackStackChangedListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onBackStackChanged()V" />
 	</class>
 	<class name="android/app/FragmentTransaction" since="11">
@@ -3492,22 +3404,24 @@
 	<class name="android/app/IntentService" since="3">
 		<extends name="android/app/Service" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
 		<method name="onHandleIntent(Landroid/content/Intent;)V" />
 		<method name="setIntentRedelivery(Z)V" since="5" />
 	</class>
 	<class name="android/app/KeyguardManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="exitKeyguardSecurely(Landroid/app/KeyguardManager$OnKeyguardExitResult;)V" />
 		<method name="inKeyguardRestrictedInputMode()Z" />
 		<method name="newKeyguardLock(Ljava/lang/String;)Landroid/app/KeyguardManager$KeyguardLock;" />
 	</class>
 	<class name="android/app/KeyguardManager$KeyguardLock" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/app/KeyguardManager;)V" />
 		<method name="disableKeyguard()V" />
 		<method name="reenableKeyguard()V" />
 	</class>
 	<class name="android/app/KeyguardManager$OnKeyguardExitResult" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onKeyguardExitResult(Z)V" />
 	</class>
 	<class name="android/app/LauncherActivity" since="1">
@@ -3522,7 +3436,7 @@
 	</class>
 	<class name="android/app/LauncherActivity$IconResizer" since="3">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>()V" />
+		<method name="&lt;init>(Landroid/app/LauncherActivity;)V" />
 		<method name="createIconThumbnail(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;" />
 	</class>
 	<class name="android/app/LauncherActivity$ListItem" since="3">
@@ -3571,8 +3485,9 @@
 		<method name="restartLoader(ILandroid/os/Bundle;Landroid/app/LoaderManager$LoaderCallbacks;)Landroid/content/Loader;" />
 	</class>
 	<class name="android/app/LoaderManager$LoaderCallbacks" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onCreateLoader(ILandroid/os/Bundle;)Landroid/content/Loader;" />
-		<method name="onLoadFinished(Landroid/content/Loader;LD;)V" />
+		<method name="onLoadFinished(Landroid/content/Loader;Ljava/lang/Object;)V" />
 		<method name="onLoaderReset(Landroid/content/Loader;)V" />
 	</class>
 	<class name="android/app/LocalActivityManager" since="1">
@@ -3597,13 +3512,6 @@
 		<implements name="android/view/SurfaceHolder$Callback2" />
 		<implements name="android/view/ViewTreeObserver$OnGlobalLayoutListener" />
 		<method name="&lt;init>()V" />
-		<method name="onGlobalLayout()V" />
-		<method name="onInputQueueCreated(Landroid/view/InputQueue;)V" />
-		<method name="onInputQueueDestroyed(Landroid/view/InputQueue;)V" />
-		<method name="surfaceChanged(Landroid/view/SurfaceHolder;III)V" />
-		<method name="surfaceCreated(Landroid/view/SurfaceHolder;)V" />
-		<method name="surfaceDestroyed(Landroid/view/SurfaceHolder;)V" />
-		<method name="surfaceRedrawNeeded(Landroid/view/SurfaceHolder;)V" />
 		<field name="META_DATA_FUNC_NAME" />
 		<field name="META_DATA_LIB_NAME" />
 	</class>
@@ -3614,9 +3522,7 @@
 		<method name="&lt;init>(ILjava/lang/CharSequence;J)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="clone()Landroid/app/Notification;" since="9" />
-		<method name="describeContents()I" />
 		<method name="setLatestEventInfo(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/app/PendingIntent;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="DEFAULT_ALL" />
 		<field name="DEFAULT_LIGHTS" />
@@ -3681,6 +3587,7 @@
 	</class>
 	<class name="android/app/NotificationManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="cancel(I)V" />
 		<method name="cancel(Ljava/lang/String;I)V" since="5" />
 		<method name="cancelAll()V" />
@@ -3690,8 +3597,8 @@
 	<class name="android/app/PendingIntent" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<method name="cancel()V" />
-		<method name="describeContents()I" />
 		<method name="getActivities(Landroid/content/Context;I[Landroid/content/Intent;I)Landroid/app/PendingIntent;" since="11" />
 		<method name="getActivity(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;" />
 		<method name="getBroadcast(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;" />
@@ -3706,7 +3613,6 @@
 		<method name="send(Landroid/content/Context;ILandroid/content/Intent;Landroid/app/PendingIntent$OnFinished;Landroid/os/Handler;)V" />
 		<method name="send(Landroid/content/Context;ILandroid/content/Intent;Landroid/app/PendingIntent$OnFinished;Landroid/os/Handler;Ljava/lang/String;)V" since="14" />
 		<method name="writePendingIntentOrNullToParcel(Landroid/app/PendingIntent;Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="FLAG_CANCEL_CURRENT" />
 		<field name="FLAG_NO_CREATE" />
@@ -3720,6 +3626,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/app/PendingIntent$OnFinished" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onSendFinished(Landroid/app/PendingIntent;Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;)V" />
 	</class>
 	<class name="android/app/ProgressDialog" since="1">
@@ -3732,7 +3639,6 @@
 		<method name="incrementProgressBy(I)V" />
 		<method name="incrementSecondaryProgressBy(I)V" />
 		<method name="isIndeterminate()Z" />
-		<method name="onStart()V" />
 		<method name="setIndeterminate(Z)V" />
 		<method name="setIndeterminateDrawable(Landroid/graphics/drawable/Drawable;)V" />
 		<method name="setMax(I)V" />
@@ -3753,10 +3659,9 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/content/DialogInterface$OnCancelListener" />
 		<implements name="android/content/DialogInterface$OnDismissListener" />
+		<method name="&lt;init>()V" />
 		<method name="getSearchableInfo(Landroid/content/ComponentName;)Landroid/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" />
 		<method name="setOnDismissListener(Landroid/app/SearchManager$OnDismissListener;)V" />
 		<method name="startSearch(Ljava/lang/String;ZLandroid/content/ComponentName;Landroid/os/Bundle;Z)V" />
@@ -3803,16 +3708,18 @@
 		<field name="USER_QUERY" since="4" />
 	</class>
 	<class name="android/app/SearchManager$OnCancelListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onCancel()V" />
 	</class>
 	<class name="android/app/SearchManager$OnDismissListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onDismiss()V" />
 	</class>
 	<class name="android/app/SearchableInfo" since="8">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<method name="autoUrlDetect()Z" />
-		<method name="describeContents()I" />
 		<method name="getHintId()I" />
 		<method name="getImeOptions()I" />
 		<method name="getInputType()I" />
@@ -3836,7 +3743,6 @@
 		<method name="shouldIncludeInGlobalSearch()Z" />
 		<method name="shouldRewriteQueryFromData()Z" />
 		<method name="shouldRewriteQueryFromText()Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/app/Service" since="1">
@@ -3847,15 +3753,12 @@
 		<method name="dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V" />
 		<method name="getApplication()Landroid/app/Application;" />
 		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
-		<method name="onConfigurationChanged(Landroid/content/res/Configuration;)V" />
 		<method name="onCreate()V" />
 		<method name="onDestroy()V" />
-		<method name="onLowMemory()V" />
 		<method name="onRebind(Landroid/content/Intent;)V" />
 		<method name="onStart(Landroid/content/Intent;I)V" />
 		<method name="onStartCommand(Landroid/content/Intent;II)I" since="5" />
 		<method name="onTaskRemoved(Landroid/content/Intent;)V" since="14" />
-		<method name="onTrimMemory(I)V" since="14" />
 		<method name="onUnbind(Landroid/content/Intent;)Z" />
 		<method name="setForeground(Z)V" />
 		<method name="startForeground(ILandroid/app/Notification;)V" since="5" />
@@ -3885,15 +3788,15 @@
 		<implements name="android/widget/TimePicker$OnTimeChangedListener" />
 		<method name="&lt;init>(Landroid/content/Context;ILandroid/app/TimePickerDialog$OnTimeSetListener;IIZ)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/app/TimePickerDialog$OnTimeSetListener;IIZ)V" />
-		<method name="onClick(Landroid/content/DialogInterface;I)V" />
-		<method name="onTimeChanged(Landroid/widget/TimePicker;II)V" />
 		<method name="updateTime(II)V" />
 	</class>
 	<class name="android/app/TimePickerDialog$OnTimeSetListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onTimeSet(Landroid/widget/TimePicker;II)V" />
 	</class>
 	<class name="android/app/UiModeManager" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="disableCarMode(I)V" />
 		<method name="enableCarMode(I)V" />
 		<method name="getCurrentModeType()I" />
@@ -3913,7 +3816,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/content/pm/ResolveInfo;)V" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="getComponent()Landroid/content/ComponentName;" />
 		<method name="getPackageName()Ljava/lang/String;" />
@@ -3925,11 +3827,11 @@
 		<method name="loadIcon(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;" />
 		<method name="loadLabel(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;" />
 		<method name="loadThumbnail(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/app/WallpaperManager" since="5">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="clear()V" />
 		<method name="clearWallpaperOffsets(Landroid/os/IBinder;)V" />
 		<method name="forgetLoadedWallpaper()V" since="14" />
@@ -3958,7 +3860,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/content/pm/ResolveInfo;)V" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="getActivityInfo()Landroid/content/pm/ActivityInfo;" />
 		<method name="getComponent()Landroid/content/ComponentName;" />
@@ -3970,7 +3871,6 @@
 		<method name="loadIcon(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;" />
 		<method name="loadLabel(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;" />
 		<method name="usesPolicy(I)Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="USES_ENCRYPTED_STORAGE" since="11" />
 		<field name="USES_POLICY_DISABLE_CAMERA" since="14" />
@@ -3993,7 +3893,6 @@
 		<method name="onPasswordExpiring(Landroid/content/Context;Landroid/content/Intent;)V" since="11" />
 		<method name="onPasswordFailed(Landroid/content/Context;Landroid/content/Intent;)V" />
 		<method name="onPasswordSucceeded(Landroid/content/Context;Landroid/content/Intent;)V" />
-		<method name="onReceive(Landroid/content/Context;Landroid/content/Intent;)V" />
 		<field name="ACTION_DEVICE_ADMIN_DISABLED" />
 		<field name="ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
 		<field name="ACTION_DEVICE_ADMIN_ENABLED" />
@@ -4006,6 +3905,7 @@
 	</class>
 	<class name="android/app/admin/DevicePolicyManager" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getActiveAdmins()Ljava/util/List;" />
 		<method name="getCameraDisabled(Landroid/content/ComponentName;)Z" since="14" />
 		<method name="getCurrentFailedPasswordAttempts()I" />
@@ -4082,11 +3982,10 @@
 		<extends name="android/app/backup/BackupAgent" />
 		<method name="&lt;init>()V" />
 		<method name="addHelper(Ljava/lang/String;Landroid/app/backup/BackupHelper;)V" />
-		<method name="onBackup(Landroid/os/ParcelFileDescriptor;Landroid/app/backup/BackupDataOutput;Landroid/os/ParcelFileDescriptor;)V" />
-		<method name="onRestore(Landroid/app/backup/BackupDataInput;ILandroid/os/ParcelFileDescriptor;)V" />
 	</class>
 	<class name="android/app/backup/BackupDataInput" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getDataSize()I" />
 		<method name="getKey()Ljava/lang/String;" />
 		<method name="readEntityData([BII)I" />
@@ -4095,16 +3994,18 @@
 	</class>
 	<class name="android/app/backup/BackupDataInputStream" since="8">
 		<extends name="java/io/InputStream" />
+		<method name="&lt;init>()V" />
 		<method name="getKey()Ljava/lang/String;" />
-		<method name="read()I" />
 		<method name="size()I" />
 	</class>
 	<class name="android/app/backup/BackupDataOutput" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="writeEntityData([BI)I" />
 		<method name="writeEntityHeader(Ljava/lang/String;I)I" />
 	</class>
 	<class name="android/app/backup/BackupHelper" since="8">
+		<extends name="java/lang/Object" />
 		<method name="performBackup(Landroid/os/ParcelFileDescriptor;Landroid/app/backup/BackupDataOutput;Landroid/os/ParcelFileDescriptor;)V" />
 		<method name="restoreEntity(Landroid/app/backup/BackupDataInputStream;)V" />
 		<method name="writeNewStateDescription(Landroid/os/ParcelFileDescriptor;)V" />
@@ -4120,14 +4021,15 @@
 		<extends name="android/app/backup/FileBackupHelperBase" />
 		<implements name="android/app/backup/BackupHelper" />
 		<method name="&lt;init>(Landroid/content/Context;[Ljava/lang/String;)V" />
-		<method name="performBackup(Landroid/os/ParcelFileDescriptor;Landroid/app/backup/BackupDataOutput;Landroid/os/ParcelFileDescriptor;)V" />
-		<method name="restoreEntity(Landroid/app/backup/BackupDataInputStream;)V" />
 	</class>
 	<class name="android/app/backup/FileBackupHelperBase" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="writeNewStateDescription(Landroid/os/ParcelFileDescriptor;)V" />
 	</class>
 	<class name="android/app/backup/FullBackupDataOutput" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/app/backup/RestoreObserver" since="8">
 		<extends name="java/lang/Object" />
@@ -4140,8 +4042,6 @@
 		<extends name="android/app/backup/FileBackupHelperBase" />
 		<implements name="android/app/backup/BackupHelper" />
 		<method name="&lt;init>(Landroid/content/Context;[Ljava/lang/String;)V" />
-		<method name="performBackup(Landroid/os/ParcelFileDescriptor;Landroid/app/backup/BackupDataOutput;Landroid/os/ParcelFileDescriptor;)V" />
-		<method name="restoreEntity(Landroid/app/backup/BackupDataInputStream;)V" />
 	</class>
 	<class name="android/appwidget/AppWidgetHost" since="3">
 		<extends name="java/lang/Object" />
@@ -4172,6 +4072,7 @@
 	</class>
 	<class name="android/appwidget/AppWidgetManager" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="bindAppWidgetId(ILandroid/content/ComponentName;)V" />
 		<method name="getAppWidgetIds(Landroid/content/ComponentName;)[I" />
 		<method name="getAppWidgetInfo(I)Landroid/appwidget/AppWidgetProviderInfo;" />
@@ -4203,7 +4104,6 @@
 		<method name="onDeleted(Landroid/content/Context;[I)V" />
 		<method name="onDisabled(Landroid/content/Context;)V" />
 		<method name="onEnabled(Landroid/content/Context;)V" />
-		<method name="onReceive(Landroid/content/Context;Landroid/content/Intent;)V" />
 		<method name="onUpdate(Landroid/content/Context;Landroid/appwidget/AppWidgetManager;[I)V" />
 	</class>
 	<class name="android/appwidget/AppWidgetProviderInfo" since="3">
@@ -4211,8 +4111,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="RESIZE_BOTH" since="12" />
 		<field name="RESIZE_HORIZONTAL" since="12" />
@@ -4235,9 +4133,7 @@
 	<class name="android/bluetooth/BluetoothA2dp" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/bluetooth/BluetoothProfile" />
-		<method name="getConnectedDevices()Ljava/util/List;" />
-		<method name="getConnectionState(Landroid/bluetooth/BluetoothDevice;)I" />
-		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List;" />
+		<method name="&lt;init>()V" />
 		<method name="isA2dpPlaying(Landroid/bluetooth/BluetoothDevice;)Z" />
 		<field name="ACTION_CONNECTION_STATE_CHANGED" />
 		<field name="ACTION_PLAYING_STATE_CHANGED" />
@@ -4246,6 +4142,7 @@
 	</class>
 	<class name="android/bluetooth/BluetoothAdapter" since="5">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="cancelDiscovery()Z" />
 		<method name="checkBluetoothAddress(Ljava/lang/String;)Z" />
 		<method name="closeProfileProxy(ILandroid/bluetooth/BluetoothProfile;)V" since="11" />
@@ -4297,6 +4194,7 @@
 	</class>
 	<class name="android/bluetooth/BluetoothAssignedNumbers" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="ACCEL_SEMICONDUCTOR" />
 		<field name="ALCATEL" />
 		<field name="APPLE" />
@@ -4398,11 +4296,10 @@
 	<class name="android/bluetooth/BluetoothClass" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getDeviceClass()I" />
 		<method name="getMajorDeviceClass()I" />
 		<method name="hasService(I)Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/bluetooth/BluetoothClass$Device" since="5">
@@ -4490,16 +4387,15 @@
 	<class name="android/bluetooth/BluetoothDevice" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<method name="createInsecureRfcommSocketToServiceRecord(Ljava/util/UUID;)Landroid/bluetooth/BluetoothSocket;" since="10" />
 		<method name="createRfcommSocketToServiceRecord(Ljava/util/UUID;)Landroid/bluetooth/BluetoothSocket;" />
-		<method name="describeContents()I" />
 		<method name="fetchUuidsWithSdp()Z" since="15" />
 		<method name="getAddress()Ljava/lang/String;" />
 		<method name="getBluetoothClass()Landroid/bluetooth/BluetoothClass;" />
 		<method name="getBondState()I" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getUuids()[Landroid/os/ParcelUuid;" since="15" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ACTION_ACL_CONNECTED" />
 		<field name="ACTION_ACL_DISCONNECTED" />
 		<field name="ACTION_ACL_DISCONNECT_REQUESTED" />
@@ -4524,9 +4420,7 @@
 	<class name="android/bluetooth/BluetoothHeadset" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/bluetooth/BluetoothProfile" />
-		<method name="getConnectedDevices()Ljava/util/List;" />
-		<method name="getConnectionState(Landroid/bluetooth/BluetoothDevice;)I" />
-		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List;" />
+		<method name="&lt;init>()V" />
 		<method name="isAudioConnected(Landroid/bluetooth/BluetoothDevice;)Z" />
 		<method name="startVoiceRecognition(Landroid/bluetooth/BluetoothDevice;)Z" />
 		<method name="stopVoiceRecognition(Landroid/bluetooth/BluetoothDevice;)Z" />
@@ -4547,12 +4441,11 @@
 		<field name="VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID_CATEGORY" />
 	</class>
 	<class name="android/bluetooth/BluetoothHealth" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/bluetooth/BluetoothProfile" />
+		<method name="&lt;init>()V" />
 		<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;" />
-		<method name="getConnectionState(Landroid/bluetooth/BluetoothDevice;)I" />
-		<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" />
@@ -4570,20 +4463,22 @@
 		<field name="STATE_CHANNEL_DISCONNECTING" />
 	</class>
 	<class name="android/bluetooth/BluetoothHealthAppConfiguration" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getDataType()I" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getRole()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/bluetooth/BluetoothHealthCallback" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="onHealthAppConfigurationStatusChange(Landroid/bluetooth/BluetoothHealthAppConfiguration;I)V" />
 		<method name="onHealthChannelStateChange(Landroid/bluetooth/BluetoothHealthAppConfiguration;Landroid/bluetooth/BluetoothDevice;IILandroid/os/ParcelFileDescriptor;I)V" />
 	</class>
 	<class name="android/bluetooth/BluetoothProfile" since="11">
+		<extends name="java/lang/Object" />
 		<method name="getConnectedDevices()Ljava/util/List;" />
 		<method name="getConnectionState(Landroid/bluetooth/BluetoothDevice;)I" />
 		<method name="getDevicesMatchingConnectionStates([I)Ljava/util/List;" />
@@ -4598,20 +4493,21 @@
 		<field name="STATE_DISCONNECTING" />
 	</class>
 	<class name="android/bluetooth/BluetoothProfile$ServiceListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onServiceConnected(ILandroid/bluetooth/BluetoothProfile;)V" />
 		<method name="onServiceDisconnected(I)V" />
 	</class>
 	<class name="android/bluetooth/BluetoothServerSocket" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Closeable" />
+		<method name="&lt;init>()V" />
 		<method name="accept()Landroid/bluetooth/BluetoothSocket;" />
 		<method name="accept(I)Landroid/bluetooth/BluetoothSocket;" />
-		<method name="close()V" />
 	</class>
 	<class name="android/bluetooth/BluetoothSocket" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Closeable" />
-		<method name="close()V" />
+		<method name="&lt;init>()V" />
 		<method name="connect()V" />
 		<method name="getInputStream()Ljava/io/InputStream;" />
 		<method name="getOutputStream()Ljava/io/OutputStream;" />
@@ -4663,15 +4559,15 @@
 	</class>
 	<class name="android/content/AsyncQueryHandler$WorkerHandler" since="1">
 		<extends name="android/os/Handler" />
-		<method name="&lt;init>(Landroid/os/Looper;)V" />
+		<method name="&lt;init>(Landroid/content/AsyncQueryHandler;Landroid/os/Looper;)V" />
 	</class>
 	<class name="android/content/AsyncTaskLoader" since="11">
 		<extends name="android/content/Loader" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="cancelLoad()Z" />
-		<method name="loadInBackground()LD;" />
-		<method name="onCanceled(LD;)V" />
-		<method name="onLoadInBackground()LD;" />
+		<method name="loadInBackground()Ljava/lang/Object;" />
+		<method name="onCanceled(Ljava/lang/Object;)V" />
+		<method name="onLoadInBackground()Ljava/lang/Object;" />
 		<method name="setUpdateThrottle(J)V" />
 	</class>
 	<class name="android/content/BroadcastReceiver" since="1">
@@ -4698,6 +4594,7 @@
 	</class>
 	<class name="android/content/BroadcastReceiver$PendingResult" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="abortBroadcast()V" />
 		<method name="clearAbortBroadcast()V" />
 		<method name="finish()V" />
@@ -4716,7 +4613,6 @@
 		<method name="&lt;init>(Landroid/content/ClipDescription;Landroid/content/ClipData$Item;)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;[Ljava/lang/String;Landroid/content/ClipData$Item;)V" />
 		<method name="addItem(Landroid/content/ClipData$Item;)V" />
-		<method name="describeContents()I" />
 		<method name="getDescription()Landroid/content/ClipDescription;" />
 		<method name="getItemAt(I)Landroid/content/ClipData$Item;" />
 		<method name="getItemCount()I" />
@@ -4724,7 +4620,6 @@
 		<method name="newPlainText(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Landroid/content/ClipData;" />
 		<method name="newRawUri(Ljava/lang/CharSequence;Landroid/net/Uri;)Landroid/content/ClipData;" />
 		<method name="newUri(Landroid/content/ContentResolver;Ljava/lang/CharSequence;Landroid/net/Uri;)Landroid/content/ClipData;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/content/ClipData$Item" since="11">
@@ -4744,13 +4639,11 @@
 		<method name="&lt;init>(Landroid/content/ClipDescription;)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;[Ljava/lang/String;)V" />
 		<method name="compareMimeTypes(Ljava/lang/String;Ljava/lang/String;)Z" />
-		<method name="describeContents()I" />
 		<method name="filterMimeTypes(Ljava/lang/String;)[Ljava/lang/String;" />
 		<method name="getLabel()Ljava/lang/CharSequence;" />
 		<method name="getMimeType(I)Ljava/lang/String;" />
 		<method name="getMimeTypeCount()I" />
 		<method name="hasMimeType(Ljava/lang/String;)Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="MIMETYPE_TEXT_INTENT" />
 		<field name="MIMETYPE_TEXT_PLAIN" />
@@ -4758,24 +4651,25 @@
 	</class>
 	<class name="android/content/ClipboardManager" since="11">
 		<extends name="android/text/ClipboardManager" />
+		<method name="&lt;init>()V" />
 		<method name="addPrimaryClipChangedListener(Landroid/content/ClipboardManager$OnPrimaryClipChangedListener;)V" />
 		<method name="getPrimaryClip()Landroid/content/ClipData;" />
 		<method name="getPrimaryClipDescription()Landroid/content/ClipDescription;" />
-		<method name="getText()Ljava/lang/CharSequence;" />
 		<method name="hasPrimaryClip()Z" />
-		<method name="hasText()Z" />
 		<method name="removePrimaryClipChangedListener(Landroid/content/ClipboardManager$OnPrimaryClipChangedListener;)V" />
 		<method name="setPrimaryClip(Landroid/content/ClipData;)V" />
-		<method name="setText(Ljava/lang/CharSequence;)V" />
 	</class>
 	<class name="android/content/ClipboardManager$OnPrimaryClipChangedListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onPrimaryClipChanged()V" />
 	</class>
 	<class name="android/content/ComponentCallbacks" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onConfigurationChanged(Landroid/content/res/Configuration;)V" />
 		<method name="onLowMemory()V" />
 	</class>
 	<class name="android/content/ComponentCallbacks2" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/content/ComponentCallbacks" />
 		<method name="onTrimMemory(I)V" />
 		<field name="TRIM_MEMORY_BACKGROUND" />
@@ -4786,15 +4680,14 @@
 	<class name="android/content/ComponentName" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<implements name="java/lang/Comparable" since="4" />
 		<implements name="java/lang/Cloneable" since="8" />
+		<implements name="java/lang/Comparable" since="4" />
 		<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" />
 		<method name="clone()Landroid/content/ComponentName;" since="8" />
 		<method name="compareTo(Landroid/content/ComponentName;)I" since="4" />
-		<method name="describeContents()I" />
 		<method name="flattenToShortString()Ljava/lang/String;" />
 		<method name="flattenToString()Ljava/lang/String;" />
 		<method name="getClassName()Ljava/lang/String;" />
@@ -4804,7 +4697,6 @@
 		<method name="toShortString()Ljava/lang/String;" />
 		<method name="unflattenFromString(Ljava/lang/String;)Landroid/content/ComponentName;" />
 		<method name="writeToParcel(Landroid/content/ComponentName;Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/content/ContentProvider" since="1">
@@ -4825,14 +4717,11 @@
 		<method name="getWritePermission()Ljava/lang/String;" />
 		<method name="insert(Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;" />
 		<method name="isTemporary()Z" />
-		<method name="onConfigurationChanged(Landroid/content/res/Configuration;)V" />
 		<method name="onCreate()Z" />
-		<method name="onLowMemory()V" />
-		<method name="onTrimMemory(I)V" since="14" />
 		<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;)Landroid/os/ParcelFileDescriptor;" since="11" />
+		<method name="openPipeHelper(Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;Ljava/lang/Object;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" />
@@ -4842,10 +4731,12 @@
 		<method name="update(Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I" />
 	</class>
 	<class name="android/content/ContentProvider$PipeDataWriter" since="11">
-		<method name="writeDataToPipe(Landroid/os/ParcelFileDescriptor;Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;LT;)V" />
+		<extends name="java/lang/Object" />
+		<method name="writeDataToPipe(Landroid/os/ParcelFileDescriptor;Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;Ljava/lang/Object;)V" />
 	</class>
 	<class name="android/content/ContentProviderClient" since="5">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<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" />
@@ -4863,8 +4754,8 @@
 	<class name="android/content/ContentProviderOperation" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<method name="apply(Landroid/content/ContentProvider;[Landroid/content/ContentProviderResult;I)Landroid/content/ContentProviderResult;" />
-		<method name="describeContents()I" />
 		<method name="getUri()Landroid/net/Uri;" />
 		<method name="isReadOperation()Z" />
 		<method name="isWriteOperation()Z" />
@@ -4875,11 +4766,11 @@
 		<method name="newUpdate(Landroid/net/Uri;)Landroid/content/ContentProviderOperation$Builder;" />
 		<method name="resolveSelectionArgsBackReferences([Landroid/content/ContentProviderResult;I)[Ljava/lang/String;" />
 		<method name="resolveValueBackReferences([Landroid/content/ContentProviderResult;I)Landroid/content/ContentValues;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/content/ContentProviderOperation$Builder" since="5">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="build()Landroid/content/ContentProviderOperation;" />
 		<method name="withExpectedCount(I)Landroid/content/ContentProviderOperation$Builder;" />
 		<method name="withSelection(Ljava/lang/String;[Ljava/lang/String;)Landroid/content/ContentProviderOperation$Builder;" />
@@ -4896,8 +4787,6 @@
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Landroid/net/Uri;)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="count" />
 		<field name="uri" />
@@ -4991,7 +4880,6 @@
 		<method name="&lt;init>(Landroid/content/ContentValues;)V" />
 		<method name="clear()V" />
 		<method name="containsKey(Ljava/lang/String;)Z" />
-		<method name="describeContents()I" />
 		<method name="get(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="getAsBoolean(Ljava/lang/String;)Ljava/lang/Boolean;" />
 		<method name="getAsByte(Ljava/lang/String;)Ljava/lang/Byte;" />
@@ -5017,7 +4905,6 @@
 		<method name="remove(Ljava/lang/String;)V" />
 		<method name="size()I" />
 		<method name="valueSet()Ljava/util/Set;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="TAG" />
 	</class>
@@ -5157,80 +5044,9 @@
 		<extends name="android/content/Context" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="attachBaseContext(Landroid/content/Context;)V" />
-		<method name="bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z" />
-		<method name="checkCallingOrSelfPermission(Ljava/lang/String;)I" />
-		<method name="checkCallingOrSelfUriPermission(Landroid/net/Uri;I)I" />
-		<method name="checkCallingPermission(Ljava/lang/String;)I" />
-		<method name="checkCallingUriPermission(Landroid/net/Uri;I)I" />
-		<method name="checkPermission(Ljava/lang/String;II)I" />
-		<method name="checkUriPermission(Landroid/net/Uri;III)I" />
-		<method name="checkUriPermission(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;III)I" />
-		<method name="clearWallpaper()V" />
-		<method name="createPackageContext(Ljava/lang/String;I)Landroid/content/Context;" />
-		<method name="databaseList()[Ljava/lang/String;" />
-		<method name="deleteDatabase(Ljava/lang/String;)Z" />
-		<method name="deleteFile(Ljava/lang/String;)Z" />
-		<method name="enforceCallingOrSelfPermission(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="enforceCallingOrSelfUriPermission(Landroid/net/Uri;ILjava/lang/String;)V" />
-		<method name="enforceCallingPermission(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="enforceCallingUriPermission(Landroid/net/Uri;ILjava/lang/String;)V" />
-		<method name="enforcePermission(Ljava/lang/String;IILjava/lang/String;)V" />
-		<method name="enforceUriPermission(Landroid/net/Uri;IIILjava/lang/String;)V" />
-		<method name="enforceUriPermission(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;IIILjava/lang/String;)V" />
-		<method name="fileList()[Ljava/lang/String;" />
-		<method name="getApplicationContext()Landroid/content/Context;" />
-		<method name="getApplicationInfo()Landroid/content/pm/ApplicationInfo;" since="4" />
-		<method name="getAssets()Landroid/content/res/AssetManager;" />
 		<method name="getBaseContext()Landroid/content/Context;" />
-		<method name="getCacheDir()Ljava/io/File;" />
-		<method name="getClassLoader()Ljava/lang/ClassLoader;" />
-		<method name="getContentResolver()Landroid/content/ContentResolver;" />
-		<method name="getDatabasePath(Ljava/lang/String;)Ljava/io/File;" />
-		<method name="getDir(Ljava/lang/String;I)Ljava/io/File;" />
-		<method name="getExternalCacheDir()Ljava/io/File;" since="8" />
-		<method name="getExternalFilesDir(Ljava/lang/String;)Ljava/io/File;" since="8" />
-		<method name="getFileStreamPath(Ljava/lang/String;)Ljava/io/File;" />
-		<method name="getFilesDir()Ljava/io/File;" />
-		<method name="getMainLooper()Landroid/os/Looper;" />
-		<method name="getObbDir()Ljava/io/File;" since="11" />
 		<method name="getPackageCodePath()Ljava/lang/String;" />
-		<method name="getPackageManager()Landroid/content/pm/PackageManager;" />
-		<method name="getPackageName()Ljava/lang/String;" />
 		<method name="getPackageResourcePath()Ljava/lang/String;" />
-		<method name="getResources()Landroid/content/res/Resources;" />
-		<method name="getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;" />
-		<method name="getSystemService(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="getTheme()Landroid/content/res/Resources$Theme;" />
-		<method name="getWallpaper()Landroid/graphics/drawable/Drawable;" />
-		<method name="getWallpaperDesiredMinimumHeight()I" />
-		<method name="getWallpaperDesiredMinimumWidth()I" />
-		<method name="grantUriPermission(Ljava/lang/String;Landroid/net/Uri;I)V" />
-		<method name="openFileInput(Ljava/lang/String;)Ljava/io/FileInputStream;" />
-		<method name="openFileOutput(Ljava/lang/String;I)Ljava/io/FileOutputStream;" />
-		<method name="openOrCreateDatabase(Ljava/lang/String;ILandroid/database/sqlite/SQLiteDatabase$CursorFactory;)Landroid/database/sqlite/SQLiteDatabase;" />
-		<method name="openOrCreateDatabase(Ljava/lang/String;ILandroid/database/sqlite/SQLiteDatabase$CursorFactory;Landroid/database/DatabaseErrorHandler;)Landroid/database/sqlite/SQLiteDatabase;" since="11" />
-		<method name="peekWallpaper()Landroid/graphics/drawable/Drawable;" />
-		<method name="registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;" />
-		<method name="registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;)Landroid/content/Intent;" />
-		<method name="removeStickyBroadcast(Landroid/content/Intent;)V" />
-		<method name="revokeUriPermission(Landroid/net/Uri;I)V" />
-		<method name="sendBroadcast(Landroid/content/Intent;)V" />
-		<method name="sendBroadcast(Landroid/content/Intent;Ljava/lang/String;)V" />
-		<method name="sendOrderedBroadcast(Landroid/content/Intent;Ljava/lang/String;)V" />
-		<method name="sendOrderedBroadcast(Landroid/content/Intent;Ljava/lang/String;Landroid/content/BroadcastReceiver;Landroid/os/Handler;ILjava/lang/String;Landroid/os/Bundle;)V" />
-		<method name="sendStickyBroadcast(Landroid/content/Intent;)V" />
-		<method name="sendStickyOrderedBroadcast(Landroid/content/Intent;Landroid/content/BroadcastReceiver;Landroid/os/Handler;ILjava/lang/String;Landroid/os/Bundle;)V" since="5" />
-		<method name="setTheme(I)V" />
-		<method name="setWallpaper(Landroid/graphics/Bitmap;)V" />
-		<method name="setWallpaper(Ljava/io/InputStream;)V" />
-		<method name="startActivities([Landroid/content/Intent;)V" since="11" />
-		<method name="startActivity(Landroid/content/Intent;)V" />
-		<method name="startInstrumentation(Landroid/content/ComponentName;Ljava/lang/String;Landroid/os/Bundle;)Z" />
-		<method name="startIntentSender(Landroid/content/IntentSender;Landroid/content/Intent;III)V" since="5" />
-		<method name="startService(Landroid/content/Intent;)Landroid/content/ComponentName;" />
-		<method name="stopService(Landroid/content/Intent;)Z" />
-		<method name="unbindService(Landroid/content/ServiceConnection;)V" />
-		<method name="unregisterReceiver(Landroid/content/BroadcastReceiver;)V" />
 	</class>
 	<class name="android/content/CursorLoader" since="11">
 		<extends name="android/content/AsyncTaskLoader" />
@@ -5251,6 +5067,7 @@
 		<method name="setUri(Landroid/net/Uri;)V" />
 	</class>
 	<class name="android/content/DialogInterface" since="1">
+		<extends name="java/lang/Object" />
 		<method name="cancel()V" />
 		<method name="dismiss()V" />
 		<field name="BUTTON1" />
@@ -5261,21 +5078,27 @@
 		<field name="BUTTON_POSITIVE" since="3" />
 	</class>
 	<class name="android/content/DialogInterface$OnCancelListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onCancel(Landroid/content/DialogInterface;)V" />
 	</class>
 	<class name="android/content/DialogInterface$OnClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onClick(Landroid/content/DialogInterface;I)V" />
 	</class>
 	<class name="android/content/DialogInterface$OnDismissListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onDismiss(Landroid/content/DialogInterface;)V" />
 	</class>
 	<class name="android/content/DialogInterface$OnKeyListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onKey(Landroid/content/DialogInterface;ILandroid/view/KeyEvent;)Z" />
 	</class>
 	<class name="android/content/DialogInterface$OnMultiChoiceClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onClick(Landroid/content/DialogInterface;IZ)V" />
 	</class>
 	<class name="android/content/DialogInterface$OnShowListener" since="8">
+		<extends name="java/lang/Object" />
 		<method name="onShow(Landroid/content/DialogInterface;)V" />
 	</class>
 	<class name="android/content/Entity" since="8">
@@ -5292,6 +5115,7 @@
 		<field name="values" />
 	</class>
 	<class name="android/content/EntityIterator" since="8">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Iterator" />
 		<method name="close()V" />
 		<method name="reset()V" />
@@ -5308,10 +5132,8 @@
 		<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;" />
 		<method name="cloneFilter()Landroid/content/Intent;" />
 		<method name="createChooser(Landroid/content/Intent;Ljava/lang/CharSequence;)Landroid/content/Intent;" />
-		<method name="describeContents()I" />
 		<method name="fillIn(Landroid/content/Intent;I)I" />
 		<method name="filterEquals(Landroid/content/Intent;)Z" />
 		<method name="filterHashCode()I" />
@@ -5346,7 +5168,7 @@
 		<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;" />
-		<method name="getParcelableExtra(Ljava/lang/String;)LT;" />
+		<method name="getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;" />
 		<method name="getScheme()Ljava/lang/String;" />
 		<method name="getSelector()Landroid/content/Intent;" since="15" />
 		<method name="getSerializableExtra(Ljava/lang/String;)Ljava/io/Serializable;" />
@@ -5420,7 +5242,6 @@
 		<method name="setType(Ljava/lang/String;)Landroid/content/Intent;" />
 		<method name="toURI()Ljava/lang/String;" />
 		<method name="toUri(I)Ljava/lang/String;" since="4" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ACTION_AIRPLANE_MODE_CHANGED" />
 		<field name="ACTION_ALL_APPS" />
 		<field name="ACTION_ANSWER" />
@@ -5634,9 +5455,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="fromContext(Landroid/content/Context;I)Landroid/content/Intent$ShortcutIconResource;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="packageName" />
 		<field name="resourceName" />
@@ -5664,7 +5483,6 @@
 		<method name="countDataSchemes()I" />
 		<method name="countDataTypes()I" />
 		<method name="create(Ljava/lang/String;Ljava/lang/String;)Landroid/content/IntentFilter;" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="getAction(I)Ljava/lang/String;" />
 		<method name="getCategory(I)Ljava/lang/String;" />
@@ -5690,7 +5508,6 @@
 		<method name="schemesIterator()Ljava/util/Iterator;" />
 		<method name="setPriority(I)V" />
 		<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" />
 		<field name="MATCH_ADJUSTMENT_MASK" />
@@ -5724,16 +5541,16 @@
 	<class name="android/content/IntentSender" since="4">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getTargetPackage()Ljava/lang/String;" since="9" />
 		<method name="readIntentSenderOrNullFromParcel(Landroid/os/Parcel;)Landroid/content/IntentSender;" />
 		<method name="sendIntent(Landroid/content/Context;ILandroid/content/Intent;Landroid/content/IntentSender$OnFinished;Landroid/os/Handler;)V" />
 		<method name="sendIntent(Landroid/content/Context;ILandroid/content/Intent;Landroid/content/IntentSender$OnFinished;Landroid/os/Handler;Ljava/lang/String;)V" since="14" />
 		<method name="writeIntentSenderOrNullToParcel(Landroid/content/IntentSender;Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/content/IntentSender$OnFinished" since="4">
+		<extends name="java/lang/Object" />
 		<method name="onSendFinished(Landroid/content/IntentSender;Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;)V" />
 	</class>
 	<class name="android/content/IntentSender$SendIntentException" since="4">
@@ -5746,8 +5563,8 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="abandon()V" />
-		<method name="dataToString(LD;)Ljava/lang/String;" />
-		<method name="deliverResult(LD;)V" />
+		<method name="dataToString(Ljava/lang/Object;)Ljava/lang/String;" />
+		<method name="deliverResult(Ljava/lang/Object;)V" />
 		<method name="dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V" />
 		<method name="forceLoad()V" />
 		<method name="getContext()Landroid/content/Context;" />
@@ -5770,10 +5587,11 @@
 	</class>
 	<class name="android/content/Loader$ForceLoadContentObserver" since="11">
 		<extends name="android/database/ContentObserver" />
-		<method name="&lt;init>()V" />
+		<method name="&lt;init>(Landroid/content/Loader;)V" />
 	</class>
 	<class name="android/content/Loader$OnLoadCompleteListener" since="11">
-		<method name="onLoadComplete(Landroid/content/Loader;LD;)V" />
+		<extends name="java/lang/Object" />
+		<method name="onLoadComplete(Landroid/content/Loader;Ljava/lang/Object;)V" />
 	</class>
 	<class name="android/content/MutableContextWrapper" since="1">
 		<extends name="android/content/ContextWrapper" />
@@ -5794,8 +5612,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;J)V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="account" />
 		<field name="authority" />
@@ -5809,21 +5625,17 @@
 	<class name="android/content/SearchRecentSuggestionsProvider" since="1">
 		<extends name="android/content/ContentProvider" />
 		<method name="&lt;init>()V" />
-		<method name="delete(Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I" />
-		<method name="getType(Landroid/net/Uri;)Ljava/lang/String;" />
-		<method name="insert(Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;" />
-		<method name="onCreate()Z" />
-		<method name="query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;" />
 		<method name="setupSuggestions(Ljava/lang/String;I)V" />
-		<method name="update(Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I" />
 		<field name="DATABASE_MODE_2LINES" />
 		<field name="DATABASE_MODE_QUERIES" />
 	</class>
 	<class name="android/content/ServiceConnection" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V" />
 		<method name="onServiceDisconnected(Landroid/content/ComponentName;)V" />
 	</class>
 	<class name="android/content/SharedPreferences" since="1">
+		<extends name="java/lang/Object" />
 		<method name="contains(Ljava/lang/String;)Z" />
 		<method name="edit()Landroid/content/SharedPreferences$Editor;" />
 		<method name="getAll()Ljava/util/Map;" />
@@ -5837,6 +5649,7 @@
 		<method name="unregisterOnSharedPreferenceChangeListener(Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;)V" />
 	</class>
 	<class name="android/content/SharedPreferences$Editor" since="1">
+		<extends name="java/lang/Object" />
 		<method name="apply()V" since="9" />
 		<method name="clear()Landroid/content/SharedPreferences$Editor;" />
 		<method name="commit()Z" />
@@ -5849,6 +5662,7 @@
 		<method name="remove(Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;" />
 	</class>
 	<class name="android/content/SharedPreferences$OnSharedPreferenceChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onSharedPreferenceChanged(Landroid/content/SharedPreferences;Ljava/lang/String;)V" />
 	</class>
 	<class name="android/content/SyncAdapterType" since="5">
@@ -5857,13 +5671,11 @@
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;ZZ)V" />
 		<method name="allowParallelSyncs()Z" since="11" />
-		<method name="describeContents()I" />
 		<method name="getSettingsActivity()Ljava/lang/String;" since="14" />
 		<method name="isAlwaysSyncable()Z" since="11" />
 		<method name="isUserVisible()Z" />
 		<method name="newKey(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SyncAdapterType;" />
 		<method name="supportsUploading()Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="accountType" />
 		<field name="authority" />
@@ -5871,14 +5683,14 @@
 	</class>
 	<class name="android/content/SyncContext" since="5">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getSyncContextBinder()Landroid/os/IBinder;" />
 		<method name="onFinished(Landroid/content/SyncResult;)V" />
 	</class>
 	<class name="android/content/SyncInfo" since="8">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" since="11" />
-		<method name="describeContents()I" since="11" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="11" />
+		<method name="&lt;init>()V" />
 		<field name="account" />
 		<field name="authority" />
 		<field name="startTime" />
@@ -5888,13 +5700,11 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="clear()V" />
-		<method name="describeContents()I" />
 		<method name="hasError()Z" />
 		<method name="hasHardError()Z" />
 		<method name="hasSoftError()Z" />
 		<method name="madeSomeProgress()Z" />
 		<method name="toDebugString()Ljava/lang/String;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ALREADY_IN_PROGRESS" />
 		<field name="CREATOR" />
 		<field name="databaseError" />
@@ -5913,8 +5723,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="clear()V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="numAuthExceptions" />
 		<field name="numConflictDetectedExceptions" />
@@ -5927,6 +5735,7 @@
 		<field name="numUpdates" />
 	</class>
 	<class name="android/content/SyncStatusObserver" since="5">
+		<extends name="java/lang/Object" />
 		<method name="onStatusChanged(I)V" />
 	</class>
 	<class name="android/content/UriMatcher" since="1">
@@ -5941,7 +5750,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/pm/ActivityInfo;)V" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="getThemeResource()I" />
 		<field name="CONFIG_FONT_SCALE" />
@@ -6001,7 +5809,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/pm/ApplicationInfo;)V" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="loadDescription(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;" />
 		<field name="CREATOR" />
@@ -6073,9 +5880,7 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/pm/ConfigurationInfo;)V" />
-		<method name="describeContents()I" />
 		<method name="getGlEsVersion()Ljava/lang/String;" since="4" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="GL_ES_VERSION_UNDEFINED" since="4" />
 		<field name="INPUT_FEATURE_FIVE_WAY_NAV" />
@@ -6091,9 +5896,7 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/pm/FeatureInfo;)V" />
-		<method name="describeContents()I" />
 		<method name="getGlEsVersion()Ljava/lang/String;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="FLAG_REQUIRED" />
 		<field name="GL_ES_VERSION_UNDEFINED" />
@@ -6102,6 +5905,7 @@
 		<field name="reqGlEsVersion" />
 	</class>
 	<class name="android/content/pm/IPackageInstallObserver" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/IInterface" />
 		<method name="packageInstalled(Ljava/lang/String;I)V" />
 	</class>
@@ -6109,16 +5913,13 @@
 		<extends name="android/os/Binder" />
 		<implements name="android/content/pm/IPackageInstallObserver" />
 		<method name="&lt;init>()V" />
-		<method name="asBinder()Landroid/os/IBinder;" />
 		<method name="asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageInstallObserver;" />
-		<method name="onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z" />
 	</class>
 	<class name="android/content/pm/InstrumentationInfo" since="1">
 		<extends name="android/content/pm/PackageItemInfo" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/pm/InstrumentationInfo;)V" />
-		<method name="describeContents()I" />
 		<field name="CREATOR" />
 		<field name="dataDir" />
 		<field name="functionalTest" />
@@ -6145,8 +5946,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="activities" />
 		<field name="applicationInfo" />
@@ -6376,8 +6175,6 @@
 		<method name="&lt;init>(Landroid/content/pm/PackageStats;)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="cacheSize" />
 		<field name="codeSize" />
@@ -6402,7 +6199,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/pm/PermissionGroupInfo;)V" />
-		<method name="describeContents()I" />
 		<method name="loadDescription(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;" />
 		<field name="CREATOR" />
 		<field name="descriptionRes" />
@@ -6413,7 +6209,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/pm/PermissionInfo;)V" />
-		<method name="describeContents()I" />
 		<method name="loadDescription(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;" />
 		<field name="CREATOR" />
 		<field name="PROTECTION_DANGEROUS" />
@@ -6430,7 +6225,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/pm/ProviderInfo;)V" />
-		<method name="describeContents()I" />
 		<field name="CREATOR" />
 		<field name="authority" />
 		<field name="grantUriPermissions" />
@@ -6446,12 +6240,10 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="getIconResource()I" />
 		<method name="loadIcon(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;" />
 		<method name="loadLabel(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="activityInfo" />
 		<field name="filter" />
@@ -6477,7 +6269,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/pm/ServiceInfo;)V" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" since="5" />
 		<field name="CREATOR" />
 		<field name="FLAG_STOP_WITH_TASK" since="14" />
@@ -6489,12 +6280,10 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>([B)V" />
-		<method name="describeContents()I" />
 		<method name="toByteArray()[B" />
 		<method name="toChars()[C" />
 		<method name="toChars([C[I)[C" />
 		<method name="toCharsString()Ljava/lang/String;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/content/res/AssetFileDescriptor" since="1">
@@ -6504,13 +6293,11 @@
 		<method name="close()V" />
 		<method name="createInputStream()Ljava/io/FileInputStream;" since="3" />
 		<method name="createOutputStream()Ljava/io/FileOutputStream;" since="3" />
-		<method name="describeContents()I" since="3" />
 		<method name="getDeclaredLength()J" since="3" />
 		<method name="getFileDescriptor()Ljava/io/FileDescriptor;" />
 		<method name="getLength()J" />
 		<method name="getParcelFileDescriptor()Landroid/os/ParcelFileDescriptor;" />
 		<method name="getStartOffset()J" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 		<field name="CREATOR" since="3" />
 		<field name="UNKNOWN_LENGTH" since="3" />
 	</class>
@@ -6524,6 +6311,7 @@
 	</class>
 	<class name="android/content/res/AssetManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="close()V" />
 		<method name="getLocales()[Ljava/lang/String;" />
 		<method name="list(Ljava/lang/String;)[Ljava/lang/String;" />
@@ -6541,39 +6329,28 @@
 	</class>
 	<class name="android/content/res/AssetManager$AssetInputStream" since="1">
 		<extends name="java/io/InputStream" />
-		<method name="available()I" />
-		<method name="close()V" />
+		<method name="&lt;init>(Landroid/content/res/AssetManager;)V" />
 		<method name="getAssetInt()I" />
-		<method name="mark(I)V" />
-		<method name="markSupported()Z" />
-		<method name="read()I" />
-		<method name="read([B)I" />
-		<method name="read([BII)I" />
-		<method name="reset()V" />
-		<method name="skip(J)J" />
 	</class>
 	<class name="android/content/res/ColorStateList" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>([[I[I)V" />
 		<method name="createFromXml(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;)Landroid/content/res/ColorStateList;" />
-		<method name="describeContents()I" />
 		<method name="getColorForState([II)I" />
 		<method name="getDefaultColor()I" />
 		<method name="isStateful()Z" />
 		<method name="valueOf(I)Landroid/content/res/ColorStateList;" />
 		<method name="withAlpha(I)Landroid/content/res/ColorStateList;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/content/res/Configuration" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Comparable" />
 		<implements name="android/os/Parcelable" />
+		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/res/Configuration;)V" />
 		<method name="compareTo(Landroid/content/res/Configuration;)I" />
-		<method name="describeContents()I" />
 		<method name="diff(Landroid/content/res/Configuration;)I" />
 		<method name="equals(Landroid/content/res/Configuration;)Z" />
 		<method name="isLayoutSizeAtLeast(I)Z" since="11" />
@@ -6582,7 +6359,6 @@
 		<method name="setTo(Landroid/content/res/Configuration;)V" since="8" />
 		<method name="setToDefaults()V" />
 		<method name="updateFrom(Landroid/content/res/Configuration;)I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="HARDKEYBOARDHIDDEN_NO" since="3" />
 		<field name="HARDKEYBOARDHIDDEN_UNDEFINED" since="3" />
@@ -6653,8 +6429,7 @@
 	<class name="android/content/res/ObbInfo" since="9">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
+		<method name="&lt;init>()V" />
 		<field name="CREATOR" />
 		<field name="OBB_OVERLAY" />
 		<field name="filename" />
@@ -6664,6 +6439,7 @@
 	</class>
 	<class name="android/content/res/ObbScanner" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getObbInfo(Ljava/lang/String;)Landroid/content/res/ObbInfo;" />
 	</class>
 	<class name="android/content/res/Resources" since="1">
@@ -6724,6 +6500,7 @@
 	</class>
 	<class name="android/content/res/Resources$Theme" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/content/res/Resources;)V" />
 		<method name="applyStyle(IZ)V" />
 		<method name="dump(ILjava/lang/String;Ljava/lang/String;)V" />
 		<method name="obtainStyledAttributes(I[I)Landroid/content/res/TypedArray;" />
@@ -6734,6 +6511,7 @@
 	</class>
 	<class name="android/content/res/TypedArray" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getBoolean(IZ)Z" />
 		<method name="getColor(II)I" />
 		<method name="getColorStateList(I)Landroid/content/res/ColorStateList;" />
@@ -6763,6 +6541,7 @@
 		<method name="recycle()V" />
 	</class>
 	<class name="android/content/res/XmlResourceParser" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/util/AttributeSet" />
 		<implements name="org/xmlpull/v1/XmlPullParser" />
 		<method name="close()V" />
@@ -6772,52 +6551,10 @@
 		<implements name="android/database/CrossProcessCursor" />
 		<method name="&lt;init>()V" />
 		<method name="checkPosition()V" />
-		<method name="close()V" />
-		<method name="copyStringToBuffer(ILandroid/database/CharArrayBuffer;)V" />
-		<method name="deactivate()V" />
-		<method name="fillWindow(ILandroid/database/CursorWindow;)V" />
-		<method name="getBlob(I)[B" />
-		<method name="getColumnCount()I" />
-		<method name="getColumnIndex(Ljava/lang/String;)I" />
-		<method name="getColumnIndexOrThrow(Ljava/lang/String;)I" />
-		<method name="getColumnName(I)Ljava/lang/String;" />
-		<method name="getColumnNames()[Ljava/lang/String;" />
-		<method name="getCount()I" />
-		<method name="getDouble(I)D" />
-		<method name="getExtras()Landroid/os/Bundle;" />
-		<method name="getFloat(I)F" />
-		<method name="getInt(I)I" />
-		<method name="getLong(I)J" />
 		<method name="getNotificationUri()Landroid/net/Uri;" since="11" />
-		<method name="getPosition()I" />
-		<method name="getShort(I)S" />
-		<method name="getString(I)Ljava/lang/String;" />
-		<method name="getType(I)I" since="11" />
 		<method name="getUpdatedField(I)Ljava/lang/Object;" />
-		<method name="getWantsAllOnMoveCalls()Z" />
-		<method name="getWindow()Landroid/database/CursorWindow;" />
-		<method name="isAfterLast()Z" />
-		<method name="isBeforeFirst()Z" />
-		<method name="isClosed()Z" />
 		<method name="isFieldUpdated(I)Z" />
-		<method name="isFirst()Z" />
-		<method name="isLast()Z" />
-		<method name="isNull(I)Z" />
-		<method name="move(I)Z" />
-		<method name="moveToFirst()Z" />
-		<method name="moveToLast()Z" />
-		<method name="moveToNext()Z" />
-		<method name="moveToPosition(I)Z" />
-		<method name="moveToPrevious()Z" />
 		<method name="onChange(Z)V" />
-		<method name="onMove(II)Z" />
-		<method name="registerContentObserver(Landroid/database/ContentObserver;)V" />
-		<method name="registerDataSetObserver(Landroid/database/DataSetObserver;)V" />
-		<method name="requery()Z" />
-		<method name="respond(Landroid/os/Bundle;)Landroid/os/Bundle;" />
-		<method name="setNotificationUri(Landroid/content/ContentResolver;Landroid/net/Uri;)V" />
-		<method name="unregisterContentObserver(Landroid/database/ContentObserver;)V" />
-		<method name="unregisterDataSetObserver(Landroid/database/DataSetObserver;)V" />
 		<field name="mClosed" />
 		<field name="mContentResolver" />
 		<field name="mCurrentRowID" />
@@ -6832,17 +6569,10 @@
 	<class name="android/database/AbstractWindowedCursor" since="1">
 		<extends name="android/database/AbstractCursor" />
 		<method name="&lt;init>()V" />
-		<method name="getDouble(I)D" />
-		<method name="getFloat(I)F" />
-		<method name="getInt(I)I" />
-		<method name="getLong(I)J" />
-		<method name="getShort(I)S" />
-		<method name="getString(I)Ljava/lang/String;" />
 		<method name="hasWindow()Z" />
 		<method name="isBlob(I)Z" />
 		<method name="isFloat(I)Z" since="5" />
 		<method name="isLong(I)Z" since="5" />
-		<method name="isNull(I)Z" />
 		<method name="isString(I)Z" since="5" />
 		<method name="setWindow(Landroid/database/CursorWindow;)V" />
 		<field name="mWindow" />
@@ -6869,6 +6599,7 @@
 		<method name="onChange(Z)V" />
 	</class>
 	<class name="android/database/CrossProcessCursor" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/database/Cursor" />
 		<method name="fillWindow(ILandroid/database/CursorWindow;)V" />
 		<method name="getWindow()Landroid/database/CursorWindow;" />
@@ -6878,11 +6609,9 @@
 		<extends name="android/database/CursorWrapper" />
 		<implements name="android/database/CrossProcessCursor" />
 		<method name="&lt;init>(Landroid/database/Cursor;)V" />
-		<method name="fillWindow(ILandroid/database/CursorWindow;)V" />
-		<method name="getWindow()Landroid/database/CursorWindow;" />
-		<method name="onMove(II)Z" />
 	</class>
 	<class name="android/database/Cursor" since="1">
+		<extends name="java/lang/Object" />
 		<method name="close()V" />
 		<method name="copyStringToBuffer(ILandroid/database/CharArrayBuffer;)V" />
 		<method name="deactivate()V" />
@@ -6938,10 +6667,7 @@
 		<implements name="java/lang/Iterable" />
 		<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;" />
 		<method name="next()Landroid/database/CursorJoiner$Result;" />
-		<method name="remove()V" />
 	</class>
 	<class name="android/database/CursorJoiner$Result" since="1">
 		<extends name="java/lang/Enum" />
@@ -6960,7 +6686,6 @@
 		<method name="clear()V" />
 		<method name="close()V" />
 		<method name="copyStringToBuffer(IILandroid/database/CharArrayBuffer;)V" />
-		<method name="describeContents()I" />
 		<method name="freeLastRow()V" />
 		<method name="getBlob(II)[B" />
 		<method name="getDouble(II)D" />
@@ -6978,7 +6703,6 @@
 		<method name="isNull(II)Z" />
 		<method name="isString(II)Z" since="5" />
 		<method name="newFromParcel(Landroid/os/Parcel;)Landroid/database/CursorWindow;" />
-		<method name="onAllReferencesReleased()V" />
 		<method name="putBlob([BII)Z" />
 		<method name="putDouble(DII)Z" />
 		<method name="putLong(JII)Z" />
@@ -6986,53 +6710,13 @@
 		<method name="putString(Ljava/lang/String;II)Z" />
 		<method name="setNumColumns(I)Z" />
 		<method name="setStartPosition(I)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/database/CursorWrapper" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/database/Cursor" />
 		<method name="&lt;init>(Landroid/database/Cursor;)V" />
-		<method name="close()V" />
-		<method name="copyStringToBuffer(ILandroid/database/CharArrayBuffer;)V" />
-		<method name="deactivate()V" />
-		<method name="getBlob(I)[B" />
-		<method name="getColumnCount()I" />
-		<method name="getColumnIndex(Ljava/lang/String;)I" />
-		<method name="getColumnIndexOrThrow(Ljava/lang/String;)I" />
-		<method name="getColumnName(I)Ljava/lang/String;" />
-		<method name="getColumnNames()[Ljava/lang/String;" />
-		<method name="getCount()I" />
-		<method name="getDouble(I)D" />
-		<method name="getExtras()Landroid/os/Bundle;" />
-		<method name="getFloat(I)F" />
-		<method name="getInt(I)I" />
-		<method name="getLong(I)J" />
-		<method name="getPosition()I" />
-		<method name="getShort(I)S" />
-		<method name="getString(I)Ljava/lang/String;" />
-		<method name="getType(I)I" since="11" />
-		<method name="getWantsAllOnMoveCalls()Z" />
 		<method name="getWrappedCursor()Landroid/database/Cursor;" since="11" />
-		<method name="isAfterLast()Z" />
-		<method name="isBeforeFirst()Z" />
-		<method name="isClosed()Z" />
-		<method name="isFirst()Z" />
-		<method name="isLast()Z" />
-		<method name="isNull(I)Z" />
-		<method name="move(I)Z" />
-		<method name="moveToFirst()Z" />
-		<method name="moveToLast()Z" />
-		<method name="moveToNext()Z" />
-		<method name="moveToPosition(I)Z" />
-		<method name="moveToPrevious()Z" />
-		<method name="registerContentObserver(Landroid/database/ContentObserver;)V" />
-		<method name="registerDataSetObserver(Landroid/database/DataSetObserver;)V" />
-		<method name="requery()Z" />
-		<method name="respond(Landroid/os/Bundle;)Landroid/os/Bundle;" />
-		<method name="setNotificationUri(Landroid/content/ContentResolver;Landroid/net/Uri;)V" />
-		<method name="unregisterContentObserver(Landroid/database/ContentObserver;)V" />
-		<method name="unregisterDataSetObserver(Landroid/database/DataSetObserver;)V" />
 	</class>
 	<class name="android/database/DataSetObservable" since="1">
 		<extends name="android/database/Observable" />
@@ -7047,6 +6731,7 @@
 		<method name="onInvalidated()V" />
 	</class>
 	<class name="android/database/DatabaseErrorHandler" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onCorruption(Landroid/database/sqlite/SQLiteDatabase;)V" />
 	</class>
 	<class name="android/database/DatabaseUtils" since="1">
@@ -7134,7 +6819,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/database/DatabaseErrorHandler" />
 		<method name="&lt;init>()V" />
-		<method name="onCorruption(Landroid/database/sqlite/SQLiteDatabase;)V" />
 	</class>
 	<class name="android/database/MatrixCursor" since="1">
 		<extends name="android/database/AbstractCursor" />
@@ -7142,40 +6826,23 @@
 		<method name="&lt;init>([Ljava/lang/String;I)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" />
-		<method name="getDouble(I)D" />
-		<method name="getFloat(I)F" />
-		<method name="getInt(I)I" />
-		<method name="getLong(I)J" />
-		<method name="getShort(I)S" />
-		<method name="getString(I)Ljava/lang/String;" />
-		<method name="isNull(I)Z" />
 		<method name="newRow()Landroid/database/MatrixCursor$RowBuilder;" />
 	</class>
 	<class name="android/database/MatrixCursor$RowBuilder" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/database/MatrixCursor;)V" />
 		<method name="add(Ljava/lang/Object;)Landroid/database/MatrixCursor$RowBuilder;" />
 	</class>
 	<class name="android/database/MergeCursor" since="1">
 		<extends name="android/database/AbstractCursor" />
 		<method name="&lt;init>([Landroid/database/Cursor;)V" />
-		<method name="getColumnNames()[Ljava/lang/String;" />
-		<method name="getCount()I" />
-		<method name="getDouble(I)D" />
-		<method name="getFloat(I)F" />
-		<method name="getInt(I)I" />
-		<method name="getLong(I)J" />
-		<method name="getShort(I)S" />
-		<method name="getString(I)Ljava/lang/String;" />
-		<method name="isNull(I)Z" />
 	</class>
 	<class name="android/database/Observable" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="registerObserver(LT;)V" />
+		<method name="registerObserver(Ljava/lang/Object;)V" />
 		<method name="unregisterAll()V" />
-		<method name="unregisterObserver(LT;)V" />
+		<method name="unregisterObserver(Ljava/lang/Object;)V" />
 		<field name="mObservers" />
 	</class>
 	<class name="android/database/SQLException" since="1">
@@ -7231,12 +6898,11 @@
 		<extends name="android/database/AbstractWindowedCursor" />
 		<method name="&lt;init>(Landroid/database/sqlite/SQLiteCursorDriver;Ljava/lang/String;Landroid/database/sqlite/SQLiteQuery;)V" since="11" />
 		<method name="&lt;init>(Landroid/database/sqlite/SQLiteDatabase;Landroid/database/sqlite/SQLiteCursorDriver;Ljava/lang/String;Landroid/database/sqlite/SQLiteQuery;)V" />
-		<method name="getColumnNames()[Ljava/lang/String;" />
-		<method name="getCount()I" />
 		<method name="getDatabase()Landroid/database/sqlite/SQLiteDatabase;" />
 		<method name="setSelectionArguments([Ljava/lang/String;)V" />
 	</class>
 	<class name="android/database/sqlite/SQLiteCursorDriver" since="1">
+		<extends name="java/lang/Object" />
 		<method name="cursorClosed()V" />
 		<method name="cursorDeactivated()V" />
 		<method name="cursorRequeried(Landroid/database/Cursor;)V" />
@@ -7245,6 +6911,7 @@
 	</class>
 	<class name="android/database/sqlite/SQLiteDatabase" since="1">
 		<extends name="android/database/sqlite/SQLiteClosable" />
+		<method name="&lt;init>()V" />
 		<method name="beginTransaction()V" />
 		<method name="beginTransactionNonExclusive()V" since="11" />
 		<method name="beginTransactionWithListener(Landroid/database/sqlite/SQLiteTransactionListener;)V" since="5" />
@@ -7276,7 +6943,6 @@
 		<method name="markTableSyncable(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="markTableSyncable(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="needUpgrade(I)Z" />
-		<method name="onAllReferencesReleased()V" />
 		<method name="openDatabase(Ljava/lang/String;Landroid/database/sqlite/SQLiteDatabase$CursorFactory;I)Landroid/database/sqlite/SQLiteDatabase;" />
 		<method name="openDatabase(Ljava/lang/String;Landroid/database/sqlite/SQLiteDatabase$CursorFactory;ILandroid/database/DatabaseErrorHandler;)Landroid/database/sqlite/SQLiteDatabase;" since="11" />
 		<method name="openOrCreateDatabase(Ljava/io/File;Landroid/database/sqlite/SQLiteDatabase$CursorFactory;)Landroid/database/sqlite/SQLiteDatabase;" />
@@ -7317,6 +6983,7 @@
 		<field name="SQLITE_MAX_LIKE_PATTERN_LENGTH" />
 	</class>
 	<class name="android/database/sqlite/SQLiteDatabase$CursorFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="newCursor(Landroid/database/sqlite/SQLiteDatabase;Landroid/database/sqlite/SQLiteCursorDriver;Ljava/lang/String;Landroid/database/sqlite/SQLiteQuery;)Landroid/database/Cursor;" />
 	</class>
 	<class name="android/database/sqlite/SQLiteDatabaseCorruptException" since="1">
@@ -7379,6 +7046,7 @@
 	</class>
 	<class name="android/database/sqlite/SQLiteProgram" since="1">
 		<extends name="android/database/sqlite/SQLiteClosable" />
+		<method name="&lt;init>()V" />
 		<method name="bindAllArgsAsStrings([Ljava/lang/String;)V" since="11" />
 		<method name="bindBlob(I[B)V" />
 		<method name="bindDouble(ID)V" />
@@ -7396,13 +7064,13 @@
 		<method name="native_bind_string(ILjava/lang/String;)V" />
 		<method name="native_compile(Ljava/lang/String;)V" />
 		<method name="native_finalize()V" />
-		<method name="onAllReferencesReleased()V" />
 		<field name="mDatabase" />
 		<field name="nHandle" />
 		<field name="nStatement" />
 	</class>
 	<class name="android/database/sqlite/SQLiteQuery" since="1">
 		<extends name="android/database/sqlite/SQLiteProgram" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/database/sqlite/SQLiteQueryBuilder" since="1">
 		<extends name="java/lang/Object" />
@@ -7432,6 +7100,7 @@
 	</class>
 	<class name="android/database/sqlite/SQLiteStatement" since="1">
 		<extends name="android/database/sqlite/SQLiteProgram" />
+		<method name="&lt;init>()V" />
 		<method name="execute()V" />
 		<method name="executeInsert()J" />
 		<method name="executeUpdateDelete()I" since="11" />
@@ -7445,6 +7114,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/database/sqlite/SQLiteTransactionListener" since="5">
+		<extends name="java/lang/Object" />
 		<method name="onBegin()V" />
 		<method name="onCommit()V" />
 		<method name="onRollback()V" />
@@ -7569,13 +7239,16 @@
 		<field name="ERROR_UNKNOWN" />
 	</class>
 	<class name="android/drm/DrmManagerClient$OnErrorListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onError(Landroid/drm/DrmManagerClient;Landroid/drm/DrmErrorEvent;)V" />
 	</class>
 	<class name="android/drm/DrmManagerClient$OnEventListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onEvent(Landroid/drm/DrmManagerClient;Landroid/drm/DrmEvent;)V" since="12" />
 		<method name="onEvent(Landroid/drm/DrmManagerClient;Landroid/drm/DrmEvent;Ljava/util/HashMap;)V" />
 	</class>
 	<class name="android/drm/DrmManagerClient$OnInfoListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onInfo(Landroid/drm/DrmManagerClient;Landroid/drm/DrmInfoEvent;)V" />
 	</class>
 	<class name="android/drm/DrmRights" since="11">
@@ -7607,6 +7280,7 @@
 		<field name="TRANSFER" />
 	</class>
 	<class name="android/drm/DrmStore$ConstraintsColumns" since="11">
+		<extends name="java/lang/Object" />
 		<field name="EXTENDED_METADATA" />
 		<field name="LICENSE_AVAILABLE_TIME" />
 		<field name="LICENSE_EXPIRY_TIME" />
@@ -7655,12 +7329,14 @@
 	</class>
 	<class name="android/drm/DrmUtils$ExtendedMetadataParser" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="get(Ljava/lang/String;)Ljava/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" />
+		<method name="&lt;init>()V" />
 		<method name="getAccountId()Ljava/lang/String;" />
 		<method name="getData()[B" />
 		<method name="getSubscriptionId()Ljava/lang/String;" />
@@ -7670,8 +7346,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="addStroke(Landroid/gesture/GestureStroke;)V" />
-		<method name="clone()Ljava/lang/Object;" since="8" />
-		<method name="describeContents()I" />
 		<method name="getBoundingBox()Landroid/graphics/RectF;" />
 		<method name="getID()J" />
 		<method name="getLength()F" />
@@ -7683,11 +7357,11 @@
 		<method name="toPath(IIII)Landroid/graphics/Path;" />
 		<method name="toPath(Landroid/graphics/Path;)Landroid/graphics/Path;" />
 		<method name="toPath(Landroid/graphics/Path;IIII)Landroid/graphics/Path;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/gesture/GestureLibraries" since="4">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="fromFile(Ljava/io/File;)Landroid/gesture/GestureLibrary;" />
 		<method name="fromFile(Ljava/lang/String;)Landroid/gesture/GestureLibrary;" />
 		<method name="fromPrivateFile(Landroid/content/Context;Ljava/lang/String;)Landroid/gesture/GestureLibrary;" />
@@ -7764,22 +7438,24 @@
 		<field name="ORIENTATION_VERTICAL" />
 	</class>
 	<class name="android/gesture/GestureOverlayView$OnGestureListener" since="4">
+		<extends name="java/lang/Object" />
 		<method name="onGesture(Landroid/gesture/GestureOverlayView;Landroid/view/MotionEvent;)V" />
 		<method name="onGestureCancelled(Landroid/gesture/GestureOverlayView;Landroid/view/MotionEvent;)V" />
 		<method name="onGestureEnded(Landroid/gesture/GestureOverlayView;Landroid/view/MotionEvent;)V" />
 		<method name="onGestureStarted(Landroid/gesture/GestureOverlayView;Landroid/view/MotionEvent;)V" />
 	</class>
 	<class name="android/gesture/GestureOverlayView$OnGesturePerformedListener" since="4">
+		<extends name="java/lang/Object" />
 		<method name="onGesturePerformed(Landroid/gesture/GestureOverlayView;Landroid/gesture/Gesture;)V" />
 	</class>
 	<class name="android/gesture/GestureOverlayView$OnGesturingListener" since="4">
+		<extends name="java/lang/Object" />
 		<method name="onGesturingEnded(Landroid/gesture/GestureOverlayView;)V" />
 		<method name="onGesturingStarted(Landroid/gesture/GestureOverlayView;)V" />
 	</class>
 	<class name="android/gesture/GesturePoint" since="4">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(FFJ)V" />
-		<method name="clone()Ljava/lang/Object;" since="8" />
 		<field name="timestamp" />
 		<field name="x" />
 		<field name="y" />
@@ -7811,7 +7487,6 @@
 		<extends name="java/lang/Object" />
 		<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;" />
 		<method name="getPath()Landroid/graphics/Path;" />
 		<method name="toPath(FFI)Landroid/graphics/Path;" />
@@ -7821,6 +7496,7 @@
 	</class>
 	<class name="android/gesture/GestureUtils" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="computeOrientedBoundingBox(Ljava/util/ArrayList;)Landroid/gesture/OrientedBoundingBox;" />
 		<method name="computeOrientedBoundingBox([F)Landroid/gesture/OrientedBoundingBox;" />
 		<method name="spatialSampling(Landroid/gesture/Gesture;I)[F" />
@@ -7829,6 +7505,7 @@
 	</class>
 	<class name="android/gesture/OrientedBoundingBox" since="4">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="centerX" />
 		<field name="centerY" />
 		<field name="height" />
@@ -7838,6 +7515,7 @@
 	</class>
 	<class name="android/gesture/Prediction" since="4">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="name" />
 		<field name="score" />
 	</class>
@@ -7855,6 +7533,7 @@
 	<class name="android/graphics/Bitmap" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<method name="compress(Landroid/graphics/Bitmap$CompressFormat;ILjava/io/OutputStream;)Z" />
 		<method name="copy(Landroid/graphics/Bitmap$Config;Z)Landroid/graphics/Bitmap;" />
 		<method name="copyPixelsFromBuffer(Ljava/nio/Buffer;)V" since="3" />
@@ -7866,7 +7545,6 @@
 		<method name="createBitmap([IIIIILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;" />
 		<method name="createBitmap([IIILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;" />
 		<method name="createScaledBitmap(Landroid/graphics/Bitmap;IIZ)Landroid/graphics/Bitmap;" />
-		<method name="describeContents()I" />
 		<method name="eraseColor(I)V" />
 		<method name="extractAlpha()Landroid/graphics/Bitmap;" />
 		<method name="extractAlpha(Landroid/graphics/Paint;[I)Landroid/graphics/Bitmap;" />
@@ -7896,7 +7574,6 @@
 		<method name="setHasAlpha(Z)V" since="12" />
 		<method name="setPixel(III)V" />
 		<method name="setPixels([IIIIIII)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="DENSITY_NONE" since="4" />
 	</class>
@@ -7957,6 +7634,7 @@
 	</class>
 	<class name="android/graphics/BitmapRegionDecoder" since="10">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="decodeRegion(Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;" />
 		<method name="getHeight()I" />
 		<method name="getWidth()I" />
@@ -8319,6 +7997,7 @@
 	</class>
 	<class name="android/graphics/Movie" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="decodeByteArray([BII)Landroid/graphics/Movie;" />
 		<method name="decodeFile(Ljava/lang/String;)Landroid/graphics/Movie;" />
 		<method name="decodeStream(Ljava/io/InputStream;)Landroid/graphics/Movie;" />
@@ -8635,13 +8314,11 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(II)V" />
 		<method name="&lt;init>(Landroid/graphics/Point;)V" />
-		<method name="describeContents()I" since="13" />
 		<method name="equals(II)Z" />
 		<method name="negate()V" />
 		<method name="offset(II)V" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" since="13" />
 		<method name="set(II)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="13" />
 		<field name="CREATOR" since="13" />
 		<field name="x" />
 		<field name="y" />
@@ -8652,7 +8329,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(FF)V" />
 		<method name="&lt;init>(Landroid/graphics/Point;)V" />
-		<method name="describeContents()I" since="13" />
 		<method name="equals(FF)Z" />
 		<method name="length()F" />
 		<method name="length(FF)F" />
@@ -8661,7 +8337,6 @@
 		<method name="readFromParcel(Landroid/os/Parcel;)V" since="13" />
 		<method name="set(FF)V" />
 		<method name="set(Landroid/graphics/PointF;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="13" />
 		<field name="CREATOR" since="13" />
 		<field name="x" />
 		<field name="y" />
@@ -8721,7 +8396,6 @@
 		<method name="contains(II)Z" />
 		<method name="contains(IIII)Z" />
 		<method name="contains(Landroid/graphics/Rect;)Z" />
-		<method name="describeContents()I" />
 		<method name="exactCenterX()F" />
 		<method name="exactCenterY()F" />
 		<method name="flattenToString()Ljava/lang/String;" since="7" />
@@ -8746,7 +8420,6 @@
 		<method name="union(IIII)V" />
 		<method name="union(Landroid/graphics/Rect;)V" />
 		<method name="width()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="bottom" />
 		<field name="left" />
@@ -8765,7 +8438,6 @@
 		<method name="contains(FF)Z" />
 		<method name="contains(FFFF)Z" />
 		<method name="contains(Landroid/graphics/RectF;)Z" />
-		<method name="describeContents()I" since="3" />
 		<method name="height()F" />
 		<method name="inset(FF)V" />
 		<method name="intersect(FFFF)Z" />
@@ -8789,7 +8461,6 @@
 		<method name="union(FFFF)V" />
 		<method name="union(Landroid/graphics/RectF;)V" />
 		<method name="width()F" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 		<field name="CREATOR" since="3" />
 		<field name="bottom" />
 		<field name="left" />
@@ -8804,7 +8475,6 @@
 		<method name="&lt;init>(Landroid/graphics/Rect;)V" />
 		<method name="&lt;init>(Landroid/graphics/Region;)V" />
 		<method name="contains(II)Z" />
-		<method name="describeContents()I" />
 		<method name="getBoundaryPath()Landroid/graphics/Path;" />
 		<method name="getBoundaryPath(Landroid/graphics/Path;)Z" />
 		<method name="getBounds()Landroid/graphics/Rect;" />
@@ -8830,7 +8500,6 @@
 		<method name="translate(II)V" />
 		<method name="translate(IILandroid/graphics/Region;)V" />
 		<method name="union(Landroid/graphics/Rect;)Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/graphics/Region$Op" since="1">
@@ -8878,6 +8547,7 @@
 		<method name="updateTexImage()V" />
 	</class>
 	<class name="android/graphics/SurfaceTexture$OnFrameAvailableListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onFrameAvailable(Landroid/graphics/SurfaceTexture;)V" />
 	</class>
 	<class name="android/graphics/SurfaceTexture$OutOfResourcesException" since="11">
@@ -8892,6 +8562,7 @@
 	</class>
 	<class name="android/graphics/Typeface" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="create(Landroid/graphics/Typeface;I)Landroid/graphics/Typeface;" />
 		<method name="create(Ljava/lang/String;I)Landroid/graphics/Typeface;" />
 		<method name="createFromAsset(Landroid/content/res/AssetManager;Ljava/lang/String;)Landroid/graphics/Typeface;" />
@@ -8926,14 +8597,15 @@
 		<method name="getYuvFormat()I" />
 	</class>
 	<class name="android/graphics/drawable/Animatable" since="4">
+		<extends name="java/lang/Object" />
 		<method name="isRunning()Z" />
 		<method name="start()V" />
 		<method name="stop()V" />
 	</class>
 	<class name="android/graphics/drawable/AnimationDrawable" since="1">
 		<extends name="android/graphics/drawable/DrawableContainer" />
-		<implements name="java/lang/Runnable" />
 		<implements name="android/graphics/drawable/Animatable" since="4" />
+		<implements name="java/lang/Runnable" />
 		<method name="&lt;init>()V" />
 		<method name="addFrame(Landroid/graphics/drawable/Drawable;I)V" />
 		<method name="getDuration(I)I" />
@@ -8941,7 +8613,6 @@
 		<method name="getNumberOfFrames()I" />
 		<method name="isOneShot()Z" />
 		<method name="isRunning()Z" />
-		<method name="run()V" />
 		<method name="setOneShot(Z)V" />
 		<method name="start()V" />
 		<method name="stop()V" />
@@ -8956,17 +8627,12 @@
 		<method name="&lt;init>(Landroid/graphics/Bitmap;)V" />
 		<method name="&lt;init>(Ljava/io/InputStream;)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
 		<method name="getBitmap()Landroid/graphics/Bitmap;" />
-		<method name="getConstantState()Landroid/graphics/drawable/Drawable$ConstantState;" />
 		<method name="getGravity()I" />
-		<method name="getOpacity()I" />
 		<method name="getPaint()Landroid/graphics/Paint;" />
 		<method name="getTileModeX()Landroid/graphics/Shader$TileMode;" />
 		<method name="getTileModeY()Landroid/graphics/Shader$TileMode;" />
-		<method name="setAlpha(I)V" />
 		<method name="setAntiAlias(Z)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
 		<method name="setGravity(I)V" />
 		<method name="setTargetDensity(I)V" since="4" />
 		<method name="setTargetDensity(Landroid/graphics/Canvas;)V" since="4" />
@@ -8979,13 +8645,6 @@
 		<extends name="android/graphics/drawable/Drawable" />
 		<implements name="android/graphics/drawable/Drawable$Callback" />
 		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;II)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
-		<method name="getOpacity()I" />
-		<method name="invalidateDrawable(Landroid/graphics/drawable/Drawable;)V" />
-		<method name="scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V" />
-		<method name="setAlpha(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
-		<method name="unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V" />
 		<field name="HORIZONTAL" />
 		<field name="VERTICAL" />
 	</class>
@@ -8993,13 +8652,9 @@
 		<extends name="android/graphics/drawable/Drawable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
 		<method name="getAlpha()I" />
 		<method name="getColor()I" since="11" />
-		<method name="getOpacity()I" />
-		<method name="setAlpha(I)V" />
 		<method name="setColor(I)V" since="11" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
 	</class>
 	<class name="android/graphics/drawable/Drawable" since="1">
 		<extends name="java/lang/Object" />
@@ -9054,6 +8709,7 @@
 		<method name="unscheduleSelf(Ljava/lang/Runnable;)V" />
 	</class>
 	<class name="android/graphics/drawable/Drawable$Callback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="invalidateDrawable(Landroid/graphics/drawable/Drawable;)V" />
 		<method name="scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V" />
 		<method name="unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V" />
@@ -9069,24 +8725,17 @@
 		<extends name="android/graphics/drawable/Drawable" />
 		<implements name="android/graphics/drawable/Drawable$Callback" />
 		<method name="&lt;init>()V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
-		<method name="getOpacity()I" />
-		<method name="invalidateDrawable(Landroid/graphics/drawable/Drawable;)V" />
-		<method name="scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V" />
 		<method name="selectDrawable(I)Z" />
-		<method name="setAlpha(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
 		<method name="setConstantState(Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;)V" />
 		<method name="setEnterFadeDuration(I)V" since="11" />
 		<method name="setExitFadeDuration(I)V" since="11" />
-		<method name="unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V" />
 	</class>
 	<class name="android/graphics/drawable/DrawableContainer$DrawableContainerState" since="1">
 		<extends name="android/graphics/drawable/Drawable$ConstantState" />
+		<method name="&lt;init>()V" />
 		<method name="addChild(Landroid/graphics/drawable/Drawable;)I" />
 		<method name="canConstantState()Z" />
 		<method name="computeConstantSize()V" since="11" />
-		<method name="getChangingConfigurations()I" />
 		<method name="getChildCount()I" />
 		<method name="getChildren()[Landroid/graphics/drawable/Drawable;" />
 		<method name="getConstantHeight()I" />
@@ -9109,11 +8758,7 @@
 		<extends name="android/graphics/drawable/Drawable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/graphics/drawable/GradientDrawable$Orientation;[I)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
-		<method name="getOpacity()I" />
-		<method name="setAlpha(I)V" />
 		<method name="setColor(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
 		<method name="setCornerRadii([F)V" />
 		<method name="setCornerRadius(F)V" />
 		<method name="setGradientCenter(FF)V" />
@@ -9150,33 +8795,19 @@
 		<implements name="android/graphics/drawable/Drawable$Callback" />
 		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;I)V" />
 		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;IIII)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
-		<method name="getOpacity()I" />
-		<method name="invalidateDrawable(Landroid/graphics/drawable/Drawable;)V" />
-		<method name="scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V" />
-		<method name="setAlpha(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
-		<method name="unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V" />
 	</class>
 	<class name="android/graphics/drawable/LayerDrawable" since="1">
 		<extends name="android/graphics/drawable/Drawable" />
 		<implements name="android/graphics/drawable/Drawable$Callback" />
 		<method name="&lt;init>([Landroid/graphics/drawable/Drawable;)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
 		<method name="findDrawableByLayerId(I)Landroid/graphics/drawable/Drawable;" />
 		<method name="getDrawable(I)Landroid/graphics/drawable/Drawable;" />
 		<method name="getId(I)I" />
 		<method name="getNumberOfLayers()I" />
-		<method name="getOpacity()I" />
-		<method name="invalidateDrawable(Landroid/graphics/drawable/Drawable;)V" />
-		<method name="scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V" />
-		<method name="setAlpha(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
 		<method name="setDrawableByLayerId(ILandroid/graphics/drawable/Drawable;)Z" />
 		<method name="setId(II)V" />
 		<method name="setLayerInset(IIIII)V" />
 		<method name="setOpacity(I)V" since="11" />
-		<method name="unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V" />
 	</class>
 	<class name="android/graphics/drawable/LevelListDrawable" since="1">
 		<extends name="android/graphics/drawable/DrawableContainer" />
@@ -9189,11 +8820,7 @@
 		<method name="&lt;init>(Landroid/content/res/Resources;Landroid/graphics/NinePatch;)V" since="4" />
 		<method name="&lt;init>(Landroid/graphics/Bitmap;[BLandroid/graphics/Rect;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Landroid/graphics/NinePatch;)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
-		<method name="getOpacity()I" />
 		<method name="getPaint()Landroid/graphics/Paint;" />
-		<method name="setAlpha(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
 		<method name="setTargetDensity(I)V" since="4" />
 		<method name="setTargetDensity(Landroid/graphics/Canvas;)V" since="4" />
 		<method name="setTargetDensity(Landroid/util/DisplayMetrics;)V" since="4" />
@@ -9208,52 +8835,30 @@
 	<class name="android/graphics/drawable/PictureDrawable" since="1">
 		<extends name="android/graphics/drawable/Drawable" />
 		<method name="&lt;init>(Landroid/graphics/Picture;)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
-		<method name="getOpacity()I" />
 		<method name="getPicture()Landroid/graphics/Picture;" />
-		<method name="setAlpha(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
 		<method name="setPicture(Landroid/graphics/Picture;)V" />
 	</class>
 	<class name="android/graphics/drawable/RotateDrawable" since="1">
 		<extends name="android/graphics/drawable/Drawable" />
 		<implements name="android/graphics/drawable/Drawable$Callback" />
 		<method name="&lt;init>()V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
 		<method name="getDrawable()Landroid/graphics/drawable/Drawable;" since="3" />
-		<method name="getOpacity()I" />
-		<method name="invalidateDrawable(Landroid/graphics/drawable/Drawable;)V" />
-		<method name="scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V" />
-		<method name="setAlpha(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
-		<method name="unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V" />
 	</class>
 	<class name="android/graphics/drawable/ScaleDrawable" since="1">
 		<extends name="android/graphics/drawable/Drawable" />
 		<implements name="android/graphics/drawable/Drawable$Callback" />
 		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;IFF)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
 		<method name="getDrawable()Landroid/graphics/drawable/Drawable;" since="3" />
-		<method name="getOpacity()I" />
-		<method name="invalidateDrawable(Landroid/graphics/drawable/Drawable;)V" />
-		<method name="scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V" />
-		<method name="setAlpha(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
-		<method name="unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V" />
 	</class>
 	<class name="android/graphics/drawable/ShapeDrawable" since="1">
 		<extends name="android/graphics/drawable/Drawable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/graphics/drawable/shapes/Shape;)V" />
-		<method name="draw(Landroid/graphics/Canvas;)V" />
-		<method name="getOpacity()I" />
 		<method name="getPaint()Landroid/graphics/Paint;" />
 		<method name="getShaderFactory()Landroid/graphics/drawable/ShapeDrawable$ShaderFactory;" />
 		<method name="getShape()Landroid/graphics/drawable/shapes/Shape;" />
 		<method name="inflateTag(Ljava/lang/String;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;)Z" />
 		<method name="onDraw(Landroid/graphics/drawable/shapes/Shape;Landroid/graphics/Canvas;Landroid/graphics/Paint;)V" />
-		<method name="setAlpha(I)V" />
-		<method name="setColorFilter(Landroid/graphics/ColorFilter;)V" />
 		<method name="setIntrinsicHeight(I)V" />
 		<method name="setIntrinsicWidth(I)V" />
 		<method name="setPadding(IIII)V" />
@@ -9274,6 +8879,7 @@
 	<class name="android/graphics/drawable/TransitionDrawable" since="1">
 		<extends name="android/graphics/drawable/LayerDrawable" />
 		<implements name="android/graphics/drawable/Drawable$Callback" />
+		<method name="&lt;init>()V" />
 		<method name="&lt;init>([Landroid/graphics/drawable/Drawable;)V" since="3" />
 		<method name="isCrossFadeEnabled()Z" />
 		<method name="resetTransition()V" />
@@ -9292,17 +8898,18 @@
 	<class name="android/graphics/drawable/shapes/PathShape" since="1">
 		<extends name="android/graphics/drawable/shapes/Shape" />
 		<method name="&lt;init>(Landroid/graphics/Path;FF)V" />
-		<method name="draw(Landroid/graphics/Canvas;Landroid/graphics/Paint;)V" />
+		<method name="clone()Landroid/graphics/drawable/shapes/PathShape;" since="3" />
 	</class>
 	<class name="android/graphics/drawable/shapes/RectShape" since="1">
 		<extends name="android/graphics/drawable/shapes/Shape" />
 		<method name="&lt;init>()V" />
-		<method name="draw(Landroid/graphics/Canvas;Landroid/graphics/Paint;)V" />
+		<method name="clone()Landroid/graphics/drawable/shapes/RectShape;" since="3" />
 		<method name="rect()Landroid/graphics/RectF;" />
 	</class>
 	<class name="android/graphics/drawable/shapes/RoundRectShape" since="1">
 		<extends name="android/graphics/drawable/shapes/RectShape" />
 		<method name="&lt;init>([FLandroid/graphics/RectF;[F)V" />
+		<method name="clone()Landroid/graphics/drawable/shapes/RoundRectShape;" since="3" />
 	</class>
 	<class name="android/graphics/drawable/shapes/Shape" since="1">
 		<extends name="java/lang/Object" />
@@ -9318,6 +8925,7 @@
 	</class>
 	<class name="android/hardware/Camera" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="addCallbackBuffer([B)V" since="8" />
 		<method name="autoFocus(Landroid/hardware/Camera$AutoFocusCallback;)V" />
 		<method name="cancelAutoFocus()V" since="5" />
@@ -9354,11 +8962,13 @@
 		<field name="CAMERA_ERROR_UNKNOWN" />
 	</class>
 	<class name="android/hardware/Camera$Area" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Landroid/graphics/Rect;I)V" />
 		<field name="rect" />
 		<field name="weight" />
 	</class>
 	<class name="android/hardware/Camera$AutoFocusCallback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onAutoFocus(ZLandroid/hardware/Camera;)V" />
 	</class>
 	<class name="android/hardware/Camera$CameraInfo" since="9">
@@ -9370,9 +8980,11 @@
 		<field name="orientation" />
 	</class>
 	<class name="android/hardware/Camera$ErrorCallback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onError(ILandroid/hardware/Camera;)V" />
 	</class>
 	<class name="android/hardware/Camera$Face" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<field name="id" />
 		<field name="leftEye" />
@@ -9382,13 +8994,16 @@
 		<field name="score" />
 	</class>
 	<class name="android/hardware/Camera$FaceDetectionListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onFaceDetection([Landroid/hardware/Camera$Face;Landroid/hardware/Camera;)V" />
 	</class>
 	<class name="android/hardware/Camera$OnZoomChangeListener" since="8">
+		<extends name="java/lang/Object" />
 		<method name="onZoomChange(IZLandroid/hardware/Camera;)V" />
 	</class>
 	<class name="android/hardware/Camera$Parameters" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/hardware/Camera;)V" />
 		<method name="flatten()Ljava/lang/String;" />
 		<method name="get(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getAntibanding()Ljava/lang/String;" since="5" />
@@ -9537,17 +9152,20 @@
 		<field name="WHITE_BALANCE_WARM_FLUORESCENT" since="5" />
 	</class>
 	<class name="android/hardware/Camera$PictureCallback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onPictureTaken([BLandroid/hardware/Camera;)V" />
 	</class>
 	<class name="android/hardware/Camera$PreviewCallback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onPreviewFrame([BLandroid/hardware/Camera;)V" />
 	</class>
 	<class name="android/hardware/Camera$ShutterCallback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onShutter()V" />
 	</class>
 	<class name="android/hardware/Camera$Size" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(II)V" />
+		<method name="&lt;init>(Landroid/hardware/Camera;II)V" />
 		<field name="height" />
 		<field name="width" />
 	</class>
@@ -9564,6 +9182,7 @@
 	</class>
 	<class name="android/hardware/Sensor" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getMaximumRange()F" />
 		<method name="getMinDelay()I" since="9" />
 		<method name="getName()Ljava/lang/String;" />
@@ -9589,21 +9208,25 @@
 	</class>
 	<class name="android/hardware/SensorEvent" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="accuracy" />
 		<field name="sensor" />
 		<field name="timestamp" />
 		<field name="values" />
 	</class>
 	<class name="android/hardware/SensorEventListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onAccuracyChanged(Landroid/hardware/Sensor;I)V" />
 		<method name="onSensorChanged(Landroid/hardware/SensorEvent;)V" />
 	</class>
 	<class name="android/hardware/SensorListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onAccuracyChanged(II)V" />
 		<method name="onSensorChanged(I[F)V" />
 	</class>
 	<class name="android/hardware/SensorManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getAltitude(FF)F" since="9" />
 		<method name="getAngleChange([F[F[F)V" since="9" />
 		<method name="getDefaultSensor(I)Landroid/hardware/Sensor;" since="3" />
@@ -9684,14 +9307,13 @@
 	<class name="android/hardware/usb/UsbAccessory" since="12">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getDescription()Ljava/lang/String;" />
 		<method name="getManufacturer()Ljava/lang/String;" />
 		<method name="getModel()Ljava/lang/String;" />
 		<method name="getSerial()Ljava/lang/String;" />
 		<method name="getUri()Ljava/lang/String;" />
 		<method name="getVersion()Ljava/lang/String;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/hardware/usb/UsbConstants" since="12">
@@ -9734,7 +9356,7 @@
 	<class name="android/hardware/usb/UsbDevice" since="12">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getDeviceClass()I" />
 		<method name="getDeviceId()I" />
 		<method name="getDeviceId(Ljava/lang/String;)I" />
@@ -9746,11 +9368,11 @@
 		<method name="getInterfaceCount()I" />
 		<method name="getProductId()I" />
 		<method name="getVendorId()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/hardware/usb/UsbDeviceConnection" since="12">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="bulkTransfer(Landroid/hardware/usb/UsbEndpoint;[BII)I" />
 		<method name="claimInterface(Landroid/hardware/usb/UsbInterface;Z)Z" />
 		<method name="close()V" />
@@ -9764,7 +9386,7 @@
 	<class name="android/hardware/usb/UsbEndpoint" since="12">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getAddress()I" />
 		<method name="getAttributes()I" />
 		<method name="getDirection()I" />
@@ -9772,24 +9394,23 @@
 		<method name="getInterval()I" />
 		<method name="getMaxPacketSize()I" />
 		<method name="getType()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/hardware/usb/UsbInterface" since="12">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getEndpoint(I)Landroid/hardware/usb/UsbEndpoint;" />
 		<method name="getEndpointCount()I" />
 		<method name="getId()I" />
 		<method name="getInterfaceClass()I" />
 		<method name="getInterfaceProtocol()I" />
 		<method name="getInterfaceSubclass()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/hardware/usb/UsbManager" since="12">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getAccessoryList()[Landroid/hardware/usb/UsbAccessory;" />
 		<method name="getDeviceList()Ljava/util/HashMap;" />
 		<method name="hasPermission(Landroid/hardware/usb/UsbAccessory;)Z" />
@@ -9822,7 +9443,6 @@
 		<implements name="android/view/KeyEvent$Callback" />
 		<method name="&lt;init>()V" />
 		<method name="getKeyDispatcherState()Landroid/view/KeyEvent$DispatcherState;" since="5" />
-		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
 		<method name="onCreateInputMethodInterface()Landroid/inputmethodservice/AbstractInputMethodService$AbstractInputMethodImpl;" />
 		<method name="onCreateInputMethodSessionInterface()Landroid/inputmethodservice/AbstractInputMethodService$AbstractInputMethodSessionImpl;" />
 		<method name="onTrackballEvent(Landroid/view/MotionEvent;)Z" />
@@ -9830,17 +9450,12 @@
 	<class name="android/inputmethodservice/AbstractInputMethodService$AbstractInputMethodImpl" since="3">
 		<extends name="java/lang/Object" />
 		<implements name="android/view/inputmethod/InputMethod" />
-		<method name="&lt;init>()V" />
-		<method name="createSession(Landroid/view/inputmethod/InputMethod$SessionCallback;)V" />
-		<method name="revokeSession(Landroid/view/inputmethod/InputMethodSession;)V" />
-		<method name="setSessionEnabled(Landroid/view/inputmethod/InputMethodSession;Z)V" />
+		<method name="&lt;init>(Landroid/inputmethodservice/AbstractInputMethodService;)V" />
 	</class>
 	<class name="android/inputmethodservice/AbstractInputMethodService$AbstractInputMethodSessionImpl" since="3">
 		<extends name="java/lang/Object" />
 		<implements name="android/view/inputmethod/InputMethodSession" />
-		<method name="&lt;init>()V" />
-		<method name="dispatchKeyEvent(ILandroid/view/KeyEvent;Landroid/view/inputmethod/InputMethodSession$EventCallback;)V" />
-		<method name="dispatchTrackballEvent(ILandroid/view/MotionEvent;Landroid/view/inputmethod/InputMethodSession$EventCallback;)V" />
+		<method name="&lt;init>(Landroid/inputmethodservice/AbstractInputMethodService;)V" />
 		<method name="isEnabled()Z" />
 		<method name="isRevoked()Z" />
 		<method name="revokeSelf()V" />
@@ -9880,8 +9495,6 @@
 		<method name="onConfigureWindow(Landroid/view/Window;ZZ)V" />
 		<method name="onCreateCandidatesView()Landroid/view/View;" />
 		<method name="onCreateExtractTextView()Landroid/view/View;" />
-		<method name="onCreateInputMethodInterface()Landroid/inputmethodservice/AbstractInputMethodService$AbstractInputMethodImpl;" />
-		<method name="onCreateInputMethodSessionInterface()Landroid/inputmethodservice/AbstractInputMethodService$AbstractInputMethodSessionImpl;" />
 		<method name="onCreateInputView()Landroid/view/View;" />
 		<method name="onCurrentInputMethodSubtypeChanged(Landroid/view/inputmethod/InputMethodSubtype;)V" since="11" />
 		<method name="onDisplayCompletions([Landroid/view/inputmethod/CompletionInfo;)V" />
@@ -9896,10 +9509,6 @@
 		<method name="onFinishInput()V" />
 		<method name="onFinishInputView(Z)V" />
 		<method name="onInitializeInterface()V" />
-		<method name="onKeyDown(ILandroid/view/KeyEvent;)Z" />
-		<method name="onKeyLongPress(ILandroid/view/KeyEvent;)Z" since="5" />
-		<method name="onKeyMultiple(IILandroid/view/KeyEvent;)Z" />
-		<method name="onKeyUp(ILandroid/view/KeyEvent;)Z" />
 		<method name="onShowInputRequested(IZ)Z" />
 		<method name="onStartCandidatesView(Landroid/view/inputmethod/EditorInfo;Z)V" />
 		<method name="onStartInput(Landroid/view/inputmethod/EditorInfo;Z)V" />
@@ -9934,27 +9543,11 @@
 	</class>
 	<class name="android/inputmethodservice/InputMethodService$InputMethodImpl" since="3">
 		<extends name="android/inputmethodservice/AbstractInputMethodService$AbstractInputMethodImpl" />
-		<method name="&lt;init>()V" />
-		<method name="attachToken(Landroid/os/IBinder;)V" />
-		<method name="bindInput(Landroid/view/inputmethod/InputBinding;)V" />
-		<method name="changeInputMethodSubtype(Landroid/view/inputmethod/InputMethodSubtype;)V" since="11" />
-		<method name="hideSoftInput(ILandroid/os/ResultReceiver;)V" />
-		<method name="restartInput(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)V" />
-		<method name="showSoftInput(ILandroid/os/ResultReceiver;)V" />
-		<method name="startInput(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)V" />
-		<method name="unbindInput()V" />
+		<method name="&lt;init>(Landroid/inputmethodservice/InputMethodService;)V" />
 	</class>
 	<class name="android/inputmethodservice/InputMethodService$InputMethodSessionImpl" since="3">
 		<extends name="android/inputmethodservice/AbstractInputMethodService$AbstractInputMethodSessionImpl" />
-		<method name="&lt;init>()V" />
-		<method name="appPrivateCommand(Ljava/lang/String;Landroid/os/Bundle;)V" />
-		<method name="displayCompletions([Landroid/view/inputmethod/CompletionInfo;)V" />
-		<method name="finishInput()V" />
-		<method name="toggleSoftInput(II)V" />
-		<method name="updateCursor(Landroid/graphics/Rect;)V" />
-		<method name="updateExtractedText(ILandroid/view/inputmethod/ExtractedText;)V" />
-		<method name="updateSelection(IIIIII)V" />
-		<method name="viewClicked(Z)V" since="14" />
+		<method name="&lt;init>(Landroid/inputmethodservice/InputMethodService;)V" />
 	</class>
 	<class name="android/inputmethodservice/InputMethodService$Insets" since="3">
 		<extends name="java/lang/Object" />
@@ -10056,12 +9649,7 @@
 		<method name="isPreviewEnabled()Z" />
 		<method name="isProximityCorrectionEnabled()Z" />
 		<method name="isShifted()Z" />
-		<method name="onClick(Landroid/view/View;)V" />
-		<method name="onDetachedFromWindow()V" />
-		<method name="onDraw(Landroid/graphics/Canvas;)V" />
 		<method name="onLongPress(Landroid/inputmethodservice/Keyboard$Key;)Z" />
-		<method name="onMeasure(II)V" />
-		<method name="onSizeChanged(IIII)V" />
 		<method name="setKeyboard(Landroid/inputmethodservice/Keyboard;)V" />
 		<method name="setOnKeyboardActionListener(Landroid/inputmethodservice/KeyboardView$OnKeyboardActionListener;)V" />
 		<method name="setPopupOffset(II)V" />
@@ -10076,6 +9664,7 @@
 		<method name="swipeUp()V" />
 	</class>
 	<class name="android/inputmethodservice/KeyboardView$OnKeyboardActionListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onKey(I[I)V" />
 		<method name="onPress(I)V" />
 		<method name="onRelease(I)V" />
@@ -10091,7 +9680,6 @@
 		<method name="&lt;init>(Ljava/util/Locale;)V" />
 		<method name="clearLatitude()V" />
 		<method name="clearLongitude()V" />
-		<method name="describeContents()I" />
 		<method name="getAddressLine(I)Ljava/lang/String;" />
 		<method name="getAdminArea()Ljava/lang/String;" />
 		<method name="getCountryCode()Ljava/lang/String;" />
@@ -10130,7 +9718,6 @@
 		<method name="setSubThoroughfare(Ljava/lang/String;)V" since="4" />
 		<method name="setThoroughfare(Ljava/lang/String;)V" />
 		<method name="setUrl(Ljava/lang/String;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/location/Criteria" since="1">
@@ -10138,7 +9725,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/location/Criteria;)V" />
-		<method name="describeContents()I" />
 		<method name="getAccuracy()I" />
 		<method name="getBearingAccuracy()I" since="9" />
 		<method name="getHorizontalAccuracy()I" since="9" />
@@ -10159,7 +9745,6 @@
 		<method name="setSpeedAccuracy(I)V" since="9" />
 		<method name="setSpeedRequired(Z)V" />
 		<method name="setVerticalAccuracy(I)V" since="9" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ACCURACY_COARSE" />
 		<field name="ACCURACY_FINE" />
 		<field name="ACCURACY_HIGH" since="9" />
@@ -10182,6 +9767,7 @@
 	</class>
 	<class name="android/location/GpsSatellite" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getAzimuth()F" />
 		<method name="getElevation()F" />
 		<method name="getPrn()I" />
@@ -10192,6 +9778,7 @@
 	</class>
 	<class name="android/location/GpsStatus" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getMaxSatellites()I" />
 		<method name="getSatellites()Ljava/lang/Iterable;" />
 		<method name="getTimeToFirstFix()I" />
@@ -10201,9 +9788,11 @@
 		<field name="GPS_EVENT_STOPPED" />
 	</class>
 	<class name="android/location/GpsStatus$Listener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onGpsStatusChanged(I)V" />
 	</class>
 	<class name="android/location/GpsStatus$NmeaListener" since="5">
+		<extends name="java/lang/Object" />
 		<method name="onNmeaReceived(JLjava/lang/String;)V" />
 	</class>
 	<class name="android/location/Location" since="1">
@@ -10214,7 +9803,6 @@
 		<method name="bearingTo(Landroid/location/Location;)F" />
 		<method name="convert(DI)Ljava/lang/String;" />
 		<method name="convert(Ljava/lang/String;)D" />
-		<method name="describeContents()I" />
 		<method name="distanceBetween(DDDD[F)V" />
 		<method name="distanceTo(Landroid/location/Location;)F" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" since="3" />
@@ -10246,13 +9834,13 @@
 		<method name="setProvider(Ljava/lang/String;)V" />
 		<method name="setSpeed(F)V" />
 		<method name="setTime(J)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="FORMAT_DEGREES" />
 		<field name="FORMAT_MINUTES" />
 		<field name="FORMAT_SECONDS" />
 	</class>
 	<class name="android/location/LocationListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onLocationChanged(Landroid/location/Location;)V" />
 		<method name="onProviderDisabled(Ljava/lang/String;)V" />
 		<method name="onProviderEnabled(Ljava/lang/String;)V" />
@@ -10260,6 +9848,7 @@
 	</class>
 	<class name="android/location/LocationManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="addGpsStatusListener(Landroid/location/GpsStatus$Listener;)Z" since="3" />
 		<method name="addNmeaListener(Landroid/location/GpsStatus$NmeaListener;)Z" since="5" />
 		<method name="addProximityAlert(DDFJLandroid/app/PendingIntent;)V" />
@@ -10305,6 +9894,7 @@
 	</class>
 	<class name="android/location/LocationProvider" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getAccuracy()I" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getPowerRequirement()I" />
@@ -10374,6 +9964,7 @@
 	</class>
 	<class name="android/media/AudioManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="abandonAudioFocus(Landroid/media/AudioManager$OnAudioFocusChangeListener;)I" since="8" />
 		<method name="adjustStreamVolume(III)V" />
 		<method name="adjustSuggestedStreamVolume(III)V" />
@@ -10488,6 +10079,7 @@
 		<field name="VIBRATE_TYPE_RINGER" />
 	</class>
 	<class name="android/media/AudioManager$OnAudioFocusChangeListener" since="8">
+		<extends name="java/lang/Object" />
 		<method name="onAudioFocusChange(I)V" />
 	</class>
 	<class name="android/media/AudioRecord" since="3">
@@ -10523,6 +10115,7 @@
 		<field name="SUCCESS" />
 	</class>
 	<class name="android/media/AudioRecord$OnRecordPositionUpdateListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onMarkerReached(Landroid/media/AudioRecord;)V" />
 		<method name="onPeriodicNotification(Landroid/media/AudioRecord;)V" />
 	</class>
@@ -10580,11 +10173,13 @@
 		<field name="SUCCESS" />
 	</class>
 	<class name="android/media/AudioTrack$OnPlaybackPositionUpdateListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onMarkerReached(Landroid/media/AudioTrack;)V" />
 		<method name="onPeriodicNotification(Landroid/media/AudioTrack;)V" />
 	</class>
 	<class name="android/media/CamcorderProfile" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="get(I)Landroid/media/CamcorderProfile;" />
 		<method name="get(II)Landroid/media/CamcorderProfile;" since="9" />
 		<method name="hasProfile(I)Z" since="11" />
@@ -10679,6 +10274,7 @@
 	</class>
 	<class name="android/media/FaceDetector$Face" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/media/FaceDetector;)V" />
 		<method name="confidence()F" />
 		<method name="eyesDistance()F" />
 		<method name="getMidPoint(Landroid/graphics/PointF;)V" />
@@ -10690,8 +10286,8 @@
 	</class>
 	<class name="android/media/JetPlayer" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="clearQueue()Z" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="closeJetFile()Z" />
 		<method name="getJetPlayer()Landroid/media/JetPlayer;" />
 		<method name="getMaxTracks()I" />
@@ -10710,6 +10306,7 @@
 		<method name="triggerClip(I)Z" />
 	</class>
 	<class name="android/media/JetPlayer$OnJetEventListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onJetEvent(Landroid/media/JetPlayer;SBBBB)V" />
 		<method name="onJetNumQueuedSegmentUpdate(Landroid/media/JetPlayer;I)V" />
 		<method name="onJetPauseUpdate(Landroid/media/JetPlayer;I)V" />
@@ -10811,24 +10408,31 @@
 		<field name="MEDIA_INFO_VIDEO_TRACK_LAGGING" since="3" />
 	</class>
 	<class name="android/media/MediaPlayer$OnBufferingUpdateListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onBufferingUpdate(Landroid/media/MediaPlayer;I)V" />
 	</class>
 	<class name="android/media/MediaPlayer$OnCompletionListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onCompletion(Landroid/media/MediaPlayer;)V" />
 	</class>
 	<class name="android/media/MediaPlayer$OnErrorListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onError(Landroid/media/MediaPlayer;II)Z" />
 	</class>
 	<class name="android/media/MediaPlayer$OnInfoListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onInfo(Landroid/media/MediaPlayer;II)Z" />
 	</class>
 	<class name="android/media/MediaPlayer$OnPreparedListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onPrepared(Landroid/media/MediaPlayer;)V" />
 	</class>
 	<class name="android/media/MediaPlayer$OnSeekCompleteListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onSeekComplete(Landroid/media/MediaPlayer;)V" />
 	</class>
 	<class name="android/media/MediaPlayer$OnVideoSizeChangedListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onVideoSizeChanged(Landroid/media/MediaPlayer;II)V" />
 	</class>
 	<class name="android/media/MediaRecorder" since="1">
@@ -10873,6 +10477,7 @@
 	</class>
 	<class name="android/media/MediaRecorder$AudioEncoder" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/media/MediaRecorder;)V" />
 		<field name="AAC" since="10" />
 		<field name="AMR_NB" />
 		<field name="AMR_WB" since="10" />
@@ -10880,6 +10485,7 @@
 	</class>
 	<class name="android/media/MediaRecorder$AudioSource" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/media/MediaRecorder;)V" />
 		<field name="CAMCORDER" since="7" />
 		<field name="DEFAULT" />
 		<field name="MIC" />
@@ -10890,13 +10496,16 @@
 		<field name="VOICE_UPLINK" since="4" />
 	</class>
 	<class name="android/media/MediaRecorder$OnErrorListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onError(Landroid/media/MediaRecorder;II)V" />
 	</class>
 	<class name="android/media/MediaRecorder$OnInfoListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onInfo(Landroid/media/MediaRecorder;II)V" />
 	</class>
 	<class name="android/media/MediaRecorder$OutputFormat" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/media/MediaRecorder;)V" />
 		<field name="AMR_NB" since="10" />
 		<field name="AMR_WB" since="10" />
 		<field name="DEFAULT" />
@@ -10906,6 +10515,7 @@
 	</class>
 	<class name="android/media/MediaRecorder$VideoEncoder" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/media/MediaRecorder;)V" />
 		<field name="DEFAULT" />
 		<field name="H263" />
 		<field name="H264" />
@@ -10913,6 +10523,7 @@
 	</class>
 	<class name="android/media/MediaRecorder$VideoSource" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/media/MediaRecorder;)V" />
 		<field name="CAMERA" />
 		<field name="DEFAULT" />
 	</class>
@@ -10923,20 +10534,21 @@
 		<method name="connect()V" />
 		<method name="disconnect()V" />
 		<method name="isConnected()Z" />
-		<method name="onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V" />
-		<method name="onServiceDisconnected(Landroid/content/ComponentName;)V" />
 		<method name="scanFile(Landroid/content/Context;[Ljava/lang/String;[Ljava/lang/String;Landroid/media/MediaScannerConnection$OnScanCompletedListener;)V" since="8" />
 		<method name="scanFile(Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
 	<class name="android/media/MediaScannerConnection$MediaScannerConnectionClient" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/media/MediaScannerConnection$OnScanCompletedListener" since="8" />
 		<method name="onMediaScannerConnected()V" />
 		<method name="onScanCompleted(Ljava/lang/String;Landroid/net/Uri;)V" />
 	</class>
 	<class name="android/media/MediaScannerConnection$OnScanCompletedListener" since="8">
+		<extends name="java/lang/Object" />
 		<method name="onScanCompleted(Ljava/lang/String;Landroid/net/Uri;)V" />
 	</class>
 	<class name="android/media/RemoteControlClient" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Landroid/app/PendingIntent;)V" />
 		<method name="&lt;init>(Landroid/app/PendingIntent;Landroid/os/Looper;)V" />
 		<method name="editMetadata(Z)Landroid/media/RemoteControlClient$MetadataEditor;" />
@@ -10961,6 +10573,8 @@
 		<field name="PLAYSTATE_STOPPED" />
 	</class>
 	<class name="android/media/RemoteControlClient$MetadataEditor" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/media/RemoteControlClient;)V" />
 		<method name="apply()V" />
 		<method name="clear()V" />
 		<method name="putBitmap(ILandroid/graphics/Bitmap;)Landroid/media/RemoteControlClient$MetadataEditor;" />
@@ -10970,6 +10584,7 @@
 	</class>
 	<class name="android/media/Ringtone" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getStreamType()I" />
 		<method name="getTitle(Landroid/content/Context;)Ljava/lang/String;" />
 		<method name="isPlaying()Z" />
@@ -11038,6 +10653,7 @@
 		<method name="unload(I)Z" />
 	</class>
 	<class name="android/media/SoundPool$OnLoadCompleteListener" since="8">
+		<extends name="java/lang/Object" />
 		<method name="onLoadComplete(Landroid/media/SoundPool;II)V" />
 	</class>
 	<class name="android/media/ThumbnailUtils" since="8">
@@ -11159,6 +10775,7 @@
 	</class>
 	<class name="android/media/audiofx/AudioEffect" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getDescriptor()Landroid/media/audiofx/AudioEffect$Descriptor;" />
 		<method name="getEnabled()Z" />
 		<method name="getId()I" />
@@ -11200,9 +10817,11 @@
 		<field name="uuid" />
 	</class>
 	<class name="android/media/audiofx/AudioEffect$OnControlStatusChangeListener" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onControlStatusChange(Landroid/media/audiofx/AudioEffect;Z)V" />
 	</class>
 	<class name="android/media/audiofx/AudioEffect$OnEnableStatusChangeListener" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onEnableStatusChange(Landroid/media/audiofx/AudioEffect;Z)V" />
 	</class>
 	<class name="android/media/audiofx/BassBoost" since="9">
@@ -11218,6 +10837,7 @@
 		<field name="PARAM_STRENGTH_SUPPORTED" />
 	</class>
 	<class name="android/media/audiofx/BassBoost$OnParameterChangeListener" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onParameterChange(Landroid/media/audiofx/BassBoost;IIS)V" />
 	</class>
 	<class name="android/media/audiofx/BassBoost$Settings" since="9">
@@ -11264,6 +10884,7 @@
 		<field name="PARAM_ROOM_LEVEL" />
 	</class>
 	<class name="android/media/audiofx/EnvironmentalReverb$OnParameterChangeListener" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onParameterChange(Landroid/media/audiofx/EnvironmentalReverb;III)V" />
 	</class>
 	<class name="android/media/audiofx/EnvironmentalReverb$Settings" since="9">
@@ -11310,6 +10931,7 @@
 		<field name="PARAM_STRING_SIZE_MAX" />
 	</class>
 	<class name="android/media/audiofx/Equalizer$OnParameterChangeListener" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onParameterChange(Landroid/media/audiofx/Equalizer;IIII)V" />
 	</class>
 	<class name="android/media/audiofx/Equalizer$Settings" since="9">
@@ -11338,6 +10960,7 @@
 		<field name="PRESET_SMALLROOM" />
 	</class>
 	<class name="android/media/audiofx/PresetReverb$OnParameterChangeListener" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onParameterChange(Landroid/media/audiofx/PresetReverb;IIS)V" />
 	</class>
 	<class name="android/media/audiofx/PresetReverb$Settings" since="9">
@@ -11359,6 +10982,7 @@
 		<field name="PARAM_STRENGTH_SUPPORTED" />
 	</class>
 	<class name="android/media/audiofx/Virtualizer$OnParameterChangeListener" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onParameterChange(Landroid/media/audiofx/Virtualizer;IIS)V" />
 	</class>
 	<class name="android/media/audiofx/Virtualizer$Settings" since="9">
@@ -11394,10 +11018,12 @@
 		<field name="SUCCESS" />
 	</class>
 	<class name="android/media/audiofx/Visualizer$OnDataCaptureListener" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onFftDataCapture(Landroid/media/audiofx/Visualizer;[BI)V" />
 		<method name="onWaveFormDataCapture(Landroid/media/audiofx/Visualizer;[BI)V" />
 	</class>
 	<class name="android/media/effect/Effect" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="apply(IIII)V" />
 		<method name="getName()Ljava/lang/String;" />
@@ -11406,11 +11032,15 @@
 		<method name="setUpdateListener(Landroid/media/effect/EffectUpdateListener;)V" />
 	</class>
 	<class name="android/media/effect/EffectContext" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="createWithCurrentGlContext()Landroid/media/effect/EffectContext;" />
 		<method name="getFactory()Landroid/media/effect/EffectFactory;" />
 		<method name="release()V" />
 	</class>
 	<class name="android/media/effect/EffectFactory" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="createEffect(Ljava/lang/String;)Landroid/media/effect/Effect;" />
 		<method name="isEffectSupported(Ljava/lang/String;)Z" />
 		<field name="EFFECT_AUTOFIX" />
@@ -11442,6 +11072,7 @@
 		<field name="EFFECT_VIGNETTE" />
 	</class>
 	<class name="android/media/effect/EffectUpdateListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onEffectUpdated(Landroid/media/effect/Effect;Ljava/lang/Object;)V" />
 	</class>
 	<class name="android/mtp/MtpConstants" since="12">
@@ -11531,6 +11162,7 @@
 	</class>
 	<class name="android/mtp/MtpDeviceInfo" since="12">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getManufacturer()Ljava/lang/String;" />
 		<method name="getModel()Ljava/lang/String;" />
 		<method name="getSerialNumber()Ljava/lang/String;" />
@@ -11538,6 +11170,7 @@
 	</class>
 	<class name="android/mtp/MtpObjectInfo" since="12">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getAssociationDesc()I" />
 		<method name="getAssociationType()I" />
 		<method name="getCompressedSize()I" />
@@ -11561,6 +11194,7 @@
 	</class>
 	<class name="android/mtp/MtpStorageInfo" since="12">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getDescription()Ljava/lang/String;" />
 		<method name="getFreeSpace()J" />
 		<method name="getMaxCapacity()J" />
@@ -11569,6 +11203,7 @@
 	</class>
 	<class name="android/net/ConnectivityManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getActiveNetworkInfo()Landroid/net/NetworkInfo;" />
 		<method name="getAllNetworkInfo()[Landroid/net/NetworkInfo;" />
 		<method name="getBackgroundDataSetting()Z" since="3" />
@@ -11610,8 +11245,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="dns1" />
 		<field name="dns2" />
 		<field name="gateway" />
@@ -11675,6 +11308,7 @@
 	</class>
 	<class name="android/net/MailTo" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getBody()Ljava/lang/String;" />
 		<method name="getCc()Ljava/lang/String;" />
 		<method name="getHeaders()Ljava/util/Map;" />
@@ -11687,8 +11321,8 @@
 	<class name="android/net/NetworkInfo" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" since="3" />
 		<method name="&lt;init>(I)V" />
-		<method name="describeContents()I" />
 		<method name="getDetailedState()Landroid/net/NetworkInfo$DetailedState;" />
 		<method name="getExtraInfo()Ljava/lang/String;" />
 		<method name="getReason()Ljava/lang/String;" />
@@ -11702,7 +11336,6 @@
 		<method name="isConnectedOrConnecting()Z" />
 		<method name="isFailover()Z" />
 		<method name="isRoaming()Z" since="3" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 	</class>
 	<class name="android/net/NetworkInfo$DetailedState" since="1">
 		<extends name="java/lang/Enum" />
@@ -11733,6 +11366,7 @@
 	</class>
 	<class name="android/net/ParseException" since="1">
 		<extends name="java/lang/RuntimeException" />
+		<method name="&lt;init>()V" />
 		<field name="response" />
 	</class>
 	<class name="android/net/Proxy" since="1">
@@ -11747,17 +11381,10 @@
 	<class name="android/net/SSLCertificateSocketFactory" since="1">
 		<extends name="javax/net/ssl/SSLSocketFactory" />
 		<method name="&lt;init>(I)V" />
-		<method name="createSocket(Ljava/lang/String;I)Ljava/net/Socket;" />
-		<method name="createSocket(Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket;" />
-		<method name="createSocket(Ljava/net/InetAddress;I)Ljava/net/Socket;" />
-		<method name="createSocket(Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket;" />
-		<method name="createSocket(Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;" />
 		<method name="getDefault(I)Ljavax/net/SocketFactory;" />
 		<method name="getDefault(ILandroid/net/SSLSessionCache;)Ljavax/net/ssl/SSLSocketFactory;" since="8" />
-		<method name="getDefaultCipherSuites()[Ljava/lang/String;" />
 		<method name="getHttpSocketFactory(ILandroid/net/SSLSessionCache;)Lorg/apache/http/conn/ssl/SSLSocketFactory;" since="8" />
 		<method name="getInsecure(ILandroid/net/SSLSessionCache;)Ljavax/net/ssl/SSLSocketFactory;" since="8" />
-		<method name="getSupportedCipherSuites()[Ljava/lang/String;" />
 		<method name="setKeyManagers([Ljavax/net/ssl/KeyManager;)V" since="14" />
 		<method name="setTrustManagers([Ljavax/net/ssl/TrustManager;)V" since="14" />
 	</class>
@@ -11800,8 +11427,9 @@
 	</class>
 	<class name="android/net/Uri" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Comparable" />
 		<implements name="android/os/Parcelable" />
+		<implements name="java/lang/Comparable" />
+		<method name="&lt;init>()V" />
 		<method name="buildUpon()Landroid/net/Uri$Builder;" />
 		<method name="compareTo(Landroid/net/Uri;)I" />
 		<method name="decode(Ljava/lang/String;)Ljava/lang/String;" />
@@ -11835,7 +11463,6 @@
 		<method name="isOpaque()Z" />
 		<method name="isRelative()Z" />
 		<method name="parse(Ljava/lang/String;)Landroid/net/Uri;" />
-		<method name="toString()Ljava/lang/String;" />
 		<method name="withAppendedPath(Landroid/net/Uri;Ljava/lang/String;)Landroid/net/Uri;" />
 		<method name="writeToParcel(Landroid/os/Parcel;Landroid/net/Uri;)V" />
 		<field name="CREATOR" />
@@ -11901,7 +11528,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/net/UrlQuerySanitizer$ValueSanitizer" />
 		<method name="&lt;init>(I)V" />
-		<method name="sanitize(Ljava/lang/String;)Ljava/lang/String;" />
 		<field name="ALL_BUT_NUL_AND_ANGLE_BRACKETS_LEGAL" />
 		<field name="ALL_BUT_NUL_LEGAL" />
 		<field name="ALL_BUT_WHITESPACE_LEGAL" />
@@ -11927,17 +11553,17 @@
 	</class>
 	<class name="android/net/UrlQuerySanitizer$ParameterValuePair" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
+		<method name="&lt;init>(Landroid/net/UrlQuerySanitizer;Ljava/lang/String;Ljava/lang/String;)V" />
 		<field name="mParameter" />
 		<field name="mValue" />
 	</class>
 	<class name="android/net/UrlQuerySanitizer$ValueSanitizer" since="1">
+		<extends name="java/lang/Object" />
 		<method name="sanitize(Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="android/net/VpnService" since="14">
 		<extends name="android/app/Service" />
 		<method name="&lt;init>()V" />
-		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
 		<method name="onRevoke()V" />
 		<method name="prepare(Landroid/content/Context;)Landroid/content/Intent;" />
 		<method name="protect(I)Z" />
@@ -11946,7 +11572,8 @@
 		<field name="SERVICE_INTERFACE" />
 	</class>
 	<class name="android/net/VpnService$Builder" since="14">
-		<method name="&lt;init>()V" />
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/net/VpnService;)V" />
 		<method name="addAddress(Ljava/lang/String;I)Landroid/net/VpnService$Builder;" />
 		<method name="addAddress(Ljava/net/InetAddress;I)Landroid/net/VpnService$Builder;" />
 		<method name="addDnsServer(Ljava/lang/String;)Landroid/net/VpnService$Builder;" />
@@ -11962,21 +11589,12 @@
 	<class name="android/net/http/AndroidHttpClient" since="8">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/client/HttpClient" />
+		<method name="&lt;init>()V" />
 		<method name="close()V" />
 		<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;" />
-		<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;" />
-		<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;" />
 		<method name="getMinGzipSize(Landroid/content/ContentResolver;)J" />
-		<method name="getParams()Lorg/apache/http/params/HttpParams;" />
 		<method name="getUngzippedContent(Lorg/apache/http/HttpEntity;)Ljava/io/InputStream;" />
 		<method name="modifyRequestToAcceptGzipResponse(Lorg/apache/http/HttpRequest;)V" />
 		<method name="newInstance(Ljava/lang/String;)Landroid/net/http/AndroidHttpClient;" />
@@ -11984,20 +11602,18 @@
 		<method name="parseDate(Ljava/lang/String;)J" />
 		<field name="DEFAULT_SYNC_MIN_GZIP_BYTES" />
 	</class>
-	<class name="android/net/http/HttpResponseCache" since="13">
+	<class name="android/net/http/HttpResponseCache" since="14">
 		<extends name="java/net/ResponseCache" />
 		<implements name="java/io/Closeable" />
-		<method name="close()V" />
+		<method name="&lt;init>()V" />
 		<method name="delete()V" />
 		<method name="flush()V" />
-		<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" />
 		<method name="getRequestCount()I" />
 		<method name="install(Ljava/io/File;J)Landroid/net/http/HttpResponseCache;" />
 		<method name="maxSize()J" />
-		<method name="put(Ljava/net/URI;Ljava/net/URLConnection;)Ljava/net/CacheRequest;" />
 		<method name="size()J" />
 	</class>
 	<class name="android/net/http/SslCertificate" since="1">
@@ -12016,7 +11632,7 @@
 	</class>
 	<class name="android/net/http/SslCertificate$DName" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(Ljava/lang/String;)V" />
+		<method name="&lt;init>(Landroid/net/http/SslCertificate;Ljava/lang/String;)V" />
 		<method name="getCName()Ljava/lang/String;" />
 		<method name="getDName()Ljava/lang/String;" />
 		<method name="getOName()Ljava/lang/String;" />
@@ -12043,6 +11659,7 @@
 	</class>
 	<class name="android/net/rtp/AudioCodec" since="12">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getCodec(ILjava/lang/String;Ljava/lang/String;)Landroid/net/rtp/AudioCodec;" />
 		<method name="getCodecs()[Landroid/net/rtp/AudioCodec;" />
 		<field name="AMR" />
@@ -12073,13 +11690,13 @@
 		<method name="getCodec()Landroid/net/rtp/AudioCodec;" />
 		<method name="getDtmfType()I" />
 		<method name="getGroup()Landroid/net/rtp/AudioGroup;" />
-		<method name="isBusy()Z" />
 		<method name="join(Landroid/net/rtp/AudioGroup;)V" />
 		<method name="setCodec(Landroid/net/rtp/AudioCodec;)V" />
 		<method name="setDtmfType(I)V" />
 	</class>
 	<class name="android/net/rtp/RtpStream" since="12">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="associate(Ljava/net/InetAddress;I)V" />
 		<method name="getLocalAddress()Ljava/net/InetAddress;" />
 		<method name="getLocalPort()I" />
@@ -12133,6 +11750,7 @@
 	</class>
 	<class name="android/net/sip/SipErrorCode" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="toString(I)Ljava/lang/String;" />
 		<field name="CLIENT_ERROR" />
 		<field name="CROSS_DOMAIN_AUTHENTICATION" />
@@ -12156,6 +11774,7 @@
 	</class>
 	<class name="android/net/sip/SipManager" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="close(Ljava/lang/String;)V" />
 		<method name="createSipSession(Landroid/net/sip/SipProfile;Landroid/net/sip/SipSession$Listener;)Landroid/net/sip/SipSession;" />
 		<method name="getCallId(Landroid/content/Intent;)Ljava/lang/String;" />
@@ -12182,10 +11801,10 @@
 	</class>
 	<class name="android/net/sip/SipProfile" since="9">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="android/os/Parcelable" />
 		<implements name="java/io/Serializable" />
-		<method name="describeContents()I" />
+		<implements name="java/lang/Cloneable" />
+		<method name="&lt;init>()V" />
 		<method name="getAuthUserName()Ljava/lang/String;" since="12" />
 		<method name="getAutoRegistration()Z" />
 		<method name="getDisplayName()Ljava/lang/String;" />
@@ -12198,7 +11817,6 @@
 		<method name="getSipDomain()Ljava/lang/String;" />
 		<method name="getUriString()Ljava/lang/String;" />
 		<method name="getUserName()Ljava/lang/String;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/net/sip/SipProfile$Builder" since="9">
@@ -12218,12 +11836,14 @@
 		<method name="setSendKeepAlive(Z)Landroid/net/sip/SipProfile$Builder;" />
 	</class>
 	<class name="android/net/sip/SipRegistrationListener" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onRegistering(Ljava/lang/String;)V" />
 		<method name="onRegistrationDone(Ljava/lang/String;J)V" />
 		<method name="onRegistrationFailed(Ljava/lang/String;ILjava/lang/String;)V" />
 	</class>
 	<class name="android/net/sip/SipSession" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="answerCall(Ljava/lang/String;I)V" />
 		<method name="changeCall(Ljava/lang/String;I)V" />
 		<method name="endCall()V" />
@@ -12256,6 +11876,7 @@
 	</class>
 	<class name="android/net/sip/SipSession$State" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="toString(I)Ljava/lang/String;" />
 		<field name="DEREGISTERING" />
 		<field name="INCOMING_CALL" />
@@ -12272,8 +11893,7 @@
 	<class name="android/net/wifi/ScanResult" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
+		<method name="&lt;init>()V" />
 		<field name="BSSID" />
 		<field name="SSID" />
 		<field name="capabilities" />
@@ -12283,11 +11903,9 @@
 	<class name="android/net/wifi/SupplicantState" since="1">
 		<extends name="java/lang/Enum" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
 		<method name="isValidState(Landroid/net/wifi/SupplicantState;)Z" />
 		<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="AUTHENTICATING" since="14" />
@@ -12306,8 +11924,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="BSSID" />
 		<field name="SSID" />
 		<field name="allowedAuthAlgorithms" />
@@ -12325,6 +11941,7 @@
 	</class>
 	<class name="android/net/wifi/WifiConfiguration$AuthAlgorithm" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="LEAP" />
 		<field name="OPEN" />
 		<field name="SHARED" />
@@ -12333,6 +11950,7 @@
 	</class>
 	<class name="android/net/wifi/WifiConfiguration$GroupCipher" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="CCMP" />
 		<field name="TKIP" />
 		<field name="WEP104" />
@@ -12342,6 +11960,7 @@
 	</class>
 	<class name="android/net/wifi/WifiConfiguration$KeyMgmt" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="IEEE8021X" />
 		<field name="NONE" />
 		<field name="WPA_EAP" />
@@ -12351,6 +11970,7 @@
 	</class>
 	<class name="android/net/wifi/WifiConfiguration$PairwiseCipher" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="CCMP" />
 		<field name="NONE" />
 		<field name="TKIP" />
@@ -12359,6 +11979,7 @@
 	</class>
 	<class name="android/net/wifi/WifiConfiguration$Protocol" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="RSN" />
 		<field name="WPA" />
 		<field name="strings" />
@@ -12366,6 +11987,7 @@
 	</class>
 	<class name="android/net/wifi/WifiConfiguration$Status" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="CURRENT" />
 		<field name="DISABLED" />
 		<field name="ENABLED" />
@@ -12374,7 +11996,7 @@
 	<class name="android/net/wifi/WifiInfo" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getBSSID()Ljava/lang/String;" />
 		<method name="getDetailedStateOf(Landroid/net/wifi/SupplicantState;)Landroid/net/NetworkInfo$DetailedState;" />
 		<method name="getHiddenSSID()Z" />
@@ -12385,11 +12007,11 @@
 		<method name="getRssi()I" />
 		<method name="getSSID()Ljava/lang/String;" />
 		<method name="getSupplicantState()Landroid/net/wifi/SupplicantState;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="LINK_SPEED_UNITS" />
 	</class>
 	<class name="android/net/wifi/WifiManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="addNetwork(Landroid/net/wifi/WifiConfiguration;)I" />
 		<method name="calculateSignalLevel(II)I" />
 		<method name="compareSignalLevel(II)I" />
@@ -12442,6 +12064,7 @@
 	</class>
 	<class name="android/net/wifi/WifiManager$MulticastLock" since="4">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/net/wifi/WifiManager;)V" />
 		<method name="acquire()V" />
 		<method name="isHeld()Z" />
 		<method name="release()V" />
@@ -12449,6 +12072,7 @@
 	</class>
 	<class name="android/net/wifi/WifiManager$WifiLock" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/net/wifi/WifiManager;)V" />
 		<method name="acquire()V" />
 		<method name="isHeld()Z" />
 		<method name="release()V" />
@@ -12456,11 +12080,10 @@
 		<method name="setWorkSource(Landroid/os/WorkSource;)V" since="9" />
 	</class>
 	<class name="android/net/wifi/WpsInfo" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/net/wifi/WpsInfo;)V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="DISPLAY" />
 		<field name="INVALID" />
@@ -12471,27 +12094,25 @@
 		<field name="setup" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pConfig" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/net/wifi/p2p/WifiP2pConfig;)V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="deviceAddress" />
 		<field name="groupOwnerIntent" />
 		<field name="wps" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pDevice" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/net/wifi/p2p/WifiP2pDevice;)V" />
-		<method name="describeContents()I" />
 		<method name="isGroupOwner()Z" />
 		<method name="isServiceDiscoveryCapable()Z" />
 		<method name="wpsDisplaySupported()Z" />
 		<method name="wpsKeypadSupported()Z" />
 		<method name="wpsPbcSupported()Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="AVAILABLE" />
 		<field name="CONNECTED" />
 		<field name="CREATOR" />
@@ -12505,40 +12126,39 @@
 		<field name="status" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pDeviceList" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<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;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pGroup" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<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;" />
 		<method name="getInterface()Ljava/lang/String;" />
 		<method name="getNetworkName()Ljava/lang/String;" />
 		<method name="getOwner()Landroid/net/wifi/p2p/WifiP2pDevice;" />
 		<method name="getPassphrase()Ljava/lang/String;" />
 		<method name="isGroupOwner()Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pInfo" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/net/wifi/p2p/WifiP2pInfo;)V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="groupFormed" />
 		<field name="groupOwnerAddress" />
 		<field name="isGroupOwner" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pManager" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="cancelConnect(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V" />
 		<method name="connect(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pConfig;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V" />
 		<method name="createGroup(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V" />
@@ -12563,21 +12183,28 @@
 		<field name="WIFI_P2P_THIS_DEVICE_CHANGED_ACTION" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pManager$ActionListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onFailure(I)V" />
 		<method name="onSuccess()V" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pManager$Channel" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pManager$ChannelListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onChannelDisconnected()V" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pManager$ConnectionInfoListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onConnectionInfoAvailable(Landroid/net/wifi/p2p/WifiP2pInfo;)V" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pManager$GroupInfoListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onGroupInfoAvailable(Landroid/net/wifi/p2p/WifiP2pGroup;)V" />
 	</class>
 	<class name="android/net/wifi/p2p/WifiP2pManager$PeerListListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onPeersAvailable(Landroid/net/wifi/p2p/WifiP2pDeviceList;)V" />
 	</class>
 	<class name="android/nfc/FormatException" since="9">
@@ -12590,10 +12217,8 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>([B)V" />
 		<method name="&lt;init>([Landroid/nfc/NdefRecord;)V" />
-		<method name="describeContents()I" />
 		<method name="getRecords()[Landroid/nfc/NdefRecord;" />
 		<method name="toByteArray()[B" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/nfc/NdefRecord" since="9">
@@ -12604,13 +12229,11 @@
 		<method name="createApplicationRecord(Ljava/lang/String;)Landroid/nfc/NdefRecord;" since="14" />
 		<method name="createUri(Landroid/net/Uri;)Landroid/nfc/NdefRecord;" since="14" />
 		<method name="createUri(Ljava/lang/String;)Landroid/nfc/NdefRecord;" since="14" />
-		<method name="describeContents()I" />
 		<method name="getId()[B" />
 		<method name="getPayload()[B" />
 		<method name="getTnf()S" />
 		<method name="getType()[B" />
 		<method name="toByteArray()[B" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="RTD_ALTERNATIVE_CARRIER" />
 		<field name="RTD_HANDOVER_CARRIER" />
@@ -12629,6 +12252,7 @@
 	</class>
 	<class name="android/nfc/NfcAdapter" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="disableForegroundDispatch(Landroid/app/Activity;)V" since="10" />
 		<method name="disableForegroundNdefPush(Landroid/app/Activity;)V" since="10" />
 		<method name="enableForegroundDispatch(Landroid/app/Activity;Landroid/app/PendingIntent;[Landroid/content/IntentFilter;[[Ljava/lang/String;)V" since="10" />
@@ -12647,25 +12271,29 @@
 		<field name="EXTRA_TAG" since="10" />
 	</class>
 	<class name="android/nfc/NfcAdapter$CreateNdefMessageCallback" since="14">
+		<extends name="java/lang/Object" />
 		<method name="createNdefMessage(Landroid/nfc/NfcEvent;)Landroid/nfc/NdefMessage;" />
 	</class>
 	<class name="android/nfc/NfcAdapter$OnNdefPushCompleteCallback" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onNdefPushComplete(Landroid/nfc/NfcEvent;)V" />
 	</class>
 	<class name="android/nfc/NfcEvent" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="nfcAdapter" />
 	</class>
 	<class name="android/nfc/NfcManager" since="10">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getDefaultAdapter()Landroid/nfc/NfcAdapter;" />
 	</class>
 	<class name="android/nfc/Tag" since="10">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getId()[B" />
 		<method name="getTechList()[Ljava/lang/String;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/nfc/TagLostException" since="10">
@@ -12676,13 +12304,11 @@
 	<class name="android/nfc/tech/BasicTagTechnology" since="10">
 		<extends name="java/lang/Object" />
 		<implements name="android/nfc/tech/TagTechnology" />
-		<method name="close()V" />
-		<method name="connect()V" />
-		<method name="getTag()Landroid/nfc/Tag;" />
-		<method name="isConnected()Z" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/nfc/tech/IsoDep" since="10">
 		<extends name="android/nfc/tech/BasicTagTechnology" />
+		<method name="&lt;init>()V" />
 		<method name="get(Landroid/nfc/Tag;)Landroid/nfc/tech/IsoDep;" />
 		<method name="getHiLayerResponse()[B" />
 		<method name="getHistoricalBytes()[B" />
@@ -12693,6 +12319,7 @@
 	</class>
 	<class name="android/nfc/tech/MifareClassic" since="10">
 		<extends name="android/nfc/tech/BasicTagTechnology" />
+		<method name="&lt;init>()V" />
 		<method name="authenticateSectorWithKeyA(I[B)Z" />
 		<method name="authenticateSectorWithKeyB(I[B)Z" />
 		<method name="blockToSector(I)I" />
@@ -12728,6 +12355,7 @@
 	</class>
 	<class name="android/nfc/tech/MifareUltralight" since="10">
 		<extends name="android/nfc/tech/BasicTagTechnology" />
+		<method name="&lt;init>()V" />
 		<method name="get(Landroid/nfc/Tag;)Landroid/nfc/tech/MifareUltralight;" />
 		<method name="getMaxTransceiveLength()I" since="14" />
 		<method name="getTimeout()I" since="14" />
@@ -12743,6 +12371,7 @@
 	</class>
 	<class name="android/nfc/tech/Ndef" since="10">
 		<extends name="android/nfc/tech/BasicTagTechnology" />
+		<method name="&lt;init>()V" />
 		<method name="canMakeReadOnly()Z" />
 		<method name="get(Landroid/nfc/Tag;)Landroid/nfc/tech/Ndef;" />
 		<method name="getCachedNdefMessage()Landroid/nfc/NdefMessage;" />
@@ -12760,12 +12389,14 @@
 	</class>
 	<class name="android/nfc/tech/NdefFormatable" since="10">
 		<extends name="android/nfc/tech/BasicTagTechnology" />
+		<method name="&lt;init>()V" />
 		<method name="format(Landroid/nfc/NdefMessage;)V" />
 		<method name="formatReadOnly(Landroid/nfc/NdefMessage;)V" />
 		<method name="get(Landroid/nfc/Tag;)Landroid/nfc/tech/NdefFormatable;" />
 	</class>
 	<class name="android/nfc/tech/NfcA" since="10">
 		<extends name="android/nfc/tech/BasicTagTechnology" />
+		<method name="&lt;init>()V" />
 		<method name="get(Landroid/nfc/Tag;)Landroid/nfc/tech/NfcA;" />
 		<method name="getAtqa()[B" />
 		<method name="getMaxTransceiveLength()I" since="14" />
@@ -12776,6 +12407,7 @@
 	</class>
 	<class name="android/nfc/tech/NfcB" since="10">
 		<extends name="android/nfc/tech/BasicTagTechnology" />
+		<method name="&lt;init>()V" />
 		<method name="get(Landroid/nfc/Tag;)Landroid/nfc/tech/NfcB;" />
 		<method name="getApplicationData()[B" />
 		<method name="getMaxTransceiveLength()I" since="14" />
@@ -12784,6 +12416,7 @@
 	</class>
 	<class name="android/nfc/tech/NfcF" since="10">
 		<extends name="android/nfc/tech/BasicTagTechnology" />
+		<method name="&lt;init>()V" />
 		<method name="get(Landroid/nfc/Tag;)Landroid/nfc/tech/NfcF;" />
 		<method name="getManufacturer()[B" />
 		<method name="getMaxTransceiveLength()I" since="14" />
@@ -12794,6 +12427,7 @@
 	</class>
 	<class name="android/nfc/tech/NfcV" since="10">
 		<extends name="android/nfc/tech/BasicTagTechnology" />
+		<method name="&lt;init>()V" />
 		<method name="get(Landroid/nfc/Tag;)Landroid/nfc/tech/NfcV;" />
 		<method name="getDsfId()B" />
 		<method name="getMaxTransceiveLength()I" since="14" />
@@ -12801,8 +12435,8 @@
 		<method name="transceive([B)[B" />
 	</class>
 	<class name="android/nfc/tech/TagTechnology" since="10">
+		<extends name="java/lang/Object" />
 		<implements name="java/io/Closeable" />
-		<method name="close()V" />
 		<method name="connect()V" />
 		<method name="getTag()Landroid/nfc/Tag;" />
 		<method name="isConnected()Z" />
@@ -14169,29 +13803,31 @@
 		<method name="setPreserveEGLContextOnPause(Z)V" since="11" />
 		<method name="setRenderMode(I)V" />
 		<method name="setRenderer(Landroid/opengl/GLSurfaceView$Renderer;)V" />
-		<method name="surfaceChanged(Landroid/view/SurfaceHolder;III)V" />
-		<method name="surfaceCreated(Landroid/view/SurfaceHolder;)V" />
-		<method name="surfaceDestroyed(Landroid/view/SurfaceHolder;)V" />
 		<field name="DEBUG_CHECK_GL_ERROR" />
 		<field name="DEBUG_LOG_GL_CALLS" />
 		<field name="RENDERMODE_CONTINUOUSLY" />
 		<field name="RENDERMODE_WHEN_DIRTY" />
 	</class>
 	<class name="android/opengl/GLSurfaceView$EGLConfigChooser" since="3">
+		<extends name="java/lang/Object" />
 		<method name="chooseConfig(Ljavax/microedition/khronos/egl/EGL10;Ljavax/microedition/khronos/egl/EGLDisplay;)Ljavax/microedition/khronos/egl/EGLConfig;" />
 	</class>
 	<class name="android/opengl/GLSurfaceView$EGLContextFactory" since="5">
+		<extends name="java/lang/Object" />
 		<method name="createContext(Ljavax/microedition/khronos/egl/EGL10;Ljavax/microedition/khronos/egl/EGLDisplay;Ljavax/microedition/khronos/egl/EGLConfig;)Ljavax/microedition/khronos/egl/EGLContext;" />
 		<method name="destroyContext(Ljavax/microedition/khronos/egl/EGL10;Ljavax/microedition/khronos/egl/EGLDisplay;Ljavax/microedition/khronos/egl/EGLContext;)V" />
 	</class>
 	<class name="android/opengl/GLSurfaceView$EGLWindowSurfaceFactory" since="5">
+		<extends name="java/lang/Object" />
 		<method name="createWindowSurface(Ljavax/microedition/khronos/egl/EGL10;Ljavax/microedition/khronos/egl/EGLDisplay;Ljavax/microedition/khronos/egl/EGLConfig;Ljava/lang/Object;)Ljavax/microedition/khronos/egl/EGLSurface;" />
 		<method name="destroySurface(Ljavax/microedition/khronos/egl/EGL10;Ljavax/microedition/khronos/egl/EGLDisplay;Ljavax/microedition/khronos/egl/EGLSurface;)V" />
 	</class>
 	<class name="android/opengl/GLSurfaceView$GLWrapper" since="3">
+		<extends name="java/lang/Object" />
 		<method name="wrap(Ljavax/microedition/khronos/opengles/GL;)Ljavax/microedition/khronos/opengles/GL;" />
 	</class>
 	<class name="android/opengl/GLSurfaceView$Renderer" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onDrawFrame(Ljavax/microedition/khronos/opengles/GL10;)V" />
 		<method name="onSurfaceChanged(Ljavax/microedition/khronos/opengles/GL10;II)V" />
 		<method name="onSurfaceCreated(Ljavax/microedition/khronos/opengles/GL10;Ljavax/microedition/khronos/egl/EGLConfig;)V" />
@@ -14208,6 +13844,7 @@
 	</class>
 	<class name="android/opengl/GLUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getEGLErrorString(I)Ljava/lang/String;" since="14" />
 		<method name="getInternalFormat(Landroid/graphics/Bitmap;)I" />
 		<method name="getType(Landroid/graphics/Bitmap;)I" />
@@ -14250,20 +13887,20 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="cancel(Z)Z" />
-		<method name="doInBackground([LParams;)LResult;" />
+		<method name="doInBackground([Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="execute(Ljava/lang/Runnable;)V" 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="execute([Ljava/lang/Object;)Landroid/os/AsyncTask;" />
+		<method name="executeOnExecutor(Ljava/util/concurrent/Executor;[Ljava/lang/Object;)Landroid/os/AsyncTask;" since="11" />
+		<method name="get()Ljava/lang/Object;" />
+		<method name="get(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;" />
 		<method name="getStatus()Landroid/os/AsyncTask$Status;" />
 		<method name="isCancelled()Z" />
 		<method name="onCancelled()V" />
-		<method name="onCancelled(LResult;)V" since="11" />
-		<method name="onPostExecute(LResult;)V" />
+		<method name="onCancelled(Ljava/lang/Object;)V" since="11" />
+		<method name="onPostExecute(Ljava/lang/Object;)V" />
 		<method name="onPreExecute()V" />
-		<method name="onProgressUpdate([LProgress;)V" />
-		<method name="publishProgress([LProgress;)V" />
+		<method name="onProgressUpdate([Ljava/lang/Object;)V" />
+		<method name="publishProgress([Ljava/lang/Object;)V" />
 		<field name="SERIAL_EXECUTOR" since="11" />
 		<field name="THREAD_POOL_EXECUTOR" since="11" />
 	</class>
@@ -14315,21 +13952,12 @@
 		<method name="attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V" />
 		<method name="clearCallingIdentity()J" />
 		<method name="dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V" />
-		<method name="dump(Ljava/io/FileDescriptor;[Ljava/lang/String;)V" since="3" />
-		<method name="dumpAsync(Ljava/io/FileDescriptor;[Ljava/lang/String;)V" since="13" />
 		<method name="flushPendingCommands()V" />
 		<method name="getCallingPid()I" />
 		<method name="getCallingUid()I" />
-		<method name="getInterfaceDescriptor()Ljava/lang/String;" />
-		<method name="isBinderAlive()Z" />
 		<method name="joinThreadPool()V" />
-		<method name="linkToDeath(Landroid/os/IBinder$DeathRecipient;I)V" />
 		<method name="onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z" />
-		<method name="pingBinder()Z" />
-		<method name="queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;" />
 		<method name="restoreCallingIdentity(J)V" />
-		<method name="transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z" />
-		<method name="unlinkToDeath(Landroid/os/IBinder$DeathRecipient;I)Z" />
 	</class>
 	<class name="android/os/Build" since="1">
 		<extends name="java/lang/Object" />
@@ -14388,16 +14016,14 @@
 	</class>
 	<class name="android/os/Bundle" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="android/os/Parcelable" />
+		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Landroid/os/Bundle;)V" />
 		<method name="&lt;init>(Ljava/lang/ClassLoader;)V" />
 		<method name="clear()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="containsKey(Ljava/lang/String;)Z" />
-		<method name="describeContents()I" />
 		<method name="get(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="getBoolean(Ljava/lang/String;)Z" />
 		<method name="getBoolean(Ljava/lang/String;Z)Z" />
@@ -14427,7 +14053,7 @@
 		<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="getParcelable(Ljava/lang/String;)Landroid/os/Parcelable;" />
 		<method name="getParcelableArray(Ljava/lang/String;)[Landroid/os/Parcelable;" />
 		<method name="getParcelableArrayList(Ljava/lang/String;)Ljava/util/ArrayList;" />
 		<method name="getSerializable(Ljava/lang/String;)Ljava/io/Serializable;" />
@@ -14476,7 +14102,6 @@
 		<method name="remove(Ljava/lang/String;)V" />
 		<method name="setClassLoader(Ljava/lang/ClassLoader;)V" />
 		<method name="size()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="EMPTY" />
 	</class>
@@ -14503,6 +14128,7 @@
 	</class>
 	<class name="android/os/Debug" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="changeDebugPort(I)V" />
 		<method name="dumpHprofData(Ljava/lang/String;)V" since="3" />
 		<method name="dumpService(Ljava/lang/String;Ljava/io/FileDescriptor;[Ljava/lang/String;)Z" since="8" />
@@ -14584,7 +14210,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" since="5" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" since="5" />
 		<method name="getOtherLabel(I)Ljava/lang/String;" since="14" />
 		<method name="getOtherPrivateDirty(I)I" since="14" />
 		<method name="getOtherPss(I)I" since="14" />
@@ -14593,7 +14218,6 @@
 		<method name="getTotalPss()I" since="5" />
 		<method name="getTotalSharedDirty()I" since="5" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" since="5" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="5" />
 		<field name="CREATOR" since="5" />
 		<field name="dalvikPrivateDirty" />
 		<field name="dalvikPss" />
@@ -14630,13 +14254,11 @@
 		<method name="&lt;init>(Ljava/lang/String;JLjava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;J[BI)V" />
 		<method name="close()V" />
-		<method name="describeContents()I" />
 		<method name="getFlags()I" />
 		<method name="getInputStream()Ljava/io/InputStream;" />
 		<method name="getTag()Ljava/lang/String;" />
 		<method name="getText(I)Ljava/lang/String;" />
 		<method name="getTimeMillis()J" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/os/Environment" since="1">
@@ -14727,6 +14349,7 @@
 		<method name="sendMessageDelayed(Landroid/os/Message;J)Z" />
 	</class>
 	<class name="android/os/Handler$Callback" since="3">
+		<extends name="java/lang/Object" />
 		<method name="handleMessage(Landroid/os/Message;)Z" />
 	</class>
 	<class name="android/os/HandlerThread" since="1">
@@ -14739,6 +14362,7 @@
 		<method name="quit()Z" since="5" />
 	</class>
 	<class name="android/os/IBinder" since="1">
+		<extends name="java/lang/Object" />
 		<method name="dump(Ljava/io/FileDescriptor;[Ljava/lang/String;)V" since="3" />
 		<method name="dumpAsync(Ljava/io/FileDescriptor;[Ljava/lang/String;)V" since="13" />
 		<method name="getInterfaceDescriptor()Ljava/lang/String;" />
@@ -14758,13 +14382,16 @@
 		<field name="TWEET_TRANSACTION" since="13" />
 	</class>
 	<class name="android/os/IBinder$DeathRecipient" since="1">
+		<extends name="java/lang/Object" />
 		<method name="binderDied()V" />
 	</class>
 	<class name="android/os/IInterface" since="1">
+		<extends name="java/lang/Object" />
 		<method name="asBinder()Landroid/os/IBinder;" />
 	</class>
 	<class name="android/os/Looper" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="getMainLooper()Landroid/os/Looper;" />
 		<method name="getThread()Ljava/lang/Thread;" since="3" />
@@ -14793,7 +14420,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
 		<method name="copyFrom(Landroid/os/Message;)V" />
-		<method name="describeContents()I" />
 		<method name="getCallback()Ljava/lang/Runnable;" />
 		<method name="getData()Landroid/os/Bundle;" />
 		<method name="getTarget()Landroid/os/Handler;" />
@@ -14811,7 +14437,6 @@
 		<method name="sendToTarget()V" />
 		<method name="setData(Landroid/os/Bundle;)V" />
 		<method name="setTarget(Landroid/os/Handler;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="arg1" />
 		<field name="arg2" />
@@ -14821,10 +14446,12 @@
 	</class>
 	<class name="android/os/MessageQueue" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="addIdleHandler(Landroid/os/MessageQueue$IdleHandler;)V" />
 		<method name="removeIdleHandler(Landroid/os/MessageQueue$IdleHandler;)V" />
 	</class>
 	<class name="android/os/MessageQueue$IdleHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="queueIdle()Z" />
 	</class>
 	<class name="android/os/Messenger" since="1">
@@ -14832,12 +14459,10 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/os/Handler;)V" />
 		<method name="&lt;init>(Landroid/os/IBinder;)V" />
-		<method name="describeContents()I" />
 		<method name="getBinder()Landroid/os/IBinder;" />
 		<method name="readMessengerOrNullFromParcel(Landroid/os/Parcel;)Landroid/os/Messenger;" />
 		<method name="send(Landroid/os/Message;)V" />
 		<method name="writeMessengerOrNullToParcel(Landroid/os/Messenger;Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/os/NetworkOnMainThreadException" since="11">
@@ -14846,6 +14471,7 @@
 	</class>
 	<class name="android/os/Parcel" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="appendFrom(Landroid/os/Parcel;II)V" />
 		<method name="createBinderArray()[Landroid/os/IBinder;" />
 		<method name="createBinderArrayList()Ljava/util/ArrayList;" />
@@ -14858,7 +14484,7 @@
 		<method name="createLongArray()[J" />
 		<method name="createStringArray()[Ljava/lang/String;" />
 		<method name="createStringArrayList()Ljava/util/ArrayList;" />
-		<method name="createTypedArray(Landroid/os/Parcelable$Creator;)[LT;" />
+		<method name="createTypedArray(Landroid/os/Parcelable$Creator;)[Ljava/lang/Object;" />
 		<method name="createTypedArrayList(Landroid/os/Parcelable$Creator;)Ljava/util/ArrayList;" />
 		<method name="dataAvail()I" />
 		<method name="dataCapacity()I" />
@@ -14893,7 +14519,7 @@
 		<method name="readLong()J" />
 		<method name="readLongArray([J)V" />
 		<method name="readMap(Ljava/util/Map;Ljava/lang/ClassLoader;)V" />
-		<method name="readParcelable(Ljava/lang/ClassLoader;)LT;" />
+		<method name="readParcelable(Ljava/lang/ClassLoader;)Landroid/os/Parcelable;" />
 		<method name="readParcelableArray(Ljava/lang/ClassLoader;)[Landroid/os/Parcelable;" />
 		<method name="readSerializable()Ljava/io/Serializable;" />
 		<method name="readSparseArray(Ljava/lang/ClassLoader;)Landroid/util/SparseArray;" />
@@ -14902,7 +14528,7 @@
 		<method name="readStringArray([Ljava/lang/String;)V" />
 		<method name="readStringList(Ljava/util/List;)V" />
 		<method name="readStrongBinder()Landroid/os/IBinder;" />
-		<method name="readTypedArray([LT;Landroid/os/Parcelable$Creator;)V" />
+		<method name="readTypedArray([Ljava/lang/Object;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" />
@@ -14934,7 +14560,7 @@
 		<method name="writeMap(Ljava/util/Map;)V" />
 		<method name="writeNoException()V" />
 		<method name="writeParcelable(Landroid/os/Parcelable;I)V" />
-		<method name="writeParcelableArray([LT;I)V" />
+		<method name="writeParcelableArray([Landroid/os/Parcelable;I)V" />
 		<method name="writeSerializable(Ljava/io/Serializable;)V" />
 		<method name="writeSparseArray(Landroid/util/SparseArray;)V" />
 		<method name="writeSparseBooleanArray(Landroid/util/SparseBooleanArray;)V" />
@@ -14943,7 +14569,7 @@
 		<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="writeTypedArray([Landroid/os/Parcelable;I)V" />
 		<method name="writeTypedList(Ljava/util/List;)V" />
 		<method name="writeValue(Ljava/lang/Object;)V" />
 		<field name="STRING_CREATOR" />
@@ -14955,7 +14581,6 @@
 		<method name="adoptFd(I)Landroid/os/ParcelFileDescriptor;" since="13" />
 		<method name="close()V" />
 		<method name="createPipe()[Landroid/os/ParcelFileDescriptor;" since="9" />
-		<method name="describeContents()I" />
 		<method name="detachFd()I" since="12" />
 		<method name="dup()Landroid/os/ParcelFileDescriptor;" since="14" />
 		<method name="dup(Ljava/io/FileDescriptor;)Landroid/os/ParcelFileDescriptor;" since="13" />
@@ -14966,7 +14591,6 @@
 		<method name="getFileDescriptor()Ljava/io/FileDescriptor;" />
 		<method name="getStatSize()J" since="3" />
 		<method name="open(Ljava/io/File;I)Landroid/os/ParcelFileDescriptor;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="MODE_APPEND" since="3" />
 		<field name="MODE_CREATE" />
@@ -14994,36 +14618,35 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Ljava/util/UUID;)V" />
-		<method name="describeContents()I" />
 		<method name="fromString(Ljava/lang/String;)Landroid/os/ParcelUuid;" />
 		<method name="getUuid()Ljava/util/UUID;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/os/Parcelable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="describeContents()I" />
 		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CONTENTS_FILE_DESCRIPTOR" />
 		<field name="PARCELABLE_WRITE_RETURN_VALUE" />
 	</class>
 	<class name="android/os/Parcelable$ClassLoaderCreator" since="13">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable$Creator" />
-		<method name="createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)LT;" />
+		<method name="createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Ljava/lang/Object;" />
 	</class>
 	<class name="android/os/Parcelable$Creator" since="1">
-		<method name="createFromParcel(Landroid/os/Parcel;)LT;" />
-		<method name="newArray(I)[LT;" />
+		<extends name="java/lang/Object" />
+		<method name="createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;" />
+		<method name="newArray(I)[Ljava/lang/Object;" />
 	</class>
 	<class name="android/os/PatternMatcher" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Ljava/lang/String;I)V" />
-		<method name="describeContents()I" />
 		<method name="getPath()Ljava/lang/String;" />
 		<method name="getType()I" />
 		<method name="match(Ljava/lang/String;)Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="PATTERN_LITERAL" />
 		<field name="PATTERN_PREFIX" />
@@ -15031,6 +14654,7 @@
 	</class>
 	<class name="android/os/PowerManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="goToSleep(J)V" />
 		<method name="isScreenOn()Z" since="7" />
 		<method name="newWakeLock(ILjava/lang/String;)Landroid/os/PowerManager$WakeLock;" />
@@ -15045,6 +14669,7 @@
 	</class>
 	<class name="android/os/PowerManager$WakeLock" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/os/PowerManager;)V" />
 		<method name="acquire()V" />
 		<method name="acquire(J)V" />
 		<method name="isHeld()Z" />
@@ -15095,6 +14720,7 @@
 		<method name="verifyPackage(Ljava/io/File;Landroid/os/RecoverySystem$ProgressListener;Ljava/io/File;)V" />
 	</class>
 	<class name="android/os/RecoverySystem$ProgressListener" since="8">
+		<extends name="java/lang/Object" />
 		<method name="onProgress(I)V" />
 	</class>
 	<class name="android/os/RemoteCallbackList" since="1">
@@ -15103,13 +14729,13 @@
 		<method name="beginBroadcast()I" />
 		<method name="finishBroadcast()V" />
 		<method name="getBroadcastCookie(I)Ljava/lang/Object;" since="4" />
-		<method name="getBroadcastItem(I)LE;" />
+		<method name="getBroadcastItem(I)Landroid/os/IInterface;" />
 		<method name="kill()V" />
-		<method name="onCallbackDied(LE;)V" />
-		<method name="onCallbackDied(LE;Ljava/lang/Object;)V" since="4" />
-		<method name="register(LE;)Z" />
-		<method name="register(LE;Ljava/lang/Object;)Z" since="4" />
-		<method name="unregister(LE;)Z" />
+		<method name="onCallbackDied(Landroid/os/IInterface;)V" />
+		<method name="onCallbackDied(Landroid/os/IInterface;Ljava/lang/Object;)V" since="4" />
+		<method name="register(Landroid/os/IInterface;)Z" />
+		<method name="register(Landroid/os/IInterface;Ljava/lang/Object;)Z" since="4" />
+		<method name="unregister(Landroid/os/IInterface;)Z" />
 	</class>
 	<class name="android/os/RemoteException" since="1">
 		<extends name="android/util/AndroidException" />
@@ -15120,10 +14746,8 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/os/Handler;)V" />
-		<method name="describeContents()I" />
 		<method name="onReceiveResult(ILandroid/os/Bundle;)V" />
 		<method name="send(ILandroid/os/Bundle;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/os/StatFs" since="1">
@@ -15137,6 +14761,7 @@
 	</class>
 	<class name="android/os/StrictMode" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="allowThreadDiskReads()Landroid/os/StrictMode$ThreadPolicy;" />
 		<method name="allowThreadDiskWrites()Landroid/os/StrictMode$ThreadPolicy;" />
 		<method name="enableDefaults()V" />
@@ -15148,6 +14773,7 @@
 	</class>
 	<class name="android/os/StrictMode$ThreadPolicy" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="LAX" />
 	</class>
 	<class name="android/os/StrictMode$ThreadPolicy$Builder" since="9">
@@ -15174,6 +14800,7 @@
 	</class>
 	<class name="android/os/StrictMode$VmPolicy" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="LAX" />
 	</class>
 	<class name="android/os/StrictMode$VmPolicy$Builder" since="9">
@@ -15192,6 +14819,7 @@
 	</class>
 	<class name="android/os/SystemClock" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="currentThreadTimeMillis()J" />
 		<method name="elapsedRealtime()J" />
 		<method name="setCurrentTimeMillis(J)Z" />
@@ -15215,6 +14843,7 @@
 	</class>
 	<class name="android/os/Vibrator" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="cancel()V" />
 		<method name="hasVibrator()Z" since="11" />
 		<method name="vibrate(J)V" />
@@ -15227,11 +14856,9 @@
 		<method name="&lt;init>(Landroid/os/WorkSource;)V" />
 		<method name="add(Landroid/os/WorkSource;)Z" />
 		<method name="clear()V" />
-		<method name="describeContents()I" />
 		<method name="diff(Landroid/os/WorkSource;)Z" />
 		<method name="remove(Landroid/os/WorkSource;)Z" />
 		<method name="set(Landroid/os/WorkSource;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/os/storage/OnObbStateChangeListener" since="9">
@@ -15249,6 +14876,7 @@
 	</class>
 	<class name="android/os/storage/StorageManager" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getMountedObbPath(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="isObbMounted(Ljava/lang/String;)Z" />
 		<method name="mountObb(Ljava/lang/String;Ljava/lang/String;Landroid/os/storage/OnObbStateChangeListener;)Z" />
@@ -15285,12 +14913,9 @@
 		<method name="getDialogTitle()Ljava/lang/CharSequence;" />
 		<method name="getNegativeButtonText()Ljava/lang/CharSequence;" />
 		<method name="getPositiveButtonText()Ljava/lang/CharSequence;" />
-		<method name="onActivityDestroy()V" />
 		<method name="onBindDialogView(Landroid/view/View;)V" />
-		<method name="onClick(Landroid/content/DialogInterface;I)V" />
 		<method name="onCreateDialogView()Landroid/view/View;" />
 		<method name="onDialogClosed(Z)V" />
-		<method name="onDismiss(Landroid/content/DialogInterface;)V" />
 		<method name="onPrepareDialogBuilder(Landroid/app/AlertDialog$Builder;)V" />
 		<method name="setDialogIcon(I)V" />
 		<method name="setDialogIcon(Landroid/graphics/drawable/Drawable;)V" />
@@ -15437,9 +15062,11 @@
 		<field name="CREATOR" />
 	</class>
 	<class name="android/preference/Preference$OnPreferenceChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onPreferenceChange(Landroid/preference/Preference;Ljava/lang/Object;)Z" />
 	</class>
 	<class name="android/preference/Preference$OnPreferenceClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onPreferenceClick(Landroid/preference/Preference;)Z" />
 	</class>
 	<class name="android/preference/PreferenceActivity" since="1">
@@ -15463,7 +15090,6 @@
 		<method name="onHeaderClick(Landroid/preference/PreferenceActivity$Header;I)V" since="11" />
 		<method name="onIsHidingHeaders()Z" since="11" />
 		<method name="onIsMultiPane()Z" since="11" />
-		<method name="onPreferenceStartFragment(Landroid/preference/PreferenceFragment;Landroid/preference/Preference;)Z" since="11" />
 		<method name="onPreferenceTreeClick(Landroid/preference/PreferenceScreen;Landroid/preference/Preference;)Z" />
 		<method name="setListFooter(Landroid/view/View;)V" since="11" />
 		<method name="setParentTitle(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/view/View$OnClickListener;)V" since="11" />
@@ -15486,13 +15112,11 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="getBreadCrumbShortTitle(Landroid/content/res/Resources;)Ljava/lang/CharSequence;" />
 		<method name="getBreadCrumbTitle(Landroid/content/res/Resources;)Ljava/lang/CharSequence;" />
 		<method name="getSummary(Landroid/content/res/Resources;)Ljava/lang/CharSequence;" />
 		<method name="getTitle(Landroid/content/res/Resources;)Ljava/lang/CharSequence;" />
 		<method name="readFromParcel(Landroid/os/Parcel;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="breadCrumbShortTitle" />
 		<field name="breadCrumbShortTitleRes" />
@@ -15527,6 +15151,7 @@
 		<method name="setPreferenceScreen(Landroid/preference/PreferenceScreen;)V" />
 	</class>
 	<class name="android/preference/PreferenceFragment$OnPreferenceStartFragmentCallback" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onPreferenceStartFragment(Landroid/preference/PreferenceFragment;Landroid/preference/Preference;)Z" />
 	</class>
 	<class name="android/preference/PreferenceGroup" since="1">
@@ -15549,6 +15174,7 @@
 	</class>
 	<class name="android/preference/PreferenceManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="createPreferenceScreen(Landroid/content/Context;)Landroid/preference/PreferenceScreen;" />
 		<method name="findPreference(Ljava/lang/CharSequence;)Landroid/preference/Preference;" />
 		<method name="getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;" />
@@ -15563,24 +15189,26 @@
 		<field name="METADATA_KEY_PREFERENCES" />
 	</class>
 	<class name="android/preference/PreferenceManager$OnActivityDestroyListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onActivityDestroy()V" />
 	</class>
 	<class name="android/preference/PreferenceManager$OnActivityResultListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onActivityResult(IILandroid/content/Intent;)Z" />
 	</class>
 	<class name="android/preference/PreferenceManager$OnActivityStopListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onActivityStop()V" />
 	</class>
 	<class name="android/preference/PreferenceScreen" since="1">
 		<extends name="android/preference/PreferenceGroup" />
-		<implements name="android/widget/AdapterView$OnItemClickListener" />
 		<implements name="android/content/DialogInterface$OnDismissListener" />
+		<implements name="android/widget/AdapterView$OnItemClickListener" />
+		<method name="&lt;init>()V" />
 		<method name="bind(Landroid/widget/ListView;)V" />
 		<method name="getDialog()Landroid/app/Dialog;" />
 		<method name="getRootAdapter()Landroid/widget/ListAdapter;" />
 		<method name="onCreateRootAdapter()Landroid/widget/ListAdapter;" />
-		<method name="onDismiss(Landroid/content/DialogInterface;)V" />
-		<method name="onItemClick(Landroid/widget/AdapterView;Landroid/view/View;IJ)V" />
 	</class>
 	<class name="android/preference/RingtonePreference" since="1">
 		<extends name="android/preference/Preference" />
@@ -15591,7 +15219,6 @@
 		<method name="getRingtoneType()I" />
 		<method name="getShowDefault()Z" />
 		<method name="getShowSilent()Z" />
-		<method name="onActivityResult(IILandroid/content/Intent;)Z" />
 		<method name="onPrepareRingtonePickerIntent(Landroid/content/Intent;)V" />
 		<method name="onRestoreRingtone()Landroid/net/Uri;" />
 		<method name="onSaveRingtone(Landroid/net/Uri;)V" />
@@ -15637,6 +15264,7 @@
 		<field name="EXTRA_SKIP_UI" since="11" />
 	</class>
 	<class name="android/provider/BaseColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="_COUNT" />
 		<field name="_ID" />
 	</class>
@@ -15698,6 +15326,8 @@
 		<field name="URL" />
 	</class>
 	<class name="android/provider/CalendarContract" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="ACCOUNT_TYPE_LOCAL" />
 		<field name="ACTION_EVENT_REMINDER" />
 		<field name="AUTHORITY" />
@@ -15708,13 +15338,16 @@
 		<field name="EXTRA_EVENT_END_TIME" />
 	</class>
 	<class name="android/provider/CalendarContract$Attendees" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/CalendarContract$AttendeesColumns" />
 		<implements name="android/provider/CalendarContract$EventsColumns" />
+		<method name="&lt;init>()V" />
 		<method name="query(Landroid/content/ContentResolver;J[Ljava/lang/String;)Landroid/database/Cursor;" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/CalendarContract$AttendeesColumns" since="14">
+		<extends name="java/lang/Object" />
 		<field name="ATTENDEE_EMAIL" />
 		<field name="ATTENDEE_NAME" />
 		<field name="ATTENDEE_RELATIONSHIP" />
@@ -15737,14 +15370,17 @@
 		<field name="TYPE_RESOURCE" since="15" />
 	</class>
 	<class name="android/provider/CalendarContract$CalendarAlerts" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/CalendarContract$CalendarAlertsColumns" />
 		<implements name="android/provider/CalendarContract$CalendarColumns" />
 		<implements name="android/provider/CalendarContract$EventsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_URI" />
 		<field name="CONTENT_URI_BY_INSTANCE" />
 	</class>
 	<class name="android/provider/CalendarContract$CalendarAlertsColumns" since="14">
+		<extends name="java/lang/Object" />
 		<field name="ALARM_TIME" />
 		<field name="BEGIN" />
 		<field name="CREATION_TIME" />
@@ -15760,7 +15396,9 @@
 		<field name="STATE_SCHEDULED" />
 	</class>
 	<class name="android/provider/CalendarContract$CalendarCache" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/CalendarContract$CalendarCacheColumns" />
+		<method name="&lt;init>()V" />
 		<field name="KEY_TIMEZONE_INSTANCES" />
 		<field name="KEY_TIMEZONE_INSTANCES_PREVIOUS" />
 		<field name="KEY_TIMEZONE_TYPE" />
@@ -15769,10 +15407,12 @@
 		<field name="URI" />
 	</class>
 	<class name="android/provider/CalendarContract$CalendarCacheColumns" since="14">
+		<extends name="java/lang/Object" />
 		<field name="KEY" />
 		<field name="VALUE" />
 	</class>
 	<class name="android/provider/CalendarContract$CalendarColumns" since="14">
+		<extends name="java/lang/Object" />
 		<field name="ALLOWED_ATTENDEE_TYPES" since="15" />
 		<field name="ALLOWED_AVAILABILITY" since="15" />
 		<field name="ALLOWED_REMINDERS" />
@@ -15798,13 +15438,16 @@
 		<field name="VISIBLE" />
 	</class>
 	<class name="android/provider/CalendarContract$CalendarEntity" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/CalendarContract$CalendarColumns" />
 		<implements name="android/provider/CalendarContract$SyncColumns" />
+		<method name="&lt;init>()V" />
 		<method name="newEntityIterator(Landroid/database/Cursor;)Landroid/content/EntityIterator;" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/CalendarContract$CalendarSyncColumns" since="14">
+		<extends name="java/lang/Object" />
 		<field name="CAL_SYNC1" />
 		<field name="CAL_SYNC10" />
 		<field name="CAL_SYNC2" />
@@ -15817,19 +15460,24 @@
 		<field name="CAL_SYNC9" />
 	</class>
 	<class name="android/provider/CalendarContract$Calendars" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/CalendarContract$CalendarColumns" />
 		<implements name="android/provider/CalendarContract$SyncColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CALENDAR_LOCATION" />
 		<field name="CONTENT_URI" />
 		<field name="DEFAULT_SORT_ORDER" />
 		<field name="NAME" />
 	</class>
 	<class name="android/provider/CalendarContract$Colors" since="15">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/CalendarContract$ColorsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/CalendarContract$ColorsColumns" since="15">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/SyncStateContract$Columns" />
 		<field name="COLOR" />
 		<field name="COLOR_KEY" />
@@ -15838,23 +15486,29 @@
 		<field name="TYPE_EVENT" />
 	</class>
 	<class name="android/provider/CalendarContract$EventDays" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/CalendarContract$EventDaysColumns" />
+		<method name="&lt;init>()V" />
 		<method name="query(Landroid/content/ContentResolver;II[Ljava/lang/String;)Landroid/database/Cursor;" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/CalendarContract$EventDaysColumns" since="14">
+		<extends name="java/lang/Object" />
 		<field name="ENDDAY" />
 		<field name="STARTDAY" />
 	</class>
 	<class name="android/provider/CalendarContract$Events" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/CalendarContract$CalendarColumns" />
 		<implements name="android/provider/CalendarContract$EventsColumns" />
 		<implements name="android/provider/CalendarContract$SyncColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_EXCEPTION_URI" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/CalendarContract$EventsColumns" since="14">
+		<extends name="java/lang/Object" />
 		<field name="ACCESS_CONFIDENTIAL" />
 		<field name="ACCESS_DEFAULT" />
 		<field name="ACCESS_LEVEL" />
@@ -15911,28 +15565,35 @@
 		<field name="TITLE" />
 	</class>
 	<class name="android/provider/CalendarContract$EventsEntity" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/CalendarContract$EventsColumns" />
 		<implements name="android/provider/CalendarContract$SyncColumns" />
+		<method name="&lt;init>()V" />
 		<method name="newEntityIterator(Landroid/database/Cursor;Landroid/content/ContentProviderClient;)Landroid/content/EntityIterator;" />
 		<method name="newEntityIterator(Landroid/database/Cursor;Landroid/content/ContentResolver;)Landroid/content/EntityIterator;" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/CalendarContract$ExtendedProperties" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/CalendarContract$EventsColumns" />
 		<implements name="android/provider/CalendarContract$ExtendedPropertiesColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/CalendarContract$ExtendedPropertiesColumns" since="14">
+		<extends name="java/lang/Object" />
 		<field name="EVENT_ID" />
 		<field name="NAME" />
 		<field name="VALUE" />
 	</class>
 	<class name="android/provider/CalendarContract$Instances" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/CalendarContract$CalendarColumns" />
 		<implements name="android/provider/CalendarContract$EventsColumns" />
+		<method name="&lt;init>()V" />
 		<method name="query(Landroid/content/ContentResolver;[Ljava/lang/String;JJ)Landroid/database/Cursor;" />
 		<method name="query(Landroid/content/ContentResolver;[Ljava/lang/String;JJLjava/lang/String;)Landroid/database/Cursor;" />
 		<field name="BEGIN" />
@@ -15948,13 +15609,16 @@
 		<field name="START_MINUTE" />
 	</class>
 	<class name="android/provider/CalendarContract$Reminders" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/CalendarContract$EventsColumns" />
 		<implements name="android/provider/CalendarContract$RemindersColumns" />
+		<method name="&lt;init>()V" />
 		<method name="query(Landroid/content/ContentResolver;J[Ljava/lang/String;)Landroid/database/Cursor;" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/CalendarContract$RemindersColumns" since="14">
+		<extends name="java/lang/Object" />
 		<field name="EVENT_ID" />
 		<field name="METHOD" />
 		<field name="METHOD_ALERT" />
@@ -15965,6 +15629,7 @@
 		<field name="MINUTES_DEFAULT" />
 	</class>
 	<class name="android/provider/CalendarContract$SyncColumns" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/CalendarContract$CalendarSyncColumns" />
 		<field name="ACCOUNT_NAME" />
 		<field name="ACCOUNT_TYPE" />
@@ -15974,7 +15639,9 @@
 		<field name="_SYNC_ID" />
 	</class>
 	<class name="android/provider/CalendarContract$SyncState" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/SyncStateContract$Columns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/CallLog" since="1">
@@ -16008,6 +15675,7 @@
 	</class>
 	<class name="android/provider/Contacts" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="AUTHORITY" />
 		<field name="CONTENT_URI" />
 		<field name="KIND_EMAIL" />
@@ -16021,6 +15689,7 @@
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$ContactMethodsColumns" />
 		<implements name="android/provider/Contacts$PeopleColumns" />
+		<method name="&lt;init>()V" />
 		<method name="addPostalLocation(Landroid/content/Context;JDD)V" />
 		<method name="decodeImProtocol(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="encodeCustomImProtocol(Ljava/lang/String;)Ljava/lang/String;" />
@@ -16048,6 +15717,7 @@
 		<field name="PROTOCOL_YAHOO" />
 	</class>
 	<class name="android/provider/Contacts$ContactMethodsColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="AUX_DATA" />
 		<field name="DATA" />
 		<field name="ISPRIMARY" />
@@ -16063,6 +15733,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$ExtensionsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="CONTENT_TYPE" />
 		<field name="CONTENT_URI" />
@@ -16070,6 +15741,7 @@
 		<field name="PERSON_ID" />
 	</class>
 	<class name="android/provider/Contacts$ExtensionsColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="NAME" />
 		<field name="VALUE" />
 	</class>
@@ -16077,6 +15749,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$GroupsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="CONTENT_TYPE" />
@@ -16093,6 +15766,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$GroupsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="CONTENT_TYPE" />
 		<field name="CONTENT_URI" />
@@ -16102,6 +15776,7 @@
 		<field name="GROUP_MY_CONTACTS" />
 	</class>
 	<class name="android/provider/Contacts$GroupsColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="NAME" />
 		<field name="NOTES" />
 		<field name="SHOULD_SYNC" />
@@ -16165,6 +15840,7 @@
 		<field name="TITLE_EXTRA_KEY" />
 	</class>
 	<class name="android/provider/Contacts$OrganizationColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="COMPANY" />
 		<field name="ISPRIMARY" />
 		<field name="LABEL" />
@@ -16179,6 +15855,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$OrganizationColumns" />
+		<method name="&lt;init>()V" />
 		<method name="getDisplayLabel(Landroid/content/Context;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="CONTENT_URI" />
@@ -16190,6 +15867,7 @@
 		<implements name="android/provider/Contacts$PeopleColumns" />
 		<implements name="android/provider/Contacts$PhonesColumns" />
 		<implements name="android/provider/Contacts$PresenceColumns" />
+		<method name="&lt;init>()V" />
 		<method name="addToGroup(Landroid/content/ContentResolver;JJ)Landroid/net/Uri;" />
 		<method name="addToGroup(Landroid/content/ContentResolver;JLjava/lang/String;)Landroid/net/Uri;" />
 		<method name="addToMyContactsGroup(Landroid/content/ContentResolver;J)Landroid/net/Uri;" />
@@ -16214,6 +15892,7 @@
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$ContactMethodsColumns" />
 		<implements name="android/provider/Contacts$PeopleColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="DEFAULT_SORT_ORDER" />
 	</class>
@@ -16221,6 +15900,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$ExtensionsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="DEFAULT_SORT_ORDER" />
 		<field name="PERSON_ID" />
@@ -16230,10 +15910,12 @@
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$PeopleColumns" />
 		<implements name="android/provider/Contacts$PhonesColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="DEFAULT_SORT_ORDER" />
 	</class>
 	<class name="android/provider/Contacts$PeopleColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="CUSTOM_RINGTONE" />
 		<field name="DISPLAY_NAME" />
 		<field name="LAST_TIME_CONTACTED" />
@@ -16250,6 +15932,7 @@
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$PeopleColumns" />
 		<implements name="android/provider/Contacts$PhonesColumns" />
+		<method name="&lt;init>()V" />
 		<method name="getDisplayLabel(Landroid/content/Context;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="getDisplayLabel(Landroid/content/Context;ILjava/lang/CharSequence;[Ljava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<field name="CONTENT_FILTER_URL" />
@@ -16260,6 +15943,7 @@
 		<field name="PERSON_ID" />
 	</class>
 	<class name="android/provider/Contacts$PhonesColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="ISPRIMARY" />
 		<field name="LABEL" />
 		<field name="NUMBER" />
@@ -16278,11 +15962,13 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$PhotosColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="CONTENT_URI" />
 		<field name="DEFAULT_SORT_ORDER" />
 	</class>
 	<class name="android/provider/Contacts$PhotosColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="DATA" />
 		<field name="DOWNLOAD_REQUIRED" />
 		<field name="EXISTS_ON_SERVER" />
@@ -16291,6 +15977,7 @@
 		<field name="SYNC_ERROR" />
 	</class>
 	<class name="android/provider/Contacts$PresenceColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="AVAILABLE" since="8" />
 		<field name="AWAY" since="8" />
 		<field name="DO_NOT_DISTURB" since="8" />
@@ -16308,6 +15995,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/Contacts$SettingsColumns" />
+		<method name="&lt;init>()V" />
 		<method name="getSetting(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="setSetting(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<field name="CONTENT_DIRECTORY" />
@@ -16316,6 +16004,7 @@
 		<field name="SYNC_EVERYTHING" />
 	</class>
 	<class name="android/provider/Contacts$SettingsColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="KEY" />
 		<field name="VALUE" />
 		<field name="_SYNC_ACCOUNT" />
@@ -16336,6 +16025,7 @@
 	<class name="android/provider/ContactsContract$AggregationExceptions" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="CONTENT_TYPE" />
 		<field name="CONTENT_URI" />
@@ -16347,6 +16037,7 @@
 		<field name="TYPE_KEEP_TOGETHER" />
 	</class>
 	<class name="android/provider/ContactsContract$BaseSyncColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="SYNC1" />
 		<field name="SYNC2" />
 		<field name="SYNC3" />
@@ -16354,11 +16045,14 @@
 	</class>
 	<class name="android/provider/ContactsContract$CommonDataKinds" since="5">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/provider/ContactsContract$CommonDataKinds$BaseTypes" since="5">
+		<extends name="java/lang/Object" />
 		<field name="TYPE_CUSTOM" />
 	</class>
 	<class name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" since="5">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$BaseTypes" />
 		<field name="DATA" />
 		<field name="LABEL" />
@@ -16368,6 +16062,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<method name="getTypeLabel(Landroid/content/res/Resources;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="getTypeLabelResource(I)I" />
 		<field name="ADDRESS" since="11" />
@@ -16386,6 +16081,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<method name="getTypeResource(Ljava/lang/Integer;)I" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="START_DATE" />
@@ -16396,12 +16092,15 @@
 	<class name="android/provider/ContactsContract$CommonDataKinds$GroupMembership" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="GROUP_ROW_ID" />
 		<field name="GROUP_SOURCE_ID" />
 	</class>
 	<class name="android/provider/ContactsContract$CommonDataKinds$Identity" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="IDENTITY" />
 		<field name="NAMESPACE" />
@@ -16410,6 +16109,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<method name="getProtocolLabel(Landroid/content/res/Resources;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="getProtocolLabelResource(I)I" />
 		<method name="getTypeLabel(Landroid/content/res/Resources;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" />
@@ -16435,6 +16135,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="NAME" />
 		<field name="TYPE_DEFAULT" />
@@ -16447,6 +16148,7 @@
 	<class name="android/provider/ContactsContract$CommonDataKinds$Note" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="NOTE" />
 	</class>
@@ -16454,6 +16156,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<method name="getTypeLabel(Landroid/content/res/Resources;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="getTypeLabelResource(I)I" />
 		<field name="COMPANY" />
@@ -16471,6 +16174,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<method name="getTypeLabel(Landroid/content/res/Resources;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="getTypeLabelResource(I)I" />
 		<field name="CONTENT_FILTER_URI" />
@@ -16502,6 +16206,7 @@
 	<class name="android/provider/ContactsContract$CommonDataKinds$Photo" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="PHOTO" />
 		<field name="PHOTO_FILE_ID" since="14" />
@@ -16510,6 +16215,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<method name="getTypeLabel(Landroid/content/res/Resources;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" since="11" />
 		<method name="getTypeLabelResource(I)I" since="11" />
 		<field name="CONTENT_ITEM_TYPE" />
@@ -16533,6 +16239,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<method name="getTypeLabel(Landroid/content/res/Resources;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="getTypeLabelResource(I)I" />
 		<field name="CONTENT_ITEM_TYPE" />
@@ -16544,6 +16251,7 @@
 	<class name="android/provider/ContactsContract$CommonDataKinds$StructuredName" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="DISPLAY_NAME" />
 		<field name="FAMILY_NAME" />
@@ -16559,6 +16267,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<method name="getTypeLabel(Landroid/content/res/Resources;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="getTypeLabelResource(I)I" />
 		<field name="CITY" />
@@ -16580,6 +16289,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$CommonDataKinds$CommonColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="TYPE_BLOG" />
 		<field name="TYPE_FTP" />
@@ -16591,6 +16301,7 @@
 		<field name="URL" />
 	</class>
 	<class name="android/provider/ContactsContract$ContactNameColumns" since="11">
+		<extends name="java/lang/Object" />
 		<field name="DISPLAY_NAME_ALTERNATIVE" />
 		<field name="DISPLAY_NAME_PRIMARY" />
 		<field name="DISPLAY_NAME_SOURCE" />
@@ -16600,6 +16311,7 @@
 		<field name="SORT_KEY_PRIMARY" />
 	</class>
 	<class name="android/provider/ContactsContract$ContactOptionsColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="CUSTOM_RINGTONE" />
 		<field name="LAST_TIME_CONTACTED" />
 		<field name="SEND_TO_VOICEMAIL" />
@@ -16607,6 +16319,7 @@
 		<field name="TIMES_CONTACTED" />
 	</class>
 	<class name="android/provider/ContactsContract$ContactStatusColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="CONTACT_CHAT_CAPABILITY" since="11" />
 		<field name="CONTACT_PRESENCE" />
 		<field name="CONTACT_STATUS" />
@@ -16618,10 +16331,11 @@
 	<class name="android/provider/ContactsContract$Contacts" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
+		<implements name="android/provider/ContactsContract$ContactNameColumns" since="11" />
 		<implements name="android/provider/ContactsContract$ContactOptionsColumns" />
 		<implements name="android/provider/ContactsContract$ContactStatusColumns" />
 		<implements name="android/provider/ContactsContract$ContactsColumns" />
-		<implements name="android/provider/ContactsContract$ContactNameColumns" since="11" />
+		<method name="&lt;init>()V" />
 		<method name="getLookupUri(JLjava/lang/String;)Landroid/net/Uri;" />
 		<method name="getLookupUri(Landroid/content/ContentResolver;Landroid/net/Uri;)Landroid/net/Uri;" />
 		<method name="lookupContact(Landroid/content/ContentResolver;Landroid/net/Uri;)Landroid/net/Uri;" />
@@ -16642,15 +16356,17 @@
 	<class name="android/provider/ContactsContract$Contacts$AggregationSuggestions" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
-		<implements name="android/provider/ContactsContract$ContactsColumns" />
 		<implements name="android/provider/ContactsContract$ContactOptionsColumns" since="11" />
 		<implements name="android/provider/ContactsContract$ContactStatusColumns" since="11" />
+		<implements name="android/provider/ContactsContract$ContactsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 	</class>
 	<class name="android/provider/ContactsContract$Contacts$Data" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$DataColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 	</class>
 	<class name="android/provider/ContactsContract$Contacts$Entity" since="11">
@@ -16665,6 +16381,7 @@
 		<implements name="android/provider/ContactsContract$RawContactsColumns" />
 		<implements name="android/provider/ContactsContract$StatusColumns" />
 		<implements name="android/provider/ContactsContract$SyncColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="DATA_ID" />
 		<field name="RAW_CONTACT_ID" />
@@ -16674,16 +16391,20 @@
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$DataColumns" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" since="11" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="DISPLAY_PHOTO" since="14" />
 		<field name="PHOTO" since="11" />
 		<field name="PHOTO_FILE_ID" since="14" />
 	</class>
 	<class name="android/provider/ContactsContract$Contacts$StreamItems" since="15">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$StreamItemsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 	</class>
 	<class name="android/provider/ContactsContract$ContactsColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="DISPLAY_NAME" />
 		<field name="HAS_PHONE_NUMBER" />
 		<field name="IN_VISIBLE_GROUP" />
@@ -16697,11 +16418,13 @@
 	<class name="android/provider/ContactsContract$Data" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$DataColumnsWithJoins" />
+		<method name="&lt;init>()V" />
 		<method name="getContactLookupUri(Landroid/content/ContentResolver;Landroid/net/Uri;)Landroid/net/Uri;" />
 		<field name="CONTENT_TYPE" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/ContactsContract$DataColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="DATA1" />
 		<field name="DATA10" />
 		<field name="DATA11" />
@@ -16729,16 +16452,18 @@
 		<field name="SYNC4" />
 	</class>
 	<class name="android/provider/ContactsContract$DataColumnsWithJoins" since="5">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
+		<implements name="android/provider/ContactsContract$ContactNameColumns" since="11" />
 		<implements name="android/provider/ContactsContract$ContactOptionsColumns" />
 		<implements name="android/provider/ContactsContract$ContactStatusColumns" />
 		<implements name="android/provider/ContactsContract$ContactsColumns" />
 		<implements name="android/provider/ContactsContract$DataColumns" />
 		<implements name="android/provider/ContactsContract$RawContactsColumns" />
 		<implements name="android/provider/ContactsContract$StatusColumns" />
-		<implements name="android/provider/ContactsContract$ContactNameColumns" since="11" />
 	</class>
 	<class name="android/provider/ContactsContract$DataUsageFeedback" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<field name="FEEDBACK_URI" />
 		<field name="USAGE_TYPE" />
@@ -16749,6 +16474,7 @@
 	<class name="android/provider/ContactsContract$Directory" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
+		<method name="&lt;init>()V" />
 		<method name="notifyDirectoryChange(Landroid/content/ContentResolver;)V" />
 		<field name="ACCOUNT_NAME" />
 		<field name="ACCOUNT_TYPE" />
@@ -16776,6 +16502,7 @@
 		<field name="TYPE_RESOURCE_ID" />
 	</class>
 	<class name="android/provider/ContactsContract$DisplayNameSources" since="11">
+		<extends name="java/lang/Object" />
 		<field name="EMAIL" />
 		<field name="NICKNAME" />
 		<field name="ORGANIZATION" />
@@ -16784,12 +16511,15 @@
 		<field name="UNDEFINED" />
 	</class>
 	<class name="android/provider/ContactsContract$DisplayPhoto" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_MAX_DIMENSIONS_URI" />
 		<field name="CONTENT_URI" />
 		<field name="DISPLAY_MAX_DIM" />
 		<field name="THUMBNAIL_MAX_DIM" />
 	</class>
 	<class name="android/provider/ContactsContract$FullNameStyle" since="11">
+		<extends name="java/lang/Object" />
 		<field name="CHINESE" />
 		<field name="CJK" />
 		<field name="JAPANESE" />
@@ -16802,6 +16532,7 @@
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$GroupsColumns" />
 		<implements name="android/provider/ContactsContract$SyncColumns" />
+		<method name="&lt;init>()V" />
 		<method name="newEntityIterator(Landroid/database/Cursor;)Landroid/content/EntityIterator;" since="8" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="CONTENT_SUMMARY_URI" />
@@ -16809,6 +16540,7 @@
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/ContactsContract$GroupsColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="AUTO_ADD" since="11" />
 		<field name="DATA_SET" since="14" />
 		<field name="DELETED" />
@@ -16872,14 +16604,17 @@
 		<implements name="android/provider/ContactsContract$ContactOptionsColumns" />
 		<implements name="android/provider/ContactsContract$ContactsColumns" />
 		<implements name="android/provider/ContactsContract$PhoneLookupColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_FILTER_URI" />
 	</class>
 	<class name="android/provider/ContactsContract$PhoneLookupColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="LABEL" />
 		<field name="NUMBER" />
 		<field name="TYPE" />
 	</class>
 	<class name="android/provider/ContactsContract$PhoneticNameStyle" since="11">
+		<extends name="java/lang/Object" />
 		<field name="JAPANESE" />
 		<field name="KOREAN" />
 		<field name="PINYIN" />
@@ -16890,6 +16625,7 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/provider/ContactsContract$PresenceColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="CUSTOM_PROTOCOL" />
 		<field name="DATA_ID" />
 		<field name="IM_ACCOUNT" />
@@ -16897,18 +16633,22 @@
 		<field name="PROTOCOL" />
 	</class>
 	<class name="android/provider/ContactsContract$Profile" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$ContactNameColumns" />
 		<implements name="android/provider/ContactsContract$ContactOptionsColumns" />
 		<implements name="android/provider/ContactsContract$ContactStatusColumns" />
 		<implements name="android/provider/ContactsContract$ContactsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_RAW_CONTACTS_URI" />
 		<field name="CONTENT_URI" />
 		<field name="CONTENT_VCARD_URI" />
 		<field name="MIN_ID" />
 	</class>
 	<class name="android/provider/ContactsContract$ProfileSyncState" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/SyncStateContract$Columns" />
+		<method name="&lt;init>()V" />
 		<method name="get(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)[B" />
 		<method name="getWithUri(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)Landroid/util/Pair;" />
 		<method name="newSetOperation(Landroid/accounts/Account;[B)Landroid/content/ContentProviderOperation;" />
@@ -16928,10 +16668,11 @@
 	<class name="android/provider/ContactsContract$RawContacts" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
+		<implements name="android/provider/ContactsContract$ContactNameColumns" since="11" />
 		<implements name="android/provider/ContactsContract$ContactOptionsColumns" />
 		<implements name="android/provider/ContactsContract$RawContactsColumns" />
 		<implements name="android/provider/ContactsContract$SyncColumns" />
-		<implements name="android/provider/ContactsContract$ContactNameColumns" since="11" />
+		<method name="&lt;init>()V" />
 		<method name="getContactLookupUri(Landroid/content/ContentResolver;Landroid/net/Uri;)Landroid/net/Uri;" />
 		<method name="newEntityIterator(Landroid/database/Cursor;)Landroid/content/EntityIterator;" since="8" />
 		<field name="AGGREGATION_MODE_DEFAULT" />
@@ -16946,24 +16687,31 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$DataColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 	</class>
 	<class name="android/provider/ContactsContract$RawContacts$DisplayPhoto" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 	</class>
 	<class name="android/provider/ContactsContract$RawContacts$Entity" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$DataColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="DATA_ID" />
 	</class>
 	<class name="android/provider/ContactsContract$RawContacts$StreamItems" since="15">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$StreamItemsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 	</class>
 	<class name="android/provider/ContactsContract$RawContactsColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="AGGREGATION_MODE" />
 		<field name="CONTACT_ID" />
 		<field name="DATA_SET" since="14" />
@@ -16976,6 +16724,7 @@
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$DataColumns" />
 		<implements name="android/provider/ContactsContract$RawContactsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_TYPE" />
 		<field name="CONTENT_URI" />
 		<field name="DATA_ID" />
@@ -16984,11 +16733,13 @@
 	<class name="android/provider/ContactsContract$Settings" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$SettingsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="CONTENT_TYPE" />
 		<field name="CONTENT_URI" />
 	</class>
 	<class name="android/provider/ContactsContract$SettingsColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="ACCOUNT_NAME" />
 		<field name="ACCOUNT_TYPE" />
 		<field name="ANY_UNSYNCED" />
@@ -16999,6 +16750,7 @@
 		<field name="UNGROUPED_WITH_PHONES" />
 	</class>
 	<class name="android/provider/ContactsContract$StatusColumns" since="5">
+		<extends name="java/lang/Object" />
 		<field name="AVAILABLE" since="8" />
 		<field name="AWAY" since="8" />
 		<field name="CAPABILITY_HAS_CAMERA" since="11" />
@@ -17022,6 +16774,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$PresenceColumns" />
 		<implements name="android/provider/ContactsContract$StatusColumns" />
+		<method name="&lt;init>()V" />
 		<method name="getPresenceIconResourceId(I)I" />
 		<method name="getPresencePrecedence(I)I" />
 		<field name="CONTENT_ITEM_TYPE" />
@@ -17030,11 +16783,14 @@
 		<field name="PROFILE_CONTENT_URI" since="14" />
 	</class>
 	<class name="android/provider/ContactsContract$StreamItemPhotos" since="15">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$StreamItemPhotosColumns" />
+		<method name="&lt;init>()V" />
 		<field name="PHOTO" />
 	</class>
 	<class name="android/provider/ContactsContract$StreamItemPhotosColumns" since="15">
+		<extends name="java/lang/Object" />
 		<field name="PHOTO_FILE_ID" />
 		<field name="PHOTO_URI" />
 		<field name="SORT_INDEX" />
@@ -17045,8 +16801,10 @@
 		<field name="SYNC4" />
 	</class>
 	<class name="android/provider/ContactsContract$StreamItems" since="15">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$StreamItemsColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="CONTENT_LIMIT_URI" />
 		<field name="CONTENT_PHOTO_URI" />
@@ -17055,13 +16813,16 @@
 		<field name="MAX_ITEMS" />
 	</class>
 	<class name="android/provider/ContactsContract$StreamItems$StreamItemPhotos" since="15">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/ContactsContract$StreamItemPhotosColumns" />
+		<method name="&lt;init>()V" />
 		<field name="CONTENT_DIRECTORY" />
 		<field name="CONTENT_ITEM_TYPE" />
 		<field name="CONTENT_TYPE" />
 	</class>
 	<class name="android/provider/ContactsContract$StreamItemsColumns" since="15">
+		<extends name="java/lang/Object" />
 		<field name="ACCOUNT_NAME" />
 		<field name="ACCOUNT_TYPE" />
 		<field name="COMMENTS" />
@@ -17081,6 +16842,7 @@
 		<field name="TIMESTAMP" />
 	</class>
 	<class name="android/provider/ContactsContract$SyncColumns" since="5">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/ContactsContract$BaseSyncColumns" />
 		<field name="ACCOUNT_NAME" />
 		<field name="ACCOUNT_TYPE" />
@@ -17091,6 +16853,7 @@
 	<class name="android/provider/ContactsContract$SyncState" since="5">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/SyncStateContract$Columns" />
+		<method name="&lt;init>()V" />
 		<method name="get(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)[B" />
 		<method name="getWithUri(Landroid/content/ContentProviderClient;Landroid/accounts/Account;)Landroid/util/Pair;" />
 		<method name="newSetOperation(Landroid/accounts/Account;[B)Landroid/content/ContentProviderOperation;" />
@@ -17101,6 +16864,7 @@
 	<class name="android/provider/LiveFolders" since="3">
 		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
+		<method name="&lt;init>()V" />
 		<field name="ACTION_CREATE_LIVE_FOLDER" />
 		<field name="DESCRIPTION" />
 		<field name="DISPLAY_MODE_GRID" />
@@ -17150,6 +16914,7 @@
 		<method name="keyFor(Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="android/provider/MediaStore$Audio$AlbumColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="ALBUM" />
 		<field name="ALBUM_ART" />
 		<field name="ALBUM_ID" />
@@ -17173,6 +16938,7 @@
 		<field name="INTERNAL_CONTENT_URI" />
 	</class>
 	<class name="android/provider/MediaStore$Audio$ArtistColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="ARTIST" />
 		<field name="ARTIST_KEY" />
 		<field name="NUMBER_OF_ALBUMS" />
@@ -17197,6 +16963,7 @@
 		<method name="getContentUri(Ljava/lang/String;J)Landroid/net/Uri;" />
 	</class>
 	<class name="android/provider/MediaStore$Audio$AudioColumns" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/MediaStore$MediaColumns" />
 		<field name="ALBUM" />
 		<field name="ALBUM_ART" />
@@ -17241,6 +17008,7 @@
 		<field name="GENRE_ID" />
 	</class>
 	<class name="android/provider/MediaStore$Audio$GenresColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="NAME" />
 	</class>
 	<class name="android/provider/MediaStore$Audio$Media" since="1">
@@ -17282,6 +17050,7 @@
 		<field name="_ID" />
 	</class>
 	<class name="android/provider/MediaStore$Audio$PlaylistsColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="DATA" />
 		<field name="DATE_ADDED" />
 		<field name="DATE_MODIFIED" />
@@ -17294,6 +17063,7 @@
 		<method name="getContentUri(Ljava/lang/String;J)Landroid/net/Uri;" />
 	</class>
 	<class name="android/provider/MediaStore$Files$FileColumns" since="11">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/MediaStore$MediaColumns" />
 		<field name="MEDIA_TYPE" />
 		<field name="MEDIA_TYPE_AUDIO" />
@@ -17310,6 +17080,7 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/provider/MediaStore$Images$ImageColumns" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/MediaStore$MediaColumns" />
 		<field name="BUCKET_DISPLAY_NAME" />
 		<field name="BUCKET_ID" />
@@ -17364,6 +17135,7 @@
 		<field name="WIDTH" />
 	</class>
 	<class name="android/provider/MediaStore$MediaColumns" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<field name="DATA" />
 		<field name="DATE_ADDED" />
@@ -17411,6 +17183,7 @@
 		<field name="WIDTH" />
 	</class>
 	<class name="android/provider/MediaStore$Video$VideoColumns" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/MediaStore$MediaColumns" />
 		<field name="ALBUM" />
 		<field name="ARTIST" />
@@ -17430,6 +17203,7 @@
 		<field name="TAGS" />
 	</class>
 	<class name="android/provider/OpenableColumns" since="1">
+		<extends name="java/lang/Object" />
 		<field name="DISPLAY_NAME" />
 		<field name="SIZE" />
 	</class>
@@ -17708,6 +17482,7 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/provider/SyncStateContract$Columns" since="5">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<field name="ACCOUNT_NAME" />
 		<field name="ACCOUNT_TYPE" />
@@ -17754,6 +17529,8 @@
 		<field name="_ID" />
 	</class>
 	<class name="android/provider/VoicemailContract" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="ACTION_FETCH_VOICEMAIL" />
 		<field name="ACTION_NEW_VOICEMAIL" />
 		<field name="AUTHORITY" />
@@ -17761,7 +17538,9 @@
 		<field name="PARAM_KEY_SOURCE_PACKAGE" />
 	</class>
 	<class name="android/provider/VoicemailContract$Status" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
+		<method name="&lt;init>()V" />
 		<method name="buildSourceUri(Ljava/lang/String;)Landroid/net/Uri;" />
 		<field name="CONFIGURATION_STATE" />
 		<field name="CONFIGURATION_STATE_CAN_BE_CONFIGURED" />
@@ -17782,8 +17561,10 @@
 		<field name="VOICEMAIL_ACCESS_URI" />
 	</class>
 	<class name="android/provider/VoicemailContract$Voicemails" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/provider/BaseColumns" />
 		<implements name="android/provider/OpenableColumns" />
+		<method name="&lt;init>()V" />
 		<method name="buildSourceUri(Ljava/lang/String;)Landroid/net/Uri;" />
 		<field name="CONTENT_URI" />
 		<field name="DATE" />
@@ -17799,6 +17580,7 @@
 	</class>
 	<class name="android/renderscript/Allocation" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="copy1DRangeFrom(IILandroid/renderscript/Allocation;I)V" since="14" />
 		<method name="copy1DRangeFrom(II[B)V" />
 		<method name="copy1DRangeFrom(II[F)V" />
@@ -17865,6 +17647,7 @@
 	</class>
 	<class name="android/renderscript/AllocationAdapter" since="11">
 		<extends name="android/renderscript/Allocation" />
+		<method name="&lt;init>()V" />
 		<method name="create1D(Landroid/renderscript/RenderScript;Landroid/renderscript/Allocation;)Landroid/renderscript/AllocationAdapter;" since="14" />
 		<method name="create2D(Landroid/renderscript/RenderScript;Landroid/renderscript/Allocation;)Landroid/renderscript/AllocationAdapter;" />
 		<method name="readData([F)V" />
@@ -17884,6 +17667,7 @@
 	</class>
 	<class name="android/renderscript/BaseObj" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="destroy()V" />
 		<method name="getName()Ljava/lang/String;" since="14" />
 		<method name="setName(Ljava/lang/String;)V" />
@@ -17913,12 +17697,14 @@
 		<field name="z" />
 	</class>
 	<class name="android/renderscript/Double2" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(DD)V" />
 		<field name="x" />
 		<field name="y" />
 	</class>
 	<class name="android/renderscript/Double3" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(DDD)V" />
 		<field name="x" />
@@ -17926,6 +17712,7 @@
 		<field name="z" />
 	</class>
 	<class name="android/renderscript/Double4" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(DDDD)V" />
 		<field name="w" />
@@ -17935,6 +17722,7 @@
 	</class>
 	<class name="android/renderscript/Element" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="ALLOCATION(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;" />
 		<method name="A_8(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;" />
 		<method name="BOOLEAN(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;" />
@@ -18108,6 +17896,7 @@
 	</class>
 	<class name="android/renderscript/FileA3D" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="createFromAsset(Landroid/renderscript/RenderScript;Landroid/content/res/AssetManager;Ljava/lang/String;)Landroid/renderscript/FileA3D;" />
 		<method name="createFromFile(Landroid/renderscript/RenderScript;Ljava/io/File;)Landroid/renderscript/FileA3D;" />
 		<method name="createFromFile(Landroid/renderscript/RenderScript;Ljava/lang/String;)Landroid/renderscript/FileA3D;" />
@@ -18124,6 +17913,7 @@
 	</class>
 	<class name="android/renderscript/FileA3D$IndexEntry" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getEntryType()Landroid/renderscript/FileA3D$EntryType;" />
 		<method name="getMesh()Landroid/renderscript/Mesh;" />
 		<method name="getName()Ljava/lang/String;" />
@@ -18155,6 +17945,7 @@
 	</class>
 	<class name="android/renderscript/Font" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="create(Landroid/renderscript/RenderScript;Landroid/content/res/Resources;Ljava/lang/String;Landroid/renderscript/Font$Style;F)Landroid/renderscript/Font;" />
 		<method name="createFromAsset(Landroid/renderscript/RenderScript;Landroid/content/res/Resources;Ljava/lang/String;F)Landroid/renderscript/Font;" />
 		<method name="createFromFile(Landroid/renderscript/RenderScript;Landroid/content/res/Resources;Ljava/io/File;F)Landroid/renderscript/Font;" />
@@ -18286,6 +18077,7 @@
 	</class>
 	<class name="android/renderscript/Mesh" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="getIndexSetAllocation(I)Landroid/renderscript/Allocation;" />
 		<method name="getPrimitive(I)Landroid/renderscript/Mesh$Primitive;" />
 		<method name="getPrimitiveCount()I" />
@@ -18341,6 +18133,7 @@
 	</class>
 	<class name="android/renderscript/Program" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="bindConstants(Landroid/renderscript/Allocation;I)V" />
 		<method name="bindSampler(Landroid/renderscript/Sampler;I)V" />
 		<method name="bindTexture(Landroid/renderscript/Allocation;I)V" />
@@ -18365,6 +18158,7 @@
 	</class>
 	<class name="android/renderscript/ProgramFragment" since="11">
 		<extends name="android/renderscript/Program" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/renderscript/ProgramFragment$Builder" since="11">
 		<extends name="android/renderscript/Program$BaseProgramBuilder" />
@@ -18373,6 +18167,7 @@
 	</class>
 	<class name="android/renderscript/ProgramFragmentFixedFunction" since="11">
 		<extends name="android/renderscript/ProgramFragment" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/renderscript/ProgramFragmentFixedFunction$Builder" since="11">
 		<extends name="java/lang/Object" />
@@ -18402,6 +18197,7 @@
 	</class>
 	<class name="android/renderscript/ProgramRaster" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="CULL_BACK(Landroid/renderscript/RenderScript;)Landroid/renderscript/ProgramRaster;" />
 		<method name="CULL_FRONT(Landroid/renderscript/RenderScript;)Landroid/renderscript/ProgramRaster;" />
 		<method name="CULL_NONE(Landroid/renderscript/RenderScript;)Landroid/renderscript/ProgramRaster;" />
@@ -18423,6 +18219,7 @@
 	</class>
 	<class name="android/renderscript/ProgramStore" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="BLEND_ALPHA_DEPTH_NONE(Landroid/renderscript/RenderScript;)Landroid/renderscript/ProgramStore;" />
 		<method name="BLEND_ALPHA_DEPTH_TEST(Landroid/renderscript/RenderScript;)Landroid/renderscript/ProgramStore;" />
 		<method name="BLEND_NONE_DEPTH_NONE(Landroid/renderscript/RenderScript;)Landroid/renderscript/ProgramStore;" />
@@ -18479,6 +18276,7 @@
 	</class>
 	<class name="android/renderscript/ProgramVertex" since="11">
 		<extends name="android/renderscript/Program" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/renderscript/ProgramVertex$Builder" since="11">
 		<extends name="android/renderscript/Program$BaseProgramBuilder" />
@@ -18488,6 +18286,7 @@
 	</class>
 	<class name="android/renderscript/ProgramVertexFixedFunction" since="11">
 		<extends name="android/renderscript/ProgramVertex" />
+		<method name="&lt;init>()V" />
 		<method name="bindConstants(Landroid/renderscript/ProgramVertexFixedFunction$Constants;)V" />
 	</class>
 	<class name="android/renderscript/ProgramVertexFixedFunction$Builder" since="11">
@@ -18531,9 +18330,6 @@
 		<method name="pause()V" />
 		<method name="resume()V" />
 		<method name="setRenderScriptGL(Landroid/renderscript/RenderScriptGL;)V" />
-		<method name="surfaceChanged(Landroid/view/SurfaceHolder;III)V" />
-		<method name="surfaceCreated(Landroid/view/SurfaceHolder;)V" />
-		<method name="surfaceDestroyed(Landroid/view/SurfaceHolder;)V" />
 	</class>
 	<class name="android/renderscript/RSTextureView" since="14">
 		<extends name="android/view/TextureView" />
@@ -18543,16 +18339,13 @@
 		<method name="createRenderScriptGL(Landroid/renderscript/RenderScriptGL$SurfaceConfig;)Landroid/renderscript/RenderScriptGL;" />
 		<method name="destroyRenderScriptGL()V" />
 		<method name="getRenderScriptGL()Landroid/renderscript/RenderScriptGL;" />
-		<method name="onSurfaceTextureAvailable(Landroid/graphics/SurfaceTexture;II)V" />
-		<method name="onSurfaceTextureDestroyed(Landroid/graphics/SurfaceTexture;)Z" />
-		<method name="onSurfaceTextureSizeChanged(Landroid/graphics/SurfaceTexture;II)V" />
-		<method name="onSurfaceTextureUpdated(Landroid/graphics/SurfaceTexture;)V" />
 		<method name="pause()V" />
 		<method name="resume()V" />
 		<method name="setRenderScriptGL(Landroid/renderscript/RenderScriptGL;)V" />
 	</class>
 	<class name="android/renderscript/RenderScript" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="contextDump()V" />
 		<method name="create(Landroid/content/Context;)Landroid/renderscript/RenderScript;" />
 		<method name="destroy()V" />
@@ -18575,7 +18368,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Runnable" />
 		<method name="&lt;init>()V" />
-		<method name="run()V" />
 		<field name="mErrorMessage" />
 		<field name="mErrorNum" />
 	</class>
@@ -18583,7 +18375,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Runnable" />
 		<method name="&lt;init>()V" />
-		<method name="run()V" />
 		<field name="mData" />
 		<field name="mID" />
 		<field name="mLength" />
@@ -18614,6 +18405,7 @@
 	</class>
 	<class name="android/renderscript/Sampler" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="CLAMP_LINEAR(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;" />
 		<method name="CLAMP_LINEAR_MIP_LINEAR(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;" />
 		<method name="CLAMP_NEAREST(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;" />
@@ -18644,6 +18436,7 @@
 	</class>
 	<class name="android/renderscript/Script" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="bindAllocation(Landroid/renderscript/Allocation;I)V" />
 		<method name="forEach(ILandroid/renderscript/Allocation;Landroid/renderscript/Allocation;Landroid/renderscript/FieldPacker;)V" since="14" />
 		<method name="invoke(I)V" />
@@ -18659,6 +18452,7 @@
 	</class>
 	<class name="android/renderscript/Script$Builder" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/renderscript/Script$FieldBase" since="11">
 		<extends name="java/lang/Object" />
@@ -18703,6 +18497,7 @@
 	</class>
 	<class name="android/renderscript/Type" since="11">
 		<extends name="android/renderscript/BaseObj" />
+		<method name="&lt;init>()V" />
 		<method name="getCount()I" />
 		<method name="getElement()Landroid/renderscript/Element;" />
 		<method name="getX()I" />
@@ -18736,6 +18531,7 @@
 	</class>
 	<class name="android/sax/Element" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getChild(Ljava/lang/String;)Landroid/sax/Element;" />
 		<method name="getChild(Ljava/lang/String;Ljava/lang/String;)Landroid/sax/Element;" />
 		<method name="requireChild(Ljava/lang/String;)Landroid/sax/Element;" />
@@ -18747,13 +18543,16 @@
 		<method name="setTextElementListener(Landroid/sax/TextElementListener;)V" />
 	</class>
 	<class name="android/sax/ElementListener" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/sax/EndElementListener" />
 		<implements name="android/sax/StartElementListener" />
 	</class>
 	<class name="android/sax/EndElementListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="end()V" />
 	</class>
 	<class name="android/sax/EndTextElementListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="end(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/sax/RootElement" since="1">
@@ -18763,13 +18562,16 @@
 		<method name="getContentHandler()Lorg/xml/sax/ContentHandler;" />
 	</class>
 	<class name="android/sax/StartElementListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="start(Lorg/xml/sax/Attributes;)V" />
 	</class>
 	<class name="android/sax/TextElementListener" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/sax/EndTextElementListener" />
 		<implements name="android/sax/StartElementListener" />
 	</class>
 	<class name="android/security/KeyChain" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="choosePrivateKeyAlias(Landroid/app/Activity;Landroid/security/KeyChainAliasCallback;[Ljava/lang/String;[Ljava/security/Principal;Ljava/lang/String;ILjava/lang/String;)V" />
 		<method name="createInstallIntent()Landroid/content/Intent;" />
@@ -18780,6 +18582,7 @@
 		<field name="EXTRA_PKCS12" />
 	</class>
 	<class name="android/security/KeyChainAliasCallback" since="14">
+		<extends name="java/lang/Object" />
 		<method name="alias(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/security/KeyChainException" since="14">
@@ -18793,10 +18596,10 @@
 		<extends name="android/app/Service" />
 		<method name="&lt;init>()V" />
 		<method name="createSession()Landroid/service/textservice/SpellCheckerService$Session;" />
-		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
 		<field name="SERVICE_INTERFACE" />
 	</class>
 	<class name="android/service/textservice/SpellCheckerService$Session" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="getBundle()Landroid/os/Bundle;" />
 		<method name="getLocale()Ljava/lang/String;" />
@@ -18809,14 +18612,13 @@
 	<class name="android/service/wallpaper/WallpaperService" since="7">
 		<extends name="android/app/Service" />
 		<method name="&lt;init>()V" />
-		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
 		<method name="onCreateEngine()Landroid/service/wallpaper/WallpaperService$Engine;" />
 		<field name="SERVICE_INTERFACE" />
 		<field name="SERVICE_META_DATA" />
 	</class>
 	<class name="android/service/wallpaper/WallpaperService$Engine" since="7">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>()V" />
+		<method name="&lt;init>(Landroid/service/wallpaper/WallpaperService;)V" />
 		<method name="dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V" since="14" />
 		<method name="getDesiredMinimumHeight()I" />
 		<method name="getDesiredMinimumWidth()I" />
@@ -18838,6 +18640,7 @@
 		<method name="setTouchEventsEnabled(Z)V" />
 	</class>
 	<class name="android/speech/RecognitionListener" since="8">
+		<extends name="java/lang/Object" />
 		<method name="onBeginningOfSpeech()V" />
 		<method name="onBufferReceived([B)V" />
 		<method name="onEndOfSpeech()V" />
@@ -18851,7 +18654,6 @@
 	<class name="android/speech/RecognitionService" since="8">
 		<extends name="android/app/Service" />
 		<method name="&lt;init>()V" />
-		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
 		<method name="onCancel(Landroid/speech/RecognitionService$Callback;)V" />
 		<method name="onStartListening(Landroid/content/Intent;Landroid/speech/RecognitionService$Callback;)V" />
 		<method name="onStopListening(Landroid/speech/RecognitionService$Callback;)V" />
@@ -18860,6 +18662,7 @@
 	</class>
 	<class name="android/speech/RecognitionService$Callback" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/speech/RecognitionService;)V" />
 		<method name="beginningOfSpeech()V" />
 		<method name="bufferReceived([B)V" />
 		<method name="endOfSpeech()V" />
@@ -18871,6 +18674,7 @@
 	</class>
 	<class name="android/speech/RecognizerIntent" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getVoiceDetailsIntent(Landroid/content/Context;)Landroid/content/Intent;" since="8" />
 		<field name="ACTION_GET_LANGUAGE_DETAILS" since="8" />
 		<field name="ACTION_RECOGNIZE_SPEECH" />
@@ -18904,6 +18708,7 @@
 	</class>
 	<class name="android/speech/RecognizerResultsIntent" since="10">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="ACTION_VOICE_SEARCH_RESULTS" />
 		<field name="EXTRA_VOICE_SEARCH_RESULT_HTML" />
 		<field name="EXTRA_VOICE_SEARCH_RESULT_HTML_BASE_URLS" />
@@ -18914,6 +18719,7 @@
 	</class>
 	<class name="android/speech/SpeechRecognizer" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="cancel()V" />
 		<method name="createSpeechRecognizer(Landroid/content/Context;)Landroid/speech/SpeechRecognizer;" />
 		<method name="createSpeechRecognizer(Landroid/content/Context;Landroid/content/ComponentName;)Landroid/speech/SpeechRecognizer;" />
@@ -18935,6 +18741,7 @@
 		<field name="RESULTS_RECOGNITION" />
 	</class>
 	<class name="android/speech/tts/SynthesisCallback" since="14">
+		<extends name="java/lang/Object" />
 		<method name="audioAvailable([BII)I" />
 		<method name="done()I" />
 		<method name="error()V" />
@@ -18942,6 +18749,7 @@
 		<method name="start(III)I" />
 	</class>
 	<class name="android/speech/tts/SynthesisRequest" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/lang/String;Landroid/os/Bundle;)V" />
 		<method name="getCountry()Ljava/lang/String;" />
 		<method name="getLanguage()Ljava/lang/String;" />
@@ -18991,7 +18799,7 @@
 	</class>
 	<class name="android/speech/tts/TextToSpeech$Engine" since="4">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>()V" />
+		<method name="&lt;init>(Landroid/speech/tts/TextToSpeech;)V" />
 		<field name="ACTION_CHECK_TTS_DATA" />
 		<field name="ACTION_INSTALL_TTS_DATA" />
 		<field name="ACTION_TTS_DATA_INSTALLED" />
@@ -19018,21 +18826,23 @@
 		<field name="SERVICE_META_DATA" since="14" />
 	</class>
 	<class name="android/speech/tts/TextToSpeech$EngineInfo" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<field name="icon" />
 		<field name="label" />
 		<field name="name" />
 	</class>
 	<class name="android/speech/tts/TextToSpeech$OnInitListener" since="4">
+		<extends name="java/lang/Object" />
 		<method name="onInit(I)V" />
 	</class>
 	<class name="android/speech/tts/TextToSpeech$OnUtteranceCompletedListener" since="4">
+		<extends name="java/lang/Object" />
 		<method name="onUtteranceCompleted(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/speech/tts/TextToSpeechService" since="14">
 		<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;" since="15" />
 		<method name="onGetLanguage()[Ljava/lang/String;" />
 		<method name="onIsLanguageAvailable(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I" />
@@ -19041,6 +18851,7 @@
 		<method name="onSynthesizeText(Landroid/speech/tts/SynthesisRequest;Landroid/speech/tts/SynthesisCallback;)V" />
 	</class>
 	<class name="android/speech/tts/UtteranceProgressListener" since="15">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="onDone(Ljava/lang/String;)V" />
 		<method name="onError(Ljava/lang/String;)V" />
@@ -19059,7 +18870,6 @@
 		<method name="&lt;init>(II)V" />
 		<method name="&lt;init>(ILjava/lang/String;I)V" since="7" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
-		<method name="describeContents()I" />
 		<method name="getCid()I" />
 		<method name="getLac()I" since="5" />
 		<method name="getNetworkType()I" since="5" />
@@ -19067,7 +18877,6 @@
 		<method name="getRssi()I" />
 		<method name="setCid(I)V" />
 		<method name="setRssi(I)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="UNKNOWN_CID" />
 		<field name="UNKNOWN_RSSI" />
@@ -19076,9 +18885,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/text/TextWatcher" />
 		<method name="&lt;init>()V" />
-		<method name="afterTextChanged(Landroid/text/Editable;)V" />
-		<method name="beforeTextChanged(Ljava/lang/CharSequence;III)V" />
-		<method name="onTextChanged(Ljava/lang/CharSequence;III)V" />
 	</class>
 	<class name="android/telephony/PhoneNumberUtils" since="1">
 		<extends name="java/lang/Object" />
@@ -19153,7 +18959,6 @@
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Landroid/telephony/ServiceState;)V" />
 		<method name="copyFrom(Landroid/telephony/ServiceState;)V" />
-		<method name="describeContents()I" />
 		<method name="getIsManualSelection()Z" />
 		<method name="getOperatorAlphaLong()Ljava/lang/String;" />
 		<method name="getOperatorAlphaShort()Ljava/lang/String;" />
@@ -19166,7 +18971,6 @@
 		<method name="setState(I)V" />
 		<method name="setStateOff()V" />
 		<method name="setStateOutOfService()V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="STATE_EMERGENCY_ONLY" />
 		<field name="STATE_IN_SERVICE" />
@@ -19176,7 +18980,7 @@
 	<class name="android/telephony/SignalStrength" since="7">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getCdmaDbm()I" />
 		<method name="getCdmaEcio()I" />
 		<method name="getEvdoDbm()I" />
@@ -19185,10 +18989,10 @@
 		<method name="getGsmBitErrorRate()I" />
 		<method name="getGsmSignalStrength()I" />
 		<method name="isGsm()Z" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 	</class>
 	<class name="android/telephony/SmsManager" since="4">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<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" />
@@ -19206,6 +19010,7 @@
 	</class>
 	<class name="android/telephony/SmsMessage" since="4">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="calculateLength(Ljava/lang/CharSequence;Z)[I" />
 		<method name="calculateLength(Ljava/lang/String;Z)[I" />
 		<method name="createFromPdu([B)Landroid/telephony/SmsMessage;" />
@@ -19259,11 +19064,13 @@
 	</class>
 	<class name="android/telephony/SmsMessage$SubmitPdu" since="4">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="encodedMessage" />
 		<field name="encodedScAddress" />
 	</class>
 	<class name="android/telephony/TelephonyManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getCallState()I" />
 		<method name="getCellLocation()Landroid/telephony/CellLocation;" />
 		<method name="getDataActivity()I" />
@@ -19360,6 +19167,7 @@
 	</class>
 	<class name="android/telephony/gsm/SmsManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<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" />
@@ -19436,14 +19244,12 @@
 		<extends name="android/test/ActivityTestCase" />
 		<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;)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" />
 	</class>
@@ -19457,7 +19263,6 @@
 	<class name="android/test/ActivityUnitTestCase" since="1">
 		<extends name="android/test/ActivityTestCase" />
 		<method name="&lt;init>(Ljava/lang/Class;)V" />
-		<method name="getActivity()LT;" />
 		<method name="getFinishedActivityRequest()I" />
 		<method name="getRequestedOrientation()I" />
 		<method name="getStartedActivityIntent()Landroid/content/Intent;" />
@@ -19465,7 +19270,7 @@
 		<method name="isFinishCalled()Z" />
 		<method name="setActivityContext(Landroid/content/Context;)V" />
 		<method name="setApplication(Landroid/app/Application;)V" />
-		<method name="startActivity(Landroid/content/Intent;Landroid/os/Bundle;Ljava/lang/Object;)LT;" />
+		<method name="startActivity(Landroid/content/Intent;Landroid/os/Bundle;Ljava/lang/Object;)Landroid/app/Activity;" />
 	</class>
 	<class name="android/test/AndroidTestCase" since="1">
 		<extends name="junit/framework/TestCase" />
@@ -19488,7 +19293,6 @@
 		<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" />
 		<method name="runTest()V" />
 		<method name="runTest(Ljunit/framework/TestResult;)V" />
 		<method name="setContext(Landroid/content/Context;)V" />
@@ -19496,15 +19300,12 @@
 		<method name="setInstrumentation(Landroid/app/Instrumentation;)V" since="5" />
 		<method name="setTest(Ljunit/framework/Test;)V" />
 		<method name="setTestClassName(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="testEnded(Ljava/lang/String;)V" />
-		<method name="testFailed(ILjunit/framework/Test;Ljava/lang/Throwable;)V" />
-		<method name="testStarted(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/test/ApplicationTestCase" since="1">
 		<extends name="android/test/AndroidTestCase" />
 		<method name="&lt;init>(Ljava/lang/Class;)V" />
 		<method name="createApplication()V" />
-		<method name="getApplication()LT;" />
+		<method name="getApplication()Landroid/app/Application;" />
 		<method name="getSystemContext()Landroid/content/Context;" />
 		<method name="terminateApplication()V" />
 		<method name="testApplicationTestCaseSetUpProperly()V" />
@@ -19521,6 +19322,7 @@
 	<class name="android/test/FlakyTest" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="tolerance()I" />
 	</class>
 	<class name="android/test/InstrumentationTestCase" since="1">
 		<extends name="junit/framework/TestCase" />
@@ -19528,8 +19330,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;Landroid/os/Bundle;)LT;" />
-		<method name="launchActivityWithIntent(Ljava/lang/String;Ljava/lang/Class;Landroid/content/Intent;)LT;" since="3" />
+		<method name="launchActivity(Ljava/lang/String;Ljava/lang/Class;Landroid/os/Bundle;)Landroid/app/Activity;" />
+		<method name="launchActivityWithIntent(Ljava/lang/String;Ljava/lang/Class;Landroid/content/Intent;)Landroid/app/Activity;" since="3" />
 		<method name="runTestOnUiThread(Ljava/lang/Runnable;)V" since="3" />
 		<method name="sendKeys(Ljava/lang/String;)V" />
 		<method name="sendKeys([I)V" />
@@ -19542,7 +19344,6 @@
 		<method name="getAllTests()Ljunit/framework/TestSuite;" />
 		<method name="getAndroidTestRunner()Landroid/test/AndroidTestRunner;" />
 		<method name="getLoader()Ljava/lang/ClassLoader;" />
-		<method name="getTestSuite()Ljunit/framework/TestSuite;" />
 		<field name="REPORT_KEY_NAME_CLASS" />
 		<field name="REPORT_KEY_NAME_TEST" />
 		<field name="REPORT_KEY_NUM_CURRENT" />
@@ -19568,10 +19369,11 @@
 	<class name="android/test/LoaderTestCase" since="11">
 		<extends name="android/test/AndroidTestCase" />
 		<method name="&lt;init>()V" />
-		<method name="getLoaderResultSynchronously(Landroid/content/Loader;)LT;" />
+		<method name="getLoaderResultSynchronously(Landroid/content/Loader;)Ljava/lang/Object;" />
 	</class>
 	<class name="android/test/MoreAsserts" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()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;" />
@@ -19610,10 +19412,12 @@
 		<method name="checkEqualsAndHashCodeMethods(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Z)V" />
 	</class>
 	<class name="android/test/PerformanceTestCase" since="1">
+		<extends name="java/lang/Object" />
 		<method name="isPerformanceOnly()Z" />
 		<method name="startPerformance(Landroid/test/PerformanceTestCase$Intermediates;)I" />
 	</class>
 	<class name="android/test/PerformanceTestCase$Intermediates" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addIntermediate(Ljava/lang/String;)V" />
 		<method name="addIntermediate(Ljava/lang/String;J)V" />
 		<method name="finishTiming(Z)V" />
@@ -19625,7 +19429,7 @@
 		<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="getProvider()Landroid/content/ContentProvider;" />
 		<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">
@@ -19633,7 +19437,7 @@
 		<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="getProvider()Landroid/content/ContentProvider;" />
 		<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">
@@ -19642,15 +19446,15 @@
 		<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;Landroid/content/Context;Ljava/lang/String;)LT;" />
-		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;Z)LT;" />
+		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;)Landroid/content/ContentProvider;" />
+		<method name="providerWithRenamedContext(Ljava/lang/Class;Landroid/content/Context;Ljava/lang/String;Z)Landroid/content/ContentProvider;" />
 	</class>
 	<class name="android/test/ServiceTestCase" since="1">
 		<extends name="android/test/AndroidTestCase" />
 		<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;" />
+		<method name="getService()Landroid/app/Service;" />
 		<method name="getSystemContext()Landroid/content/Context;" />
 		<method name="setApplication(Landroid/app/Application;)V" />
 		<method name="setupService()V" />
@@ -19661,7 +19465,7 @@
 	<class name="android/test/SingleLaunchActivityTestCase" since="1">
 		<extends name="android/test/InstrumentationTestCase" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Class;)V" />
-		<method name="getActivity()LT;" />
+		<method name="getActivity()Landroid/app/Activity;" />
 		<method name="testActivityTestCaseSetUpProperly()V" />
 	</class>
 	<class name="android/test/SyncBaseInstrumentation" since="1">
@@ -19671,6 +19475,7 @@
 		<method name="syncProvider(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
 	<class name="android/test/TestSuiteProvider" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getTestSuite()Ljunit/framework/TestSuite;" />
 	</class>
 	<class name="android/test/TouchUtils" since="1">
@@ -19714,6 +19519,7 @@
 	</class>
 	<class name="android/test/ViewAsserts" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="assertBaselineAligned(Landroid/view/View;Landroid/view/View;)V" />
 		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;)V" />
 		<method name="assertBottomAligned(Landroid/view/View;Landroid/view/View;I)V" />
@@ -19742,12 +19548,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;[Landroid/content/pm/PathPermission;)V" />
-		<method name="delete(Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I" />
-		<method name="getType(Landroid/net/Uri;)Ljava/lang/String;" />
-		<method name="insert(Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;" />
-		<method name="onCreate()Z" />
-		<method name="query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;" />
-		<method name="update(Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I" />
 	</class>
 	<class name="android/test/mock/MockContentResolver" since="1">
 		<extends name="android/content/ContentResolver" />
@@ -19757,129 +19557,19 @@
 	<class name="android/test/mock/MockContext" since="1">
 		<extends name="android/content/Context" />
 		<method name="&lt;init>()V" />
-		<method name="bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z" />
-		<method name="checkCallingOrSelfPermission(Ljava/lang/String;)I" />
-		<method name="checkCallingOrSelfUriPermission(Landroid/net/Uri;I)I" />
-		<method name="checkCallingPermission(Ljava/lang/String;)I" />
-		<method name="checkCallingUriPermission(Landroid/net/Uri;I)I" />
-		<method name="checkPermission(Ljava/lang/String;II)I" />
-		<method name="checkUriPermission(Landroid/net/Uri;III)I" />
-		<method name="checkUriPermission(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;III)I" />
-		<method name="clearWallpaper()V" />
-		<method name="createPackageContext(Ljava/lang/String;I)Landroid/content/Context;" />
-		<method name="databaseList()[Ljava/lang/String;" />
-		<method name="deleteDatabase(Ljava/lang/String;)Z" />
-		<method name="deleteFile(Ljava/lang/String;)Z" />
-		<method name="enforceCallingOrSelfPermission(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="enforceCallingOrSelfUriPermission(Landroid/net/Uri;ILjava/lang/String;)V" />
-		<method name="enforceCallingPermission(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="enforceCallingUriPermission(Landroid/net/Uri;ILjava/lang/String;)V" />
-		<method name="enforcePermission(Ljava/lang/String;IILjava/lang/String;)V" />
-		<method name="enforceUriPermission(Landroid/net/Uri;IIILjava/lang/String;)V" />
-		<method name="enforceUriPermission(Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;IIILjava/lang/String;)V" />
-		<method name="fileList()[Ljava/lang/String;" />
-		<method name="getApplicationContext()Landroid/content/Context;" />
-		<method name="getApplicationInfo()Landroid/content/pm/ApplicationInfo;" since="4" />
-		<method name="getAssets()Landroid/content/res/AssetManager;" />
-		<method name="getCacheDir()Ljava/io/File;" />
-		<method name="getClassLoader()Ljava/lang/ClassLoader;" />
-		<method name="getContentResolver()Landroid/content/ContentResolver;" />
-		<method name="getDatabasePath(Ljava/lang/String;)Ljava/io/File;" />
-		<method name="getDir(Ljava/lang/String;I)Ljava/io/File;" />
-		<method name="getExternalCacheDir()Ljava/io/File;" since="8" />
-		<method name="getExternalFilesDir(Ljava/lang/String;)Ljava/io/File;" since="8" />
-		<method name="getFileStreamPath(Ljava/lang/String;)Ljava/io/File;" />
-		<method name="getFilesDir()Ljava/io/File;" />
-		<method name="getMainLooper()Landroid/os/Looper;" />
-		<method name="getObbDir()Ljava/io/File;" since="11" />
 		<method name="getPackageCodePath()Ljava/lang/String;" />
-		<method name="getPackageManager()Landroid/content/pm/PackageManager;" />
-		<method name="getPackageName()Ljava/lang/String;" />
 		<method name="getPackageResourcePath()Ljava/lang/String;" />
-		<method name="getResources()Landroid/content/res/Resources;" />
-		<method name="getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;" />
-		<method name="getSystemService(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="getTheme()Landroid/content/res/Resources$Theme;" />
-		<method name="getWallpaper()Landroid/graphics/drawable/Drawable;" />
-		<method name="getWallpaperDesiredMinimumHeight()I" />
-		<method name="getWallpaperDesiredMinimumWidth()I" />
-		<method name="grantUriPermission(Ljava/lang/String;Landroid/net/Uri;I)V" />
-		<method name="openFileInput(Ljava/lang/String;)Ljava/io/FileInputStream;" />
-		<method name="openFileOutput(Ljava/lang/String;I)Ljava/io/FileOutputStream;" />
-		<method name="openOrCreateDatabase(Ljava/lang/String;ILandroid/database/sqlite/SQLiteDatabase$CursorFactory;)Landroid/database/sqlite/SQLiteDatabase;" />
-		<method name="openOrCreateDatabase(Ljava/lang/String;ILandroid/database/sqlite/SQLiteDatabase$CursorFactory;Landroid/database/DatabaseErrorHandler;)Landroid/database/sqlite/SQLiteDatabase;" since="11" />
-		<method name="peekWallpaper()Landroid/graphics/drawable/Drawable;" />
-		<method name="registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;" />
-		<method name="registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;)Landroid/content/Intent;" />
-		<method name="removeStickyBroadcast(Landroid/content/Intent;)V" />
-		<method name="revokeUriPermission(Landroid/net/Uri;I)V" />
-		<method name="sendBroadcast(Landroid/content/Intent;)V" />
-		<method name="sendBroadcast(Landroid/content/Intent;Ljava/lang/String;)V" />
-		<method name="sendOrderedBroadcast(Landroid/content/Intent;Ljava/lang/String;)V" />
-		<method name="sendOrderedBroadcast(Landroid/content/Intent;Ljava/lang/String;Landroid/content/BroadcastReceiver;Landroid/os/Handler;ILjava/lang/String;Landroid/os/Bundle;)V" />
-		<method name="sendStickyBroadcast(Landroid/content/Intent;)V" />
-		<method name="sendStickyOrderedBroadcast(Landroid/content/Intent;Landroid/content/BroadcastReceiver;Landroid/os/Handler;ILjava/lang/String;Landroid/os/Bundle;)V" since="5" />
-		<method name="setTheme(I)V" />
-		<method name="setWallpaper(Landroid/graphics/Bitmap;)V" />
-		<method name="setWallpaper(Ljava/io/InputStream;)V" />
-		<method name="startActivities([Landroid/content/Intent;)V" since="11" />
-		<method name="startActivity(Landroid/content/Intent;)V" />
-		<method name="startInstrumentation(Landroid/content/ComponentName;Ljava/lang/String;Landroid/os/Bundle;)Z" />
-		<method name="startIntentSender(Landroid/content/IntentSender;Landroid/content/Intent;III)V" since="5" />
-		<method name="startService(Landroid/content/Intent;)Landroid/content/ComponentName;" />
-		<method name="stopService(Landroid/content/Intent;)Z" />
-		<method name="unbindService(Landroid/content/ServiceConnection;)V" />
-		<method name="unregisterReceiver(Landroid/content/BroadcastReceiver;)V" />
 	</class>
 	<class name="android/test/mock/MockCursor" since="8">
 		<extends name="java/lang/Object" />
 		<implements name="android/database/Cursor" />
 		<method name="&lt;init>()V" />
 		<method name="abortUpdates()V" />
-		<method name="close()V" />
 		<method name="commitUpdates()Z" />
 		<method name="commitUpdates(Ljava/util/Map;)Z" />
-		<method name="copyStringToBuffer(ILandroid/database/CharArrayBuffer;)V" />
-		<method name="deactivate()V" />
 		<method name="deleteRow()Z" />
-		<method name="getBlob(I)[B" />
-		<method name="getColumnCount()I" />
-		<method name="getColumnIndex(Ljava/lang/String;)I" />
-		<method name="getColumnIndexOrThrow(Ljava/lang/String;)I" />
-		<method name="getColumnName(I)Ljava/lang/String;" />
-		<method name="getColumnNames()[Ljava/lang/String;" />
-		<method name="getCount()I" />
-		<method name="getDouble(I)D" />
-		<method name="getExtras()Landroid/os/Bundle;" />
-		<method name="getFloat(I)F" />
-		<method name="getInt(I)I" />
-		<method name="getLong(I)J" />
-		<method name="getPosition()I" />
-		<method name="getShort(I)S" />
-		<method name="getString(I)Ljava/lang/String;" />
-		<method name="getType(I)I" since="11" />
-		<method name="getWantsAllOnMoveCalls()Z" />
 		<method name="hasUpdates()Z" />
-		<method name="isAfterLast()Z" />
-		<method name="isBeforeFirst()Z" />
-		<method name="isClosed()Z" />
-		<method name="isFirst()Z" />
-		<method name="isLast()Z" />
-		<method name="isNull(I)Z" />
-		<method name="move(I)Z" />
-		<method name="moveToFirst()Z" />
-		<method name="moveToLast()Z" />
-		<method name="moveToNext()Z" />
-		<method name="moveToPosition(I)Z" />
-		<method name="moveToPrevious()Z" />
-		<method name="registerContentObserver(Landroid/database/ContentObserver;)V" />
-		<method name="registerDataSetObserver(Landroid/database/DataSetObserver;)V" />
-		<method name="requery()Z" />
-		<method name="respond(Landroid/os/Bundle;)Landroid/os/Bundle;" />
-		<method name="setNotificationUri(Landroid/content/ContentResolver;Landroid/net/Uri;)V" />
 		<method name="supportsUpdates()Z" />
-		<method name="unregisterContentObserver(Landroid/database/ContentObserver;)V" />
-		<method name="unregisterDataSetObserver(Landroid/database/DataSetObserver;)V" />
 		<method name="updateBlob(I[B)Z" />
 		<method name="updateDouble(ID)Z" />
 		<method name="updateFloat(IF)Z" />
@@ -19893,80 +19583,11 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/content/DialogInterface" />
 		<method name="&lt;init>()V" />
-		<method name="cancel()V" />
-		<method name="dismiss()V" />
 	</class>
 	<class name="android/test/mock/MockPackageManager" since="1">
 		<extends name="android/content/pm/PackageManager" />
 		<method name="&lt;init>()V" />
-		<method name="addPackageToPreferred(Ljava/lang/String;)V" />
-		<method name="addPermission(Landroid/content/pm/PermissionInfo;)Z" />
-		<method name="addPermissionAsync(Landroid/content/pm/PermissionInfo;)Z" since="8" />
-		<method name="addPreferredActivity(Landroid/content/IntentFilter;I[Landroid/content/ComponentName;Landroid/content/ComponentName;)V" />
-		<method name="canonicalToCurrentPackageNames([Ljava/lang/String;)[Ljava/lang/String;" since="8" />
-		<method name="checkPermission(Ljava/lang/String;Ljava/lang/String;)I" />
-		<method name="checkSignatures(II)I" since="5" />
-		<method name="checkSignatures(Ljava/lang/String;Ljava/lang/String;)I" />
-		<method name="clearPackagePreferredActivities(Ljava/lang/String;)V" />
-		<method name="currentToCanonicalPackageNames([Ljava/lang/String;)[Ljava/lang/String;" since="8" />
-		<method name="getActivityIcon(Landroid/content/ComponentName;)Landroid/graphics/drawable/Drawable;" />
-		<method name="getActivityIcon(Landroid/content/Intent;)Landroid/graphics/drawable/Drawable;" />
-		<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;" />
-		<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;" />
-		<method name="getApplicationInfo(Ljava/lang/String;I)Landroid/content/pm/ApplicationInfo;" />
-		<method name="getApplicationLabel(Landroid/content/pm/ApplicationInfo;)Ljava/lang/CharSequence;" />
-		<method name="getApplicationLogo(Landroid/content/pm/ApplicationInfo;)Landroid/graphics/drawable/Drawable;" since="9" />
-		<method name="getApplicationLogo(Ljava/lang/String;)Landroid/graphics/drawable/Drawable;" since="9" />
-		<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;" />
-		<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" />
-		<method name="getNameForUid(I)Ljava/lang/String;" />
-		<method name="getPackageGids(Ljava/lang/String;)[I" />
-		<method name="getPackageInfo(Ljava/lang/String;I)Landroid/content/pm/PackageInfo;" />
-		<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;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;" />
-		<method name="getResourcesForApplication(Landroid/content/pm/ApplicationInfo;)Landroid/content/res/Resources;" />
-		<method name="getResourcesForApplication(Ljava/lang/String;)Landroid/content/res/Resources;" />
-		<method name="getServiceInfo(Landroid/content/ComponentName;I)Landroid/content/pm/ServiceInfo;" />
-		<method name="getSystemAvailableFeatures()[Landroid/content/pm/FeatureInfo;" since="5" />
-		<method name="getSystemSharedLibraryNames()[Ljava/lang/String;" since="3" />
-		<method name="getText(Ljava/lang/String;ILandroid/content/pm/ApplicationInfo;)Ljava/lang/CharSequence;" />
-		<method name="getXml(Ljava/lang/String;ILandroid/content/pm/ApplicationInfo;)Landroid/content/res/XmlResourceParser;" />
-		<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;" />
-		<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;" />
-		<method name="resolveContentProvider(Ljava/lang/String;I)Landroid/content/pm/ProviderInfo;" />
-		<method name="resolveService(Landroid/content/Intent;I)Landroid/content/pm/ResolveInfo;" />
-		<method name="setApplicationEnabledSetting(Ljava/lang/String;II)V" />
-		<method name="setComponentEnabledSetting(Landroid/content/ComponentName;II)V" />
-		<method name="setInstallerPackageName(Ljava/lang/String;Ljava/lang/String;)V" since="11" />
-		<method name="verifyPendingInstall(II)V" since="14" />
+		<method name="setPackageObbPath(Ljava/lang/String;Ljava/lang/String;)V" since="9" />
 	</class>
 	<class name="android/test/mock/MockResources" since="1">
 		<extends name="android/content/res/Resources" />
@@ -19978,7 +19599,7 @@
 		<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;" />
+		<method name="getAnnotation(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;" />
 		<method name="getEnclosingClass()Ljava/lang/Class;" />
 		<method name="getEnclosingClassname()Ljava/lang/String;" />
 		<method name="getName()Ljava/lang/String;" />
@@ -20023,13 +19644,10 @@
 	</class>
 	<class name="android/text/AlteredCharSequence" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/CharSequence" />
 		<implements name="android/text/GetChars" />
-		<method name="charAt(I)C" />
-		<method name="getChars(II[CI)V" />
-		<method name="length()I" />
+		<implements name="java/lang/CharSequence" />
+		<method name="&lt;init>()V" />
 		<method name="make(Ljava/lang/CharSequence;[CII)Landroid/text/AlteredCharSequence;" />
-		<method name="subSequence(II)Ljava/lang/CharSequence;" />
 	</class>
 	<class name="android/text/AndroidCharacter" since="1">
 		<extends name="java/lang/Object" />
@@ -20051,14 +19669,12 @@
 		<implements name="android/text/ParcelableSpan" since="3" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="describeContents()I" since="3" />
 		<method name="getKey()Ljava/lang/String;" />
-		<method name="getSpanTypeId()I" since="3" />
 		<method name="getValue()Ljava/lang/String;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/AutoText" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="get(Ljava/lang/CharSequence;IILandroid/view/View;)Ljava/lang/String;" />
 		<method name="getSize(Landroid/view/View;)I" since="3" />
 	</class>
@@ -20067,18 +19683,6 @@
 		<implements name="android/text/TextUtils$EllipsizeCallback" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFLandroid/text/BoringLayout$Metrics;Z)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFLandroid/text/BoringLayout$Metrics;ZLandroid/text/TextUtils$TruncateAt;I)V" />
-		<method name="ellipsized(II)V" />
-		<method name="getBottomPadding()I" />
-		<method name="getEllipsisCount(I)I" />
-		<method name="getEllipsisStart(I)I" />
-		<method name="getLineContainsTab(I)Z" />
-		<method name="getLineCount()I" />
-		<method name="getLineDescent(I)I" />
-		<method name="getLineDirections(I)Landroid/text/Layout$Directions;" />
-		<method name="getLineStart(I)I" />
-		<method name="getLineTop(I)I" />
-		<method name="getParagraphDirection(I)I" />
-		<method name="getTopPadding()I" />
 		<method name="isBoring(Ljava/lang/CharSequence;Landroid/text/TextPaint;)Landroid/text/BoringLayout$Metrics;" />
 		<method name="isBoring(Ljava/lang/CharSequence;Landroid/text/TextPaint;Landroid/text/BoringLayout$Metrics;)Landroid/text/BoringLayout$Metrics;" />
 		<method name="make(Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFLandroid/text/BoringLayout$Metrics;Z)Landroid/text/BoringLayout;" />
@@ -20093,7 +19697,7 @@
 	</class>
 	<class name="android/text/ClipboardManager" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>()V" since="11" />
+		<method name="&lt;init>()V" />
 		<method name="getText()Ljava/lang/CharSequence;" />
 		<method name="hasText()Z" />
 		<method name="setText(Ljava/lang/CharSequence;)V" />
@@ -20103,23 +19707,13 @@
 		<method name="&lt;init>(Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFZ)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFZ)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFZLandroid/text/TextUtils$TruncateAt;I)V" />
-		<method name="getBottomPadding()I" />
-		<method name="getEllipsisCount(I)I" />
-		<method name="getEllipsisStart(I)I" />
-		<method name="getLineContainsTab(I)Z" />
-		<method name="getLineCount()I" />
-		<method name="getLineDescent(I)I" />
-		<method name="getLineDirections(I)Landroid/text/Layout$Directions;" />
-		<method name="getLineStart(I)I" />
-		<method name="getLineTop(I)I" />
-		<method name="getParagraphDirection(I)I" />
-		<method name="getTopPadding()I" />
 	</class>
 	<class name="android/text/Editable" since="1">
-		<implements name="java/lang/Appendable" />
-		<implements name="java/lang/CharSequence" />
+		<extends name="java/lang/Object" />
 		<implements name="android/text/GetChars" />
 		<implements name="android/text/Spannable" />
+		<implements name="java/lang/Appendable" />
+		<implements name="java/lang/CharSequence" />
 		<method name="append(C)Landroid/text/Editable;" />
 		<method name="append(Ljava/lang/CharSequence;)Landroid/text/Editable;" />
 		<method name="append(Ljava/lang/CharSequence;II)Landroid/text/Editable;" />
@@ -20140,37 +19734,41 @@
 		<method name="newEditable(Ljava/lang/CharSequence;)Landroid/text/Editable;" />
 	</class>
 	<class name="android/text/GetChars" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/CharSequence" />
 		<method name="getChars(II[CI)V" />
 	</class>
 	<class name="android/text/Html" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="fromHtml(Ljava/lang/String;)Landroid/text/Spanned;" />
 		<method name="fromHtml(Ljava/lang/String;Landroid/text/Html$ImageGetter;Landroid/text/Html$TagHandler;)Landroid/text/Spanned;" />
 		<method name="toHtml(Landroid/text/Spanned;)Ljava/lang/String;" />
 	</class>
 	<class name="android/text/Html$ImageGetter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getDrawable(Ljava/lang/String;)Landroid/graphics/drawable/Drawable;" />
 	</class>
 	<class name="android/text/Html$TagHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="handleTag(ZLjava/lang/String;Landroid/text/Editable;Lorg/xml/sax/XMLReader;)V" />
 	</class>
 	<class name="android/text/InputFilter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="filter(Ljava/lang/CharSequence;IILandroid/text/Spanned;II)Ljava/lang/CharSequence;" />
 	</class>
 	<class name="android/text/InputFilter$AllCaps" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/text/InputFilter" />
 		<method name="&lt;init>()V" />
-		<method name="filter(Ljava/lang/CharSequence;IILandroid/text/Spanned;II)Ljava/lang/CharSequence;" />
 	</class>
 	<class name="android/text/InputFilter$LengthFilter" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/text/InputFilter" />
 		<method name="&lt;init>(I)V" />
-		<method name="filter(Ljava/lang/CharSequence;IILandroid/text/Spanned;II)Ljava/lang/CharSequence;" />
 	</class>
 	<class name="android/text/InputType" since="3">
+		<extends name="java/lang/Object" />
 		<field name="TYPE_CLASS_DATETIME" />
 		<field name="TYPE_CLASS_NUMBER" />
 		<field name="TYPE_CLASS_PHONE" />
@@ -20274,11 +19872,12 @@
 	</class>
 	<class name="android/text/Layout$Directions" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/text/LoginFilter" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/text/InputFilter" />
-		<method name="filter(Ljava/lang/CharSequence;IILandroid/text/Spanned;II)Ljava/lang/CharSequence;" />
+		<method name="&lt;init>()V" />
 		<method name="isAllowed(C)Z" />
 		<method name="onInvalidCharacter(C)V" />
 		<method name="onStart()V" />
@@ -20288,21 +19887,19 @@
 		<extends name="android/text/LoginFilter" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Z)V" />
-		<method name="isAllowed(C)Z" />
 	</class>
 	<class name="android/text/LoginFilter$UsernameFilterGMail" since="1">
 		<extends name="android/text/LoginFilter" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Z)V" />
-		<method name="isAllowed(C)Z" />
 	</class>
 	<class name="android/text/LoginFilter$UsernameFilterGeneric" since="1">
 		<extends name="android/text/LoginFilter" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Z)V" />
-		<method name="isAllowed(C)Z" />
 	</class>
 	<class name="android/text/NoCopySpan" since="3">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="android/text/NoCopySpan$Concrete" since="3">
 		<extends name="java/lang/Object" />
@@ -20310,11 +19907,13 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/text/ParcelableSpan" since="3">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="getSpanTypeId()I" />
 	</class>
 	<class name="android/text/Selection" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="extendDown(Landroid/text/Spannable;Landroid/text/Layout;)Z" />
 		<method name="extendLeft(Landroid/text/Spannable;Landroid/text/Layout;)Z" />
 		<method name="extendRight(Landroid/text/Spannable;Landroid/text/Layout;)Z" />
@@ -20338,12 +19937,14 @@
 		<field name="SELECTION_START" />
 	</class>
 	<class name="android/text/SpanWatcher" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/NoCopySpan" since="3" />
 		<method name="onSpanAdded(Landroid/text/Spannable;Ljava/lang/Object;II)V" />
 		<method name="onSpanChanged(Landroid/text/Spannable;Ljava/lang/Object;IIII)V" />
 		<method name="onSpanRemoved(Landroid/text/Spannable;Ljava/lang/Object;II)V" />
 	</class>
 	<class name="android/text/Spannable" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/Spanned" />
 		<method name="removeSpan(Ljava/lang/Object;)V" />
 		<method name="setSpan(Ljava/lang/Object;III)V" />
@@ -20356,69 +19957,52 @@
 	</class>
 	<class name="android/text/SpannableString" since="1">
 		<extends name="android/text/SpannableStringInternal" />
-		<implements name="java/lang/CharSequence" />
 		<implements name="android/text/GetChars" />
 		<implements name="android/text/Spannable" />
+		<implements name="java/lang/CharSequence" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;)V" />
-		<method name="removeSpan(Ljava/lang/Object;)V" />
-		<method name="setSpan(Ljava/lang/Object;III)V" />
-		<method name="subSequence(II)Ljava/lang/CharSequence;" />
 		<method name="valueOf(Ljava/lang/CharSequence;)Landroid/text/SpannableString;" />
 	</class>
 	<class name="android/text/SpannableStringBuilder" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Appendable" />
-		<implements name="java/lang/CharSequence" />
 		<implements name="android/text/Editable" />
 		<implements name="android/text/GetChars" />
 		<implements name="android/text/Spannable" />
+		<implements name="java/lang/Appendable" />
+		<implements name="java/lang/CharSequence" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;II)V" />
 		<method name="append(C)Landroid/text/SpannableStringBuilder;" />
 		<method name="append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;" />
 		<method name="append(Ljava/lang/CharSequence;II)Landroid/text/SpannableStringBuilder;" />
-		<method name="charAt(I)C" />
-		<method name="clear()V" />
-		<method name="clearSpans()V" />
 		<method name="delete(II)Landroid/text/SpannableStringBuilder;" />
-		<method name="getChars(II[CI)V" />
-		<method name="getFilters()[Landroid/text/InputFilter;" />
-		<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;" />
 		<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;" />
-		<method name="length()I" />
-		<method name="nextSpanTransition(IILjava/lang/Class;)I" />
-		<method name="removeSpan(Ljava/lang/Object;)V" />
 		<method name="replace(IILjava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;" />
 		<method name="replace(IILjava/lang/CharSequence;II)Landroid/text/SpannableStringBuilder;" />
-		<method name="setFilters([Landroid/text/InputFilter;)V" />
-		<method name="setSpan(Ljava/lang/Object;III)V" />
-		<method name="subSequence(II)Ljava/lang/CharSequence;" />
 		<method name="valueOf(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;" />
 	</class>
 	<class name="android/text/SpannableStringInternal" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="charAt(I)C" />
 		<method name="getChars(II[CI)V" />
 		<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;" />
+		<method name="getSpans(IILjava/lang/Class;)[Ljava/lang/Object;" />
 		<method name="length()I" />
 		<method name="nextSpanTransition(IILjava/lang/Class;)I" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="android/text/Spanned" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/CharSequence" />
 		<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;" />
+		<method name="getSpans(IILjava/lang/Class;)[Ljava/lang/Object;" />
 		<method name="nextSpanTransition(IILjava/lang/Class;)I" />
 		<field name="SPAN_COMPOSING" since="3" />
 		<field name="SPAN_EXCLUSIVE_EXCLUSIVE" />
@@ -20439,11 +20023,10 @@
 	</class>
 	<class name="android/text/SpannedString" since="1">
 		<extends name="android/text/SpannableStringInternal" />
-		<implements name="java/lang/CharSequence" />
 		<implements name="android/text/GetChars" />
 		<implements name="android/text/Spanned" />
+		<implements name="java/lang/CharSequence" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;)V" />
-		<method name="subSequence(II)Ljava/lang/CharSequence;" />
 		<method name="valueOf(Ljava/lang/CharSequence;)Landroid/text/SpannedString;" />
 	</class>
 	<class name="android/text/StaticLayout" since="1">
@@ -20451,17 +20034,6 @@
 		<method name="&lt;init>(Ljava/lang/CharSequence;IILandroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFZ)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;IILandroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFZLandroid/text/TextUtils$TruncateAt;I)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;FFZ)V" />
-		<method name="getBottomPadding()I" />
-		<method name="getEllipsisCount(I)I" />
-		<method name="getEllipsisStart(I)I" />
-		<method name="getLineContainsTab(I)Z" />
-		<method name="getLineCount()I" />
-		<method name="getLineDescent(I)I" />
-		<method name="getLineDirections(I)Landroid/text/Layout$Directions;" />
-		<method name="getLineStart(I)I" />
-		<method name="getLineTop(I)I" />
-		<method name="getParagraphDirection(I)I" />
-		<method name="getTopPadding()I" />
 	</class>
 	<class name="android/text/TextPaint" since="1">
 		<extends name="android/graphics/Paint" />
@@ -20477,6 +20049,7 @@
 	</class>
 	<class name="android/text/TextUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="commaEllipsize(Ljava/lang/CharSequence;Landroid/text/TextPaint;FLjava/lang/String;Ljava/lang/String;)Ljava/lang/CharSequence;" />
 		<method name="concat([Ljava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="copySpansFrom(Landroid/text/Spanned;IILjava/lang/Class;Landroid/text/Spannable;I)V" />
@@ -20520,20 +20093,18 @@
 		<field name="CHAR_SEQUENCE_CREATOR" />
 	</class>
 	<class name="android/text/TextUtils$EllipsizeCallback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="ellipsized(II)V" />
 	</class>
 	<class name="android/text/TextUtils$SimpleStringSplitter" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/Iterator" />
 		<implements name="android/text/TextUtils$StringSplitter" />
+		<implements name="java/util/Iterator" />
 		<method name="&lt;init>(C)V" />
-		<method name="hasNext()Z" />
-		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="next()Ljava/lang/String;" />
-		<method name="remove()V" />
-		<method name="setString(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/text/TextUtils$StringSplitter" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Iterable" />
 		<method name="setString(Ljava/lang/String;)V" />
 	</class>
@@ -20547,6 +20118,7 @@
 		<field name="START" />
 	</class>
 	<class name="android/text/TextWatcher" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/NoCopySpan" since="3" />
 		<method name="afterTextChanged(Landroid/text/Editable;)V" />
 		<method name="beforeTextChanged(Ljava/lang/CharSequence;III)V" />
@@ -20712,19 +20284,11 @@
 		<field name="yearDay" />
 	</class>
 	<class name="android/text/method/ArrowKeyMovementMethod" since="1">
-		<extends name="java/lang/Object" />
 		<extends name="android/text/method/BaseMovementMethod" since="11" />
+		<extends name="java/lang/Object" />
 		<implements name="android/text/method/MovementMethod" />
 		<method name="&lt;init>()V" />
-		<method name="canSelectArbitrarily()Z" />
 		<method name="getInstance()Landroid/text/method/MovementMethod;" />
-		<method name="initialize(Landroid/widget/TextView;Landroid/text/Spannable;)V" />
-		<method name="onKeyDown(Landroid/widget/TextView;Landroid/text/Spannable;ILandroid/view/KeyEvent;)Z" />
-		<method name="onKeyOther(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/KeyEvent;)Z" since="3" />
-		<method name="onKeyUp(Landroid/widget/TextView;Landroid/text/Spannable;ILandroid/view/KeyEvent;)Z" />
-		<method name="onTakeFocus(Landroid/widget/TextView;Landroid/text/Spannable;I)V" />
-		<method name="onTouchEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z" />
-		<method name="onTrackballEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z" />
 	</class>
 	<class name="android/text/method/BaseKeyListener" since="1">
 		<extends name="android/text/method/MetaKeyKeyListener" />
@@ -20732,30 +20296,20 @@
 		<method name="&lt;init>()V" />
 		<method name="backspace(Landroid/view/View;Landroid/text/Editable;ILandroid/view/KeyEvent;)Z" />
 		<method name="forwardDelete(Landroid/view/View;Landroid/text/Editable;ILandroid/view/KeyEvent;)Z" since="11" />
-		<method name="onKeyOther(Landroid/view/View;Landroid/text/Editable;Landroid/view/KeyEvent;)Z" since="3" />
 	</class>
 	<class name="android/text/method/BaseMovementMethod" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/text/method/MovementMethod" />
 		<method name="&lt;init>()V" />
 		<method name="bottom(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
-		<method name="canSelectArbitrarily()Z" />
 		<method name="down(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
 		<method name="end(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
 		<method name="getMovementMetaState(Landroid/text/Spannable;Landroid/view/KeyEvent;)I" />
 		<method name="handleMovementKey(Landroid/widget/TextView;Landroid/text/Spannable;IILandroid/view/KeyEvent;)Z" />
 		<method name="home(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
-		<method name="initialize(Landroid/widget/TextView;Landroid/text/Spannable;)V" />
 		<method name="left(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
 		<method name="lineEnd(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
 		<method name="lineStart(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
-		<method name="onGenericMotionEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z" since="12" />
-		<method name="onKeyDown(Landroid/widget/TextView;Landroid/text/Spannable;ILandroid/view/KeyEvent;)Z" />
-		<method name="onKeyOther(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/KeyEvent;)Z" />
-		<method name="onKeyUp(Landroid/widget/TextView;Landroid/text/Spannable;ILandroid/view/KeyEvent;)Z" />
-		<method name="onTakeFocus(Landroid/widget/TextView;Landroid/text/Spannable;I)V" />
-		<method name="onTouchEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z" />
-		<method name="onTrackballEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z" />
 		<method name="pageDown(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
 		<method name="pageUp(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
 		<method name="right(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
@@ -20764,33 +20318,25 @@
 	</class>
 	<class name="android/text/method/CharacterPickerDialog" since="1">
 		<extends name="android/app/Dialog" />
-		<implements name="android/widget/AdapterView$OnItemClickListener" />
 		<implements name="android/view/View$OnClickListener" />
+		<implements name="android/widget/AdapterView$OnItemClickListener" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/view/View;Landroid/text/Editable;Ljava/lang/String;Z)V" />
-		<method name="onClick(Landroid/view/View;)V" />
-		<method name="onItemClick(Landroid/widget/AdapterView;Landroid/view/View;IJ)V" />
 	</class>
 	<class name="android/text/method/DateKeyListener" since="1">
 		<extends name="android/text/method/NumberKeyListener" />
 		<method name="&lt;init>()V" />
-		<method name="getAcceptedChars()[C" />
-		<method name="getInputType()I" since="3" />
 		<method name="getInstance()Landroid/text/method/DateKeyListener;" />
 		<field name="CHARACTERS" />
 	</class>
 	<class name="android/text/method/DateTimeKeyListener" since="1">
 		<extends name="android/text/method/NumberKeyListener" />
 		<method name="&lt;init>()V" />
-		<method name="getAcceptedChars()[C" />
-		<method name="getInputType()I" since="3" />
 		<method name="getInstance()Landroid/text/method/DateTimeKeyListener;" />
 		<field name="CHARACTERS" />
 	</class>
 	<class name="android/text/method/DialerKeyListener" since="1">
 		<extends name="android/text/method/NumberKeyListener" />
 		<method name="&lt;init>()V" />
-		<method name="getAcceptedChars()[C" />
-		<method name="getInputType()I" since="3" />
 		<method name="getInstance()Landroid/text/method/DialerKeyListener;" />
 		<field name="CHARACTERS" />
 	</class>
@@ -20798,8 +20344,6 @@
 		<extends name="android/text/method/NumberKeyListener" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(ZZ)V" />
-		<method name="getAcceptedChars()[C" />
-		<method name="getInputType()I" since="3" />
 		<method name="getInstance()Landroid/text/method/DigitsKeyListener;" />
 		<method name="getInstance(Ljava/lang/String;)Landroid/text/method/DigitsKeyListener;" />
 		<method name="getInstance(ZZ)Landroid/text/method/DigitsKeyListener;" />
@@ -20808,10 +20352,9 @@
 		<extends name="android/text/method/ReplacementTransformationMethod" />
 		<method name="&lt;init>()V" />
 		<method name="getInstance()Landroid/text/method/HideReturnsTransformationMethod;" />
-		<method name="getOriginal()[C" />
-		<method name="getReplacement()[C" />
 	</class>
 	<class name="android/text/method/KeyListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="clearMetaKeyState(Landroid/view/View;Landroid/text/Editable;I)V" since="3" />
 		<method name="getInputType()I" since="3" />
 		<method name="onKeyDown(Landroid/view/View;Landroid/text/Editable;ILandroid/view/KeyEvent;)Z" />
@@ -20821,7 +20364,6 @@
 	<class name="android/text/method/LinkMovementMethod" since="1">
 		<extends name="android/text/method/ScrollingMovementMethod" />
 		<method name="&lt;init>()V" />
-		<method name="getInstance()Landroid/text/method/MovementMethod;" />
 	</class>
 	<class name="android/text/method/MetaKeyKeyListener" since="1">
 		<extends name="java/lang/Object" />
@@ -20852,6 +20394,7 @@
 		<field name="META_SYM_ON" />
 	</class>
 	<class name="android/text/method/MovementMethod" since="1">
+		<extends name="java/lang/Object" />
 		<method name="canSelectArbitrarily()Z" />
 		<method name="initialize(Landroid/widget/TextView;Landroid/text/Spannable;)V" />
 		<method name="onGenericMotionEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z" since="12" />
@@ -20866,17 +20409,12 @@
 		<extends name="android/text/method/BaseKeyListener" />
 		<implements name="android/text/SpanWatcher" />
 		<method name="&lt;init>(Landroid/text/method/TextKeyListener$Capitalize;Z)V" />
-		<method name="getInputType()I" since="3" />
 		<method name="getInstance(ZLandroid/text/method/TextKeyListener$Capitalize;)Landroid/text/method/MultiTapKeyListener;" />
-		<method name="onSpanAdded(Landroid/text/Spannable;Ljava/lang/Object;II)V" />
-		<method name="onSpanChanged(Landroid/text/Spannable;Ljava/lang/Object;IIII)V" />
-		<method name="onSpanRemoved(Landroid/text/Spannable;Ljava/lang/Object;II)V" />
 	</class>
 	<class name="android/text/method/NumberKeyListener" since="1">
 		<extends name="android/text/method/BaseKeyListener" />
 		<implements name="android/text/InputFilter" />
 		<method name="&lt;init>()V" />
-		<method name="filter(Ljava/lang/CharSequence;IILandroid/text/Spanned;II)Ljava/lang/CharSequence;" />
 		<method name="getAcceptedChars()[C" />
 		<method name="lookup(Landroid/view/KeyEvent;Landroid/text/Spannable;)I" />
 		<method name="ok([CC)Z" />
@@ -20886,17 +20424,11 @@
 		<implements name="android/text/TextWatcher" />
 		<implements name="android/text/method/TransformationMethod" />
 		<method name="&lt;init>()V" />
-		<method name="afterTextChanged(Landroid/text/Editable;)V" />
-		<method name="beforeTextChanged(Ljava/lang/CharSequence;III)V" />
 		<method name="getInstance()Landroid/text/method/PasswordTransformationMethod;" />
-		<method name="getTransformation(Ljava/lang/CharSequence;Landroid/view/View;)Ljava/lang/CharSequence;" />
-		<method name="onFocusChanged(Landroid/view/View;Ljava/lang/CharSequence;ZILandroid/graphics/Rect;)V" />
-		<method name="onTextChanged(Ljava/lang/CharSequence;III)V" />
 	</class>
 	<class name="android/text/method/QwertyKeyListener" since="1">
 		<extends name="android/text/method/BaseKeyListener" />
 		<method name="&lt;init>(Landroid/text/method/TextKeyListener$Capitalize;Z)V" />
-		<method name="getInputType()I" since="3" />
 		<method name="getInstance(ZLandroid/text/method/TextKeyListener$Capitalize;)Landroid/text/method/QwertyKeyListener;" />
 		<method name="getInstanceForFullKeyboard()Landroid/text/method/QwertyKeyListener;" since="11" />
 		<method name="markAsReplaced(Landroid/text/Spannable;IILjava/lang/String;)V" />
@@ -20907,25 +20439,15 @@
 		<method name="&lt;init>()V" />
 		<method name="getOriginal()[C" />
 		<method name="getReplacement()[C" />
-		<method name="getTransformation(Ljava/lang/CharSequence;Landroid/view/View;)Ljava/lang/CharSequence;" />
-		<method name="onFocusChanged(Landroid/view/View;Ljava/lang/CharSequence;ZILandroid/graphics/Rect;)V" />
 	</class>
 	<class name="android/text/method/ScrollingMovementMethod" since="1">
-		<extends name="java/lang/Object" />
 		<extends name="android/text/method/BaseMovementMethod" since="11" />
+		<extends name="java/lang/Object" />
 		<implements name="android/text/method/MovementMethod" />
 		<method name="&lt;init>()V" />
-		<method name="canSelectArbitrarily()Z" />
 		<method name="down(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
 		<method name="getInstance()Landroid/text/method/MovementMethod;" />
-		<method name="initialize(Landroid/widget/TextView;Landroid/text/Spannable;)V" />
 		<method name="left(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
-		<method name="onKeyDown(Landroid/widget/TextView;Landroid/text/Spannable;ILandroid/view/KeyEvent;)Z" />
-		<method name="onKeyOther(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/KeyEvent;)Z" since="3" />
-		<method name="onKeyUp(Landroid/widget/TextView;Landroid/text/Spannable;ILandroid/view/KeyEvent;)Z" />
-		<method name="onTakeFocus(Landroid/widget/TextView;Landroid/text/Spannable;I)V" />
-		<method name="onTouchEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z" />
-		<method name="onTrackballEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z" />
 		<method name="right(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
 		<method name="up(Landroid/widget/TextView;Landroid/text/Spannable;)Z" />
 	</class>
@@ -20933,20 +20455,14 @@
 		<extends name="android/text/method/ReplacementTransformationMethod" />
 		<method name="&lt;init>()V" />
 		<method name="getInstance()Landroid/text/method/SingleLineTransformationMethod;" />
-		<method name="getOriginal()[C" />
-		<method name="getReplacement()[C" />
 	</class>
 	<class name="android/text/method/TextKeyListener" since="1">
 		<extends name="android/text/method/BaseKeyListener" />
 		<implements name="android/text/SpanWatcher" />
 		<method name="&lt;init>(Landroid/text/method/TextKeyListener$Capitalize;Z)V" />
 		<method name="clear(Landroid/text/Editable;)V" />
-		<method name="getInputType()I" since="3" />
 		<method name="getInstance()Landroid/text/method/TextKeyListener;" />
 		<method name="getInstance(ZLandroid/text/method/TextKeyListener$Capitalize;)Landroid/text/method/TextKeyListener;" />
-		<method name="onSpanAdded(Landroid/text/Spannable;Ljava/lang/Object;II)V" />
-		<method name="onSpanChanged(Landroid/text/Spannable;Ljava/lang/Object;IIII)V" />
-		<method name="onSpanRemoved(Landroid/text/Spannable;Ljava/lang/Object;II)V" />
 		<method name="release()V" />
 		<method name="shouldCap(Landroid/text/method/TextKeyListener$Capitalize;Ljava/lang/CharSequence;I)Z" />
 	</class>
@@ -20962,19 +20478,19 @@
 	<class name="android/text/method/TimeKeyListener" since="1">
 		<extends name="android/text/method/NumberKeyListener" />
 		<method name="&lt;init>()V" />
-		<method name="getAcceptedChars()[C" />
-		<method name="getInputType()I" since="3" />
 		<method name="getInstance()Landroid/text/method/TimeKeyListener;" />
 		<field name="CHARACTERS" />
 	</class>
 	<class name="android/text/method/Touch" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getInitialScrollX(Landroid/widget/TextView;Landroid/text/Spannable;)I" since="3" />
 		<method name="getInitialScrollY(Landroid/widget/TextView;Landroid/text/Spannable;)I" since="3" />
 		<method name="onTouchEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z" />
 		<method name="scrollTo(Landroid/widget/TextView;Landroid/text/Layout;II)V" />
 	</class>
 	<class name="android/text/method/TransformationMethod" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getTransformation(Ljava/lang/CharSequence;Landroid/view/View;)Ljava/lang/CharSequence;" />
 		<method name="onFocusChanged(Landroid/view/View;Ljava/lang/CharSequence;ZILandroid/graphics/Rect;)V" />
 	</class>
@@ -20984,28 +20500,20 @@
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IZ)V" since="5" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
 		<method name="getDip()Z" since="5" />
 		<method name="getSize()I" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/AlignmentSpan" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/style/ParagraphStyle" />
 		<method name="getAlignment()Landroid/text/Layout$Alignment;" />
 	</class>
 	<class name="android/text/style/AlignmentSpan$Standard" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="android/text/style/AlignmentSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
+		<implements name="android/text/style/AlignmentSpan" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
 		<method name="&lt;init>(Landroid/text/Layout$Alignment;)V" />
-		<method name="describeContents()I" since="3" />
-		<method name="getAlignment()Landroid/text/Layout$Alignment;" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/BackgroundColorSpan" since="1">
 		<extends name="android/text/style/CharacterStyle" />
@@ -21013,25 +20521,16 @@
 		<implements name="android/text/style/UpdateAppearance" since="3" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
 		<method name="getBackgroundColor()I" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/BulletSpan" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="android/text/style/LeadingMarginSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
+		<implements name="android/text/style/LeadingMarginSpan" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(II)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
-		<method name="drawLeadingMargin(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;IIZLandroid/text/Layout;)V" />
-		<method name="getLeadingMargin(Z)I" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 		<field name="STANDARD_GAP_WIDTH" />
 	</class>
 	<class name="android/text/style/CharacterStyle" since="1">
@@ -21046,7 +20545,6 @@
 		<implements name="android/text/style/UpdateAppearance" since="3" />
 		<method name="&lt;init>()V" />
 		<method name="onClick(Landroid/view/View;)V" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
 	</class>
 	<class name="android/text/style/DrawableMarginSpan" since="1">
 		<extends name="java/lang/Object" />
@@ -21054,28 +20552,21 @@
 		<implements name="android/text/style/LineHeightSpan" />
 		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;)V" />
 		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;I)V" />
-		<method name="chooseHeight(Ljava/lang/CharSequence;IIIILandroid/graphics/Paint$FontMetricsInt;)V" />
-		<method name="drawLeadingMargin(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;IIZLandroid/text/Layout;)V" />
-		<method name="getLeadingMargin(Z)I" />
 	</class>
 	<class name="android/text/style/DynamicDrawableSpan" since="1">
 		<extends name="android/text/style/ReplacementSpan" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" since="3" />
-		<method name="draw(Landroid/graphics/Canvas;Ljava/lang/CharSequence;IIFIIILandroid/graphics/Paint;)V" />
 		<method name="getDrawable()Landroid/graphics/drawable/Drawable;" />
-		<method name="getSize(Landroid/graphics/Paint;Ljava/lang/CharSequence;IILandroid/graphics/Paint$FontMetricsInt;)I" />
 		<method name="getVerticalAlignment()I" since="3" />
 		<field name="ALIGN_BASELINE" since="3" />
 		<field name="ALIGN_BOTTOM" since="3" />
 		<field name="mVerticalAlignment" since="3" />
 	</class>
 	<class name="android/text/style/EasyEditSpan" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/ParcelableSpan" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
-		<method name="getSpanTypeId()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 	</class>
 	<class name="android/text/style/ForegroundColorSpan" since="1">
 		<extends name="android/text/style/CharacterStyle" />
@@ -21083,11 +20574,7 @@
 		<implements name="android/text/style/UpdateAppearance" since="3" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
 		<method name="getForegroundColor()I" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/IconMarginSpan" since="1">
 		<extends name="java/lang/Object" />
@@ -21095,9 +20582,6 @@
 		<implements name="android/text/style/LineHeightSpan" />
 		<method name="&lt;init>(Landroid/graphics/Bitmap;)V" />
 		<method name="&lt;init>(Landroid/graphics/Bitmap;I)V" />
-		<method name="chooseHeight(Ljava/lang/CharSequence;IIIILandroid/graphics/Paint$FontMetricsInt;)V" />
-		<method name="drawLeadingMargin(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;IIZLandroid/text/Layout;)V" />
-		<method name="getLeadingMargin(Z)I" />
 	</class>
 	<class name="android/text/style/ImageSpan" since="1">
 		<extends name="android/text/style/DynamicDrawableSpan" />
@@ -21113,42 +20597,41 @@
 		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;I)V" since="3" />
 		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;Ljava/lang/String;I)V" since="3" />
-		<method name="getDrawable()Landroid/graphics/drawable/Drawable;" />
 		<method name="getSource()Ljava/lang/String;" />
 	</class>
 	<class name="android/text/style/LeadingMarginSpan" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/style/ParagraphStyle" />
 		<method name="drawLeadingMargin(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;IIZLandroid/text/Layout;)V" />
 		<method name="getLeadingMargin(Z)I" />
 	</class>
 	<class name="android/text/style/LeadingMarginSpan$LeadingMarginSpan2" since="8">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/style/LeadingMarginSpan" />
 		<implements name="android/text/style/WrapTogetherSpan" />
 		<method name="getLeadingMarginLineCount()I" />
 	</class>
 	<class name="android/text/style/LeadingMarginSpan$Standard" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="android/text/style/LeadingMarginSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
+		<implements name="android/text/style/LeadingMarginSpan" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(II)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
-		<method name="drawLeadingMargin(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;IIZLandroid/text/Layout;)V" />
-		<method name="getLeadingMargin(Z)I" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/LineBackgroundSpan" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/style/ParagraphStyle" />
 		<method name="drawBackground(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;III)V" />
 	</class>
 	<class name="android/text/style/LineHeightSpan" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/style/ParagraphStyle" />
 		<implements name="android/text/style/WrapTogetherSpan" />
 		<method name="chooseHeight(Ljava/lang/CharSequence;IIIILandroid/graphics/Paint$FontMetricsInt;)V" />
 	</class>
 	<class name="android/text/style/LineHeightSpan$WithDensity" since="5">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/style/LineHeightSpan" />
 		<method name="chooseHeight(Ljava/lang/CharSequence;IIIILandroid/graphics/Paint$FontMetricsInt;Landroid/text/TextPaint;)V" />
 	</class>
@@ -21157,68 +20640,51 @@
 		<implements name="android/text/style/UpdateAppearance" since="3" />
 		<method name="&lt;init>(Landroid/graphics/MaskFilter;)V" />
 		<method name="getMaskFilter()Landroid/graphics/MaskFilter;" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
 	</class>
 	<class name="android/text/style/MetricAffectingSpan" since="1">
 		<extends name="android/text/style/CharacterStyle" />
 		<implements name="android/text/style/UpdateLayout" />
 		<method name="&lt;init>()V" />
+		<method name="getUnderlying()Landroid/text/style/MetricAffectingSpan;" />
 		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
 	</class>
 	<class name="android/text/style/ParagraphStyle" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="android/text/style/QuoteSpan" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="android/text/style/LeadingMarginSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
+		<implements name="android/text/style/LeadingMarginSpan" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
-		<method name="drawLeadingMargin(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;IIZLandroid/text/Layout;)V" />
 		<method name="getColor()I" />
-		<method name="getLeadingMargin(Z)I" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/RasterizerSpan" since="1">
 		<extends name="android/text/style/CharacterStyle" />
 		<implements name="android/text/style/UpdateAppearance" since="3" />
 		<method name="&lt;init>(Landroid/graphics/Rasterizer;)V" />
 		<method name="getRasterizer()Landroid/graphics/Rasterizer;" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
 	</class>
 	<class name="android/text/style/RelativeSizeSpan" since="1">
 		<extends name="android/text/style/MetricAffectingSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
 		<method name="&lt;init>(F)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
 		<method name="getSizeChange()F" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/ReplacementSpan" since="1">
 		<extends name="android/text/style/MetricAffectingSpan" />
 		<method name="&lt;init>()V" />
 		<method name="draw(Landroid/graphics/Canvas;Ljava/lang/CharSequence;IIFIIILandroid/graphics/Paint;)V" />
 		<method name="getSize(Landroid/graphics/Paint;Ljava/lang/CharSequence;IILandroid/graphics/Paint$FontMetricsInt;)I" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
 	</class>
 	<class name="android/text/style/ScaleXSpan" since="1">
 		<extends name="android/text/style/MetricAffectingSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
 		<method name="&lt;init>(F)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
 		<method name="getScaleX()F" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/StrikethroughSpan" since="1">
 		<extends name="android/text/style/CharacterStyle" />
@@ -21226,33 +20692,19 @@
 		<implements name="android/text/style/UpdateAppearance" since="3" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/StyleSpan" since="1">
 		<extends name="android/text/style/MetricAffectingSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
-		<method name="getSpanTypeId()I" since="3" />
 		<method name="getStyle()I" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/SubscriptSpan" since="1">
 		<extends name="android/text/style/MetricAffectingSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/SuggestionSpan" since="14">
 		<extends name="android/text/style/CharacterStyle" />
@@ -21261,14 +20713,10 @@
 		<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" />
-		<method name="describeContents()I" />
 		<method name="getFlags()I" />
 		<method name="getLocale()Ljava/lang/String;" />
-		<method name="getSpanTypeId()I" />
 		<method name="getSuggestions()[Ljava/lang/String;" />
 		<method name="setFlags(I)V" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ACTION_SUGGESTION_PICKED" />
 		<field name="CREATOR" />
 		<field name="FLAG_AUTO_CORRECTION" since="15" />
@@ -21284,13 +20732,9 @@
 		<implements name="android/text/ParcelableSpan" since="3" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/TabStopSpan" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/style/ParagraphStyle" />
 		<method name="getTabStop()I" />
 	</class>
@@ -21298,7 +20742,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/text/style/TabStopSpan" />
 		<method name="&lt;init>(I)V" />
-		<method name="getTabStop()I" />
 	</class>
 	<class name="android/text/style/TextAppearanceSpan" since="1">
 		<extends name="android/text/style/MetricAffectingSpan" />
@@ -21307,39 +20750,25 @@
 		<method name="&lt;init>(Landroid/content/Context;II)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
 		<method name="&lt;init>(Ljava/lang/String;IILandroid/content/res/ColorStateList;Landroid/content/res/ColorStateList;)V" />
-		<method name="describeContents()I" since="3" />
 		<method name="getFamily()Ljava/lang/String;" />
 		<method name="getLinkTextColor()Landroid/content/res/ColorStateList;" />
-		<method name="getSpanTypeId()I" since="3" />
 		<method name="getTextColor()Landroid/content/res/ColorStateList;" />
 		<method name="getTextSize()I" />
 		<method name="getTextStyle()I" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/TypefaceSpan" since="1">
 		<extends name="android/text/style/MetricAffectingSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="describeContents()I" since="3" />
 		<method name="getFamily()Ljava/lang/String;" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="updateMeasureState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/URLSpan" since="1">
 		<extends name="android/text/style/ClickableSpan" />
 		<implements name="android/text/ParcelableSpan" since="3" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="describeContents()I" since="3" />
-		<method name="getSpanTypeId()I" since="3" />
 		<method name="getURL()Ljava/lang/String;" />
-		<method name="onClick(Landroid/view/View;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/UnderlineSpan" since="1">
 		<extends name="android/text/style/CharacterStyle" />
@@ -21347,17 +20776,16 @@
 		<implements name="android/text/style/UpdateAppearance" since="3" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" since="3" />
-		<method name="describeContents()I" since="3" />
-		<method name="getSpanTypeId()I" since="3" />
-		<method name="updateDrawState(Landroid/text/TextPaint;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" since="3" />
 	</class>
 	<class name="android/text/style/UpdateAppearance" since="3">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="android/text/style/UpdateLayout" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/style/UpdateAppearance" since="3" />
 	</class>
 	<class name="android/text/style/WrapTogetherSpan" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/text/style/ParagraphStyle" />
 	</class>
 	<class name="android/text/util/Linkify" since="1">
@@ -21379,9 +20807,11 @@
 		<field name="sUrlMatchFilter" />
 	</class>
 	<class name="android/text/util/Linkify$MatchFilter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="acceptMatch(Ljava/lang/CharSequence;II)Z" />
 	</class>
 	<class name="android/text/util/Linkify$TransformFilter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="transformUrl(Ljava/util/regex/Matcher;Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="android/text/util/Rfc822Token" since="1">
@@ -21401,9 +20831,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/widget/MultiAutoCompleteTextView$Tokenizer" />
 		<method name="&lt;init>()V" />
-		<method name="findTokenEnd(Ljava/lang/CharSequence;I)I" />
-		<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;)V" since="8" />
 	</class>
@@ -21422,6 +20849,7 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Throwable;)V" since="11" />
 	</class>
 	<class name="android/util/AttributeSet" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getAttributeBooleanValue(IZ)Z" />
 		<method name="getAttributeBooleanValue(Ljava/lang/String;Ljava/lang/String;Z)Z" />
 		<method name="getAttributeCount()I" />
@@ -21447,6 +20875,7 @@
 	</class>
 	<class name="android/util/Base64" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="decode(Ljava/lang/String;I)[B" />
 		<method name="decode([BI)[B" />
 		<method name="decode([BIII)[B" />
@@ -21519,6 +20948,7 @@
 	</class>
 	<class name="android/util/EventLog$Event" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getData()Ljava/lang/Object;" />
 		<method name="getProcessId()I" />
 		<method name="getTag()I" />
@@ -21534,11 +20964,13 @@
 	</class>
 	<class name="android/util/EventLogTags$Description" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="mName" />
 		<field name="mTag" />
 	</class>
 	<class name="android/util/FloatMath" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="ceil(F)F" />
 		<method name="cos(F)F" />
 		<method name="floor(F)F" />
@@ -21551,7 +20983,6 @@
 		<method name="&lt;init>(Ljava/io/Reader;)V" />
 		<method name="beginArray()V" />
 		<method name="beginObject()V" />
-		<method name="close()V" />
 		<method name="endArray()V" />
 		<method name="endObject()V" />
 		<method name="hasNext()Z" />
@@ -21588,7 +21019,6 @@
 		<method name="&lt;init>(Ljava/io/Writer;)V" />
 		<method name="beginArray()Landroid/util/JsonWriter;" />
 		<method name="beginObject()Landroid/util/JsonWriter;" />
-		<method name="close()V" />
 		<method name="endArray()Landroid/util/JsonWriter;" />
 		<method name="endObject()Landroid/util/JsonWriter;" />
 		<method name="flush()V" />
@@ -21605,6 +21035,7 @@
 	</class>
 	<class name="android/util/Log" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="d(Ljava/lang/String;Ljava/lang/String;)I" />
 		<method name="d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I" />
 		<method name="e(Ljava/lang/String;Ljava/lang/String;)I" />
@@ -21633,27 +21064,25 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/util/Printer" />
 		<method name="&lt;init>(ILjava/lang/String;)V" />
-		<method name="println(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/util/LruCache" since="12">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(I)V" />
-		<method name="create(LK;)LV;" />
+		<method name="create(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="createCount()I" />
-		<method name="entryRemoved(ZLK;LV;LV;)V" />
+		<method name="entryRemoved(ZLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V" />
 		<method name="evictAll()V" />
 		<method name="evictionCount()I" />
-		<method name="get(LK;)LV;" />
+		<method name="get(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="hitCount()I" />
 		<method name="maxSize()I" />
 		<method name="missCount()I" />
-		<method name="put(LK;LV;)LV;" />
+		<method name="put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="putCount()I" />
-		<method name="remove(LK;)LV;" />
+		<method name="remove(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="size()I" />
-		<method name="sizeOf(LK;LV;)I" />
+		<method name="sizeOf(Ljava/lang/Object;Ljava/lang/Object;)I" />
 		<method name="snapshot()Ljava/util/Map;" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="android/util/MalformedJsonException" since="11">
 		<extends name="java/io/IOException" />
@@ -21683,13 +21112,14 @@
 	</class>
 	<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;" />
+		<method name="&lt;init>(Ljava/lang/Object;Ljava/lang/Object;)V" />
+		<method name="create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair;" />
 		<field name="first" />
 		<field name="second" />
 	</class>
 	<class name="android/util/Patterns" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="concatGroups(Ljava/util/regex/Matcher;)Ljava/lang/String;" />
 		<method name="digitsAndPlusOnly(Ljava/util/regex/Matcher;)Ljava/lang/String;" />
 		<field name="DOMAIN_NAME" />
@@ -21706,46 +21136,46 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/util/Printer" />
 		<method name="&lt;init>(Ljava/io/PrintStream;)V" />
-		<method name="println(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/util/PrintWriterPrinter" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/util/Printer" />
 		<method name="&lt;init>(Ljava/io/PrintWriter;)V" />
-		<method name="println(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/util/Printer" since="1">
+		<extends name="java/lang/Object" />
 		<method name="println(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/util/Property" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/lang/Class;Ljava/lang/String;)V" />
-		<method name="get(LT;)LV;" />
+		<method name="get(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getType()Ljava/lang/Class;" />
 		<method name="isReadOnly()Z" />
 		<method name="of(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Landroid/util/Property;" />
-		<method name="set(LT;LV;)V" />
+		<method name="set(Ljava/lang/Object;Ljava/lang/Object;)V" />
 	</class>
 	<class name="android/util/SparseArray" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" since="14" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="append(ILE;)V" />
+		<method name="append(ILjava/lang/Object;)V" />
 		<method name="clear()V" />
 		<method name="clone()Landroid/util/SparseArray;" since="14" />
 		<method name="delete(I)V" />
-		<method name="get(I)LE;" />
-		<method name="get(ILE;)LE;" />
+		<method name="get(I)Ljava/lang/Object;" />
+		<method name="get(ILjava/lang/Object;)Ljava/lang/Object;" />
 		<method name="indexOfKey(I)I" />
-		<method name="indexOfValue(LE;)I" />
+		<method name="indexOfValue(Ljava/lang/Object;)I" />
 		<method name="keyAt(I)I" />
-		<method name="put(ILE;)V" />
+		<method name="put(ILjava/lang/Object;)V" />
 		<method name="remove(I)V" />
 		<method name="removeAt(I)V" since="11" />
-		<method name="setValueAt(ILE;)V" />
+		<method name="setValueAt(ILjava/lang/Object;)V" />
 		<method name="size()I" />
-		<method name="valueAt(I)LE;" />
+		<method name="valueAt(I)Ljava/lang/Object;" />
 	</class>
 	<class name="android/util/SparseBooleanArray" since="1">
 		<extends name="java/lang/Object" />
@@ -21799,10 +21229,10 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/util/Printer" />
 		<method name="&lt;init>(Ljava/lang/StringBuilder;)V" />
-		<method name="println(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/util/TimeFormatException" since="1">
 		<extends name="java/lang/RuntimeException" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/util/TimeUtils" since="1">
 		<extends name="java/lang/Object" />
@@ -21906,9 +21336,7 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Landroid/os/Parcelable;)V" />
-		<method name="describeContents()I" />
 		<method name="getSuperState()Landroid/os/Parcelable;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="EMPTY_STATE" />
 	</class>
@@ -21931,12 +21359,14 @@
 		<method name="setTitle(Ljava/lang/CharSequence;)V" />
 	</class>
 	<class name="android/view/ActionMode$Callback" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onActionItemClicked(Landroid/view/ActionMode;Landroid/view/MenuItem;)Z" />
 		<method name="onCreateActionMode(Landroid/view/ActionMode;Landroid/view/Menu;)Z" />
 		<method name="onDestroyActionMode(Landroid/view/ActionMode;)V" />
 		<method name="onPrepareActionMode(Landroid/view/ActionMode;Landroid/view/Menu;)Z" />
 	</class>
 	<class name="android/view/ActionProvider" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="hasSubMenu()Z" />
 		<method name="onCreateActionView()Landroid/view/View;" />
@@ -21944,10 +21374,12 @@
 		<method name="onPrepareSubMenu(Landroid/view/SubMenu;)V" />
 	</class>
 	<class name="android/view/CollapsibleActionView" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onActionViewCollapsed()V" />
 		<method name="onActionViewExpanded()V" />
 	</class>
 	<class name="android/view/ContextMenu" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/view/Menu" />
 		<method name="clearHeader()V" />
 		<method name="setHeaderIcon(I)Landroid/view/ContextMenu;" />
@@ -21957,6 +21389,7 @@
 		<method name="setHeaderView(Landroid/view/View;)Landroid/view/ContextMenu;" />
 	</class>
 	<class name="android/view/ContextMenu$ContextMenuInfo" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="android/view/ContextThemeWrapper" since="1">
 		<extends name="android/content/ContextWrapper" />
@@ -21966,6 +21399,7 @@
 	</class>
 	<class name="android/view/Display" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getDisplayId()I" />
 		<method name="getHeight()I" />
 		<method name="getMetrics(Landroid/util/DisplayMetrics;)V" />
@@ -21981,7 +21415,7 @@
 	<class name="android/view/DragEvent" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getAction()I" />
 		<method name="getClipData()Landroid/content/ClipData;" />
 		<method name="getClipDescription()Landroid/content/ClipDescription;" />
@@ -21989,7 +21423,6 @@
 		<method name="getResult()Z" />
 		<method name="getX()F" />
 		<method name="getY()F" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ACTION_DRAG_ENDED" />
 		<field name="ACTION_DRAG_ENTERED" />
 		<field name="ACTION_DRAG_EXITED" />
@@ -22000,6 +21433,7 @@
 	</class>
 	<class name="android/view/FocusFinder" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="findNearestTouchable(Landroid/view/ViewGroup;III[I)Landroid/view/View;" />
 		<method name="findNextFocus(Landroid/view/ViewGroup;Landroid/view/View;I)Landroid/view/View;" />
 		<method name="findNextFocusFromRect(Landroid/view/ViewGroup;Landroid/graphics/Rect;I)Landroid/view/View;" />
@@ -22018,11 +21452,13 @@
 		<method name="setOnDoubleTapListener(Landroid/view/GestureDetector$OnDoubleTapListener;)V" since="3" />
 	</class>
 	<class name="android/view/GestureDetector$OnDoubleTapListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onDoubleTap(Landroid/view/MotionEvent;)Z" />
 		<method name="onDoubleTapEvent(Landroid/view/MotionEvent;)Z" />
 		<method name="onSingleTapConfirmed(Landroid/view/MotionEvent;)Z" />
 	</class>
 	<class name="android/view/GestureDetector$OnGestureListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onDown(Landroid/view/MotionEvent;)Z" />
 		<method name="onFling(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z" />
 		<method name="onLongPress(Landroid/view/MotionEvent;)V" />
@@ -22032,18 +21468,9 @@
 	</class>
 	<class name="android/view/GestureDetector$SimpleOnGestureListener" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="android/view/GestureDetector$OnGestureListener" />
 		<implements name="android/view/GestureDetector$OnDoubleTapListener" since="3" />
+		<implements name="android/view/GestureDetector$OnGestureListener" />
 		<method name="&lt;init>()V" />
-		<method name="onDoubleTap(Landroid/view/MotionEvent;)Z" since="3" />
-		<method name="onDoubleTapEvent(Landroid/view/MotionEvent;)Z" since="3" />
-		<method name="onDown(Landroid/view/MotionEvent;)Z" />
-		<method name="onFling(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z" />
-		<method name="onLongPress(Landroid/view/MotionEvent;)V" />
-		<method name="onScroll(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z" />
-		<method name="onShowPress(Landroid/view/MotionEvent;)V" />
-		<method name="onSingleTapConfirmed(Landroid/view/MotionEvent;)Z" since="3" />
-		<method name="onSingleTapUp(Landroid/view/MotionEvent;)Z" />
 	</class>
 	<class name="android/view/Gravity" since="1">
 		<extends name="java/lang/Object" />
@@ -22084,6 +21511,7 @@
 	</class>
 	<class name="android/view/HapticFeedbackConstants" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="FLAG_IGNORE_GLOBAL_SETTING" />
 		<field name="FLAG_IGNORE_VIEW_SETTING" />
 		<field name="KEYBOARD_TAP" since="8" />
@@ -22100,7 +21528,7 @@
 	<class name="android/view/InputDevice" since="9">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getDevice(I)Landroid/view/InputDevice;" />
 		<method name="getDeviceIds()[I" />
 		<method name="getId()I" />
@@ -22111,7 +21539,6 @@
 		<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" />
 		<field name="CREATOR" />
 		<field name="KEYBOARD_TYPE_ALPHABETIC" />
 		<field name="KEYBOARD_TYPE_NONE" />
@@ -22145,6 +21572,7 @@
 	</class>
 	<class name="android/view/InputDevice$MotionRange" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getAxis()I" since="12" />
 		<method name="getFlat()F" />
 		<method name="getFuzz()F" />
@@ -22156,7 +21584,7 @@
 	<class name="android/view/InputEvent" since="9">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getDevice()Landroid/view/InputDevice;" />
 		<method name="getDeviceId()I" />
 		<method name="getSource()I" />
@@ -22164,13 +21592,16 @@
 	</class>
 	<class name="android/view/InputQueue" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/view/InputQueue$Callback" since="9">
+		<extends name="java/lang/Object" />
 		<method name="onInputQueueCreated(Landroid/view/InputQueue;)V" />
 		<method name="onInputQueueDestroyed(Landroid/view/InputQueue;)V" />
 	</class>
 	<class name="android/view/KeyCharacterMap" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="deviceHasKey(I)Z" since="3" />
 		<method name="deviceHasKeys([I)[Z" since="3" />
 		<method name="get(II)I" />
@@ -22212,8 +21643,8 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/view/KeyEvent" since="1">
-		<extends name="java/lang/Object" />
 		<extends name="android/view/InputEvent" since="9" />
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(II)V" />
 		<method name="&lt;init>(JJIII)V" />
@@ -22228,7 +21659,6 @@
 		<method name="changeFlags(Landroid/view/KeyEvent;I)Landroid/view/KeyEvent;" since="3" />
 		<method name="changeTimeRepeat(Landroid/view/KeyEvent;JI)Landroid/view/KeyEvent;" since="3" />
 		<method name="changeTimeRepeat(Landroid/view/KeyEvent;JII)Landroid/view/KeyEvent;" since="5" />
-		<method name="describeContents()I" />
 		<method name="dispatch(Landroid/view/KeyEvent$Callback;)Z" />
 		<method name="dispatch(Landroid/view/KeyEvent$Callback;Landroid/view/KeyEvent$DispatcherState;Ljava/lang/Object;)Z" since="5" />
 		<method name="getAction()I" />
@@ -22251,7 +21681,6 @@
 		<method name="getNumber()C" />
 		<method name="getRepeatCount()I" />
 		<method name="getScanCode()I" />
-		<method name="getSource()I" since="12" />
 		<method name="getUnicodeChar()I" />
 		<method name="getUnicodeChar(I)I" />
 		<method name="hasModifiers(I)Z" since="11" />
@@ -22279,7 +21708,6 @@
 		<method name="normalizeMetaState(I)I" since="11" />
 		<method name="setSource(I)V" since="12" />
 		<method name="startTracking()V" since="5" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ACTION_DOWN" />
 		<field name="ACTION_MULTIPLE" />
 		<field name="ACTION_UP" />
@@ -22530,6 +21958,7 @@
 		<field name="META_SYM_ON" />
 	</class>
 	<class name="android/view/KeyEvent$Callback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onKeyDown(ILandroid/view/KeyEvent;)Z" />
 		<method name="onKeyLongPress(ILandroid/view/KeyEvent;)Z" since="5" />
 		<method name="onKeyMultiple(IILandroid/view/KeyEvent;)Z" />
@@ -22567,16 +21996,20 @@
 		<method name="setFilter(Landroid/view/LayoutInflater$Filter;)V" />
 	</class>
 	<class name="android/view/LayoutInflater$Factory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onCreateView(Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;" />
 	</class>
 	<class name="android/view/LayoutInflater$Factory2" since="11">
+		<extends name="java/lang/Object" />
 		<implements name="android/view/LayoutInflater$Factory" />
 		<method name="onCreateView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;" />
 	</class>
 	<class name="android/view/LayoutInflater$Filter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onLoadClass(Ljava/lang/Class;)Z" />
 	</class>
 	<class name="android/view/Menu" since="1">
+		<extends name="java/lang/Object" />
 		<method name="add(I)Landroid/view/MenuItem;" />
 		<method name="add(IIII)Landroid/view/MenuItem;" />
 		<method name="add(IIILjava/lang/CharSequence;)Landroid/view/MenuItem;" />
@@ -22617,6 +22050,7 @@
 		<method name="inflate(ILandroid/view/Menu;)V" />
 	</class>
 	<class name="android/view/MenuItem" since="1">
+		<extends name="java/lang/Object" />
 		<method name="collapseActionView()Z" since="14" />
 		<method name="expandActionView()Z" since="14" />
 		<method name="getActionProvider()Landroid/view/ActionProvider;" since="14" />
@@ -22665,21 +22099,23 @@
 		<field name="SHOW_AS_ACTION_WITH_TEXT" since="11" />
 	</class>
 	<class name="android/view/MenuItem$OnActionExpandListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onMenuItemActionCollapse(Landroid/view/MenuItem;)Z" />
 		<method name="onMenuItemActionExpand(Landroid/view/MenuItem;)Z" />
 	</class>
 	<class name="android/view/MenuItem$OnMenuItemClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onMenuItemClick(Landroid/view/MenuItem;)Z" />
 	</class>
 	<class name="android/view/MotionEvent" since="1">
-		<extends name="java/lang/Object" />
 		<extends name="android/view/InputEvent" since="9" />
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<method name="addBatch(JFFFFI)V" />
 		<method name="addBatch(J[Landroid/view/MotionEvent$PointerCoords;I)V" since="9" />
 		<method name="axisFromString(Ljava/lang/String;)I" since="12" />
 		<method name="axisToString(I)Ljava/lang/String;" since="12" />
-		<method name="describeContents()I" />
 		<method name="findPointerIndex(I)I" since="5" />
 		<method name="getAction()I" />
 		<method name="getActionIndex()I" since="8" />
@@ -22728,7 +22164,6 @@
 		<method name="getRawY()F" />
 		<method name="getSize()F" />
 		<method name="getSize(I)F" since="5" />
-		<method name="getSource()I" since="12" />
 		<method name="getToolMajor()F" since="9" />
 		<method name="getToolMajor(I)F" since="9" />
 		<method name="getToolMinor()F" since="9" />
@@ -22758,7 +22193,6 @@
 		<method name="setLocation(FF)V" />
 		<method name="setSource(I)V" since="12" />
 		<method name="transform(Landroid/graphics/Matrix;)V" since="11" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ACTION_CANCEL" />
 		<field name="ACTION_DOWN" />
 		<field name="ACTION_HOVER_ENTER" since="14" />
@@ -22860,6 +22294,7 @@
 		<field name="y" />
 	</class>
 	<class name="android/view/MotionEvent$PointerProperties" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/view/MotionEvent$PointerProperties;)V" />
 		<method name="clear()V" />
@@ -22884,9 +22319,7 @@
 		<method name="&lt;init>(Landroid/content/Context;I)V" since="3" />
 		<method name="disable()V" />
 		<method name="enable()V" />
-		<method name="onAccuracyChanged(II)V" />
 		<method name="onOrientationChanged(I)V" />
-		<method name="onSensorChanged(I[F)V" />
 		<field name="ORIENTATION_UNKNOWN" />
 	</class>
 	<class name="android/view/ScaleGestureDetector" since="8">
@@ -22907,6 +22340,7 @@
 		<method name="onTouchEvent(Landroid/view/MotionEvent;)Z" />
 	</class>
 	<class name="android/view/ScaleGestureDetector$OnScaleGestureListener" since="8">
+		<extends name="java/lang/Object" />
 		<method name="onScale(Landroid/view/ScaleGestureDetector;)Z" />
 		<method name="onScaleBegin(Landroid/view/ScaleGestureDetector;)Z" />
 		<method name="onScaleEnd(Landroid/view/ScaleGestureDetector;)V" />
@@ -22915,12 +22349,10 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/view/ScaleGestureDetector$OnScaleGestureListener" />
 		<method name="&lt;init>()V" />
-		<method name="onScale(Landroid/view/ScaleGestureDetector;)Z" />
-		<method name="onScaleBegin(Landroid/view/ScaleGestureDetector;)Z" />
-		<method name="onScaleEnd(Landroid/view/ScaleGestureDetector;)V" />
 	</class>
 	<class name="android/view/SoundEffectConstants" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getContantForFocusDirection(I)I" />
 		<field name="CLICK" />
 		<field name="NAVIGATION_DOWN" />
@@ -22929,6 +22361,7 @@
 		<field name="NAVIGATION_UP" />
 	</class>
 	<class name="android/view/SubMenu" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/view/Menu" />
 		<method name="clearHeader()V" />
 		<method name="getItem()Landroid/view/MenuItem;" />
@@ -22943,8 +22376,8 @@
 	<class name="android/view/Surface" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/graphics/SurfaceTexture;)V" since="14" />
-		<method name="describeContents()I" />
 		<method name="freeze()V" />
 		<method name="hide()V" />
 		<method name="isValid()Z" />
@@ -22964,7 +22397,6 @@
 		<method name="unfreeze()V" />
 		<method name="unlockCanvas(Landroid/graphics/Canvas;)V" />
 		<method name="unlockCanvasAndPost(Landroid/graphics/Canvas;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="FX_SURFACE_BLUR" />
 		<field name="FX_SURFACE_DIM" />
@@ -22992,6 +22424,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/view/SurfaceHolder" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addCallback(Landroid/view/SurfaceHolder$Callback;)V" />
 		<method name="getSurface()Landroid/view/Surface;" />
 		<method name="getSurfaceFrame()Landroid/graphics/Rect;" />
@@ -23016,11 +22449,13 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/view/SurfaceHolder$Callback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="surfaceChanged(Landroid/view/SurfaceHolder;III)V" />
 		<method name="surfaceCreated(Landroid/view/SurfaceHolder;)V" />
 		<method name="surfaceDestroyed(Landroid/view/SurfaceHolder;)V" />
 	</class>
 	<class name="android/view/SurfaceHolder$Callback2" since="9">
+		<extends name="java/lang/Object" />
 		<implements name="android/view/SurfaceHolder$Callback" />
 		<method name="surfaceRedrawNeeded(Landroid/view/SurfaceHolder;)V" />
 	</class>
@@ -23039,7 +22474,6 @@
 		<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="draw(Landroid/graphics/Canvas;)V" />
 		<method name="getBitmap()Landroid/graphics/Bitmap;" />
 		<method name="getBitmap(II)Landroid/graphics/Bitmap;" />
 		<method name="getBitmap(Landroid/graphics/Bitmap;)Landroid/graphics/Bitmap;" />
@@ -23049,13 +22483,13 @@
 		<method name="isAvailable()Z" />
 		<method name="lockCanvas()Landroid/graphics/Canvas;" />
 		<method name="lockCanvas(Landroid/graphics/Rect;)Landroid/graphics/Canvas;" />
-		<method name="onDraw(Landroid/graphics/Canvas;)V" />
 		<method name="setOpaque(Z)V" />
 		<method name="setSurfaceTextureListener(Landroid/view/TextureView$SurfaceTextureListener;)V" />
 		<method name="setTransform(Landroid/graphics/Matrix;)V" />
 		<method name="unlockCanvasAndPost(Landroid/graphics/Canvas;)V" />
 	</class>
 	<class name="android/view/TextureView$SurfaceTextureListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onSurfaceTextureAvailable(Landroid/graphics/SurfaceTexture;II)V" />
 		<method name="onSurfaceTextureDestroyed(Landroid/graphics/SurfaceTexture;)Z" />
 		<method name="onSurfaceTextureSizeChanged(Landroid/graphics/SurfaceTexture;II)V" />
@@ -23072,6 +22506,7 @@
 	</class>
 	<class name="android/view/VelocityTracker" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="addMovement(Landroid/view/MotionEvent;)V" />
 		<method name="clear()V" />
 		<method name="computeCurrentVelocity(I)V" />
@@ -23264,7 +22699,6 @@
 		<method name="invalidate()V" />
 		<method name="invalidate(IIII)V" />
 		<method name="invalidate(Landroid/graphics/Rect;)V" />
-		<method name="invalidateDrawable(Landroid/graphics/drawable/Drawable;)V" />
 		<method name="isActivated()Z" since="11" />
 		<method name="isClickable()Z" />
 		<method name="isDirty()Z" since="11" />
@@ -23322,12 +22756,8 @@
 		<method name="onHoverEvent(Landroid/view/MotionEvent;)Z" since="14" />
 		<method name="onInitializeAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V" since="14" />
 		<method name="onInitializeAccessibilityNodeInfo(Landroid/view/accessibility/AccessibilityNodeInfo;)V" since="14" />
-		<method name="onKeyDown(ILandroid/view/KeyEvent;)Z" />
-		<method name="onKeyLongPress(ILandroid/view/KeyEvent;)Z" since="5" />
-		<method name="onKeyMultiple(IILandroid/view/KeyEvent;)Z" />
 		<method name="onKeyPreIme(ILandroid/view/KeyEvent;)Z" since="3" />
 		<method name="onKeyShortcut(ILandroid/view/KeyEvent;)Z" />
-		<method name="onKeyUp(ILandroid/view/KeyEvent;)Z" />
 		<method name="onLayout(ZIIII)V" />
 		<method name="onMeasure(II)V" />
 		<method name="onOverScrolled(IIZZ)V" since="9" />
@@ -23370,11 +22800,8 @@
 		<method name="resolveSizeAndState(III)I" since="11" />
 		<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" />
-		<method name="sendAccessibilityEvent(I)V" since="4" />
-		<method name="sendAccessibilityEventUnchecked(Landroid/view/accessibility/AccessibilityEvent;)V" since="4" />
 		<method name="setAccessibilityDelegate(Landroid/view/View$AccessibilityDelegate;)V" since="14" />
 		<method name="setActivated(Z)V" since="11" />
 		<method name="setAlpha(F)V" since="11" />
@@ -23464,7 +22891,6 @@
 		<method name="startAnimation(Landroid/view/animation/Animation;)V" />
 		<method name="startDrag(Landroid/content/ClipData;Landroid/view/View$DragShadowBuilder;Ljava/lang/Object;I)Z" since="11" />
 		<method name="unscheduleDrawable(Landroid/graphics/drawable/Drawable;)V" />
-		<method name="unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V" />
 		<method name="verifyDrawable(Landroid/graphics/drawable/Drawable;)Z" />
 		<method name="willNotCacheDrawing()Z" />
 		<method name="willNotDraw()Z" />
@@ -23554,6 +22980,7 @@
 		<field name="Y" since="14" />
 	</class>
 	<class name="android/view/View$AccessibilityDelegate" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="dispatchPopulateAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)Z" />
 		<method name="onInitializeAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V" />
@@ -23589,40 +23016,52 @@
 		<field name="UNSPECIFIED" />
 	</class>
 	<class name="android/view/View$OnAttachStateChangeListener" since="12">
+		<extends name="java/lang/Object" />
 		<method name="onViewAttachedToWindow(Landroid/view/View;)V" />
 		<method name="onViewDetachedFromWindow(Landroid/view/View;)V" />
 	</class>
 	<class name="android/view/View$OnClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onClick(Landroid/view/View;)V" />
 	</class>
 	<class name="android/view/View$OnCreateContextMenuListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onCreateContextMenu(Landroid/view/ContextMenu;Landroid/view/View;Landroid/view/ContextMenu$ContextMenuInfo;)V" />
 	</class>
 	<class name="android/view/View$OnDragListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onDrag(Landroid/view/View;Landroid/view/DragEvent;)Z" />
 	</class>
 	<class name="android/view/View$OnFocusChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onFocusChange(Landroid/view/View;Z)V" />
 	</class>
 	<class name="android/view/View$OnGenericMotionListener" since="12">
+		<extends name="java/lang/Object" />
 		<method name="onGenericMotion(Landroid/view/View;Landroid/view/MotionEvent;)Z" />
 	</class>
 	<class name="android/view/View$OnHoverListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onHover(Landroid/view/View;Landroid/view/MotionEvent;)Z" />
 	</class>
 	<class name="android/view/View$OnKeyListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onKey(Landroid/view/View;ILandroid/view/KeyEvent;)Z" />
 	</class>
 	<class name="android/view/View$OnLayoutChangeListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onLayoutChange(Landroid/view/View;IIIIIIII)V" />
 	</class>
 	<class name="android/view/View$OnLongClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onLongClick(Landroid/view/View;)Z" />
 	</class>
 	<class name="android/view/View$OnSystemUiVisibilityChangeListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onSystemUiVisibilityChange(I)V" />
 	</class>
 	<class name="android/view/View$OnTouchListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z" />
 	</class>
 	<class name="android/view/ViewConfiguration" since="1">
@@ -23679,14 +23118,26 @@
 	<class name="android/view/ViewDebug$CapturedViewProperty" since="3">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="retrieveReturn()Z" />
 	</class>
 	<class name="android/view/ViewDebug$ExportedProperty" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="category()Ljava/lang/String;" since="9" />
+		<method name="deepExport()Z" />
+		<method name="flagMapping()[Landroid/view/ViewDebug$FlagToString;" since="4" />
+		<method name="indexMapping()[Landroid/view/ViewDebug$IntToString;" since="3" />
+		<method name="mapping()[Landroid/view/ViewDebug$IntToString;" />
+		<method name="prefix()Ljava/lang/String;" />
+		<method name="resolveId()Z" />
 	</class>
 	<class name="android/view/ViewDebug$FlagToString" since="4">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="equals()I" />
+		<method name="mask()I" />
+		<method name="name()Ljava/lang/String;" />
+		<method name="outputIf()Z" />
 	</class>
 	<class name="android/view/ViewDebug$HierarchyTraceType" since="1">
 		<extends name="java/lang/Enum" />
@@ -23704,6 +23155,8 @@
 	<class name="android/view/ViewDebug$IntToString" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="from()I" />
+		<method name="to()Ljava/lang/String;" />
 	</class>
 	<class name="android/view/ViewDebug$RecyclerTraceType" since="1">
 		<extends name="java/lang/Enum" />
@@ -23729,17 +23182,13 @@
 		<method name="addView(Landroid/view/View;I)V" />
 		<method name="addView(Landroid/view/View;II)V" />
 		<method name="addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V" />
-		<method name="addView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V" />
 		<method name="addViewInLayout(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)Z" />
 		<method name="addViewInLayout(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;Z)Z" />
 		<method name="attachLayoutAnimationParameters(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;II)V" />
 		<method name="attachViewToParent(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V" />
-		<method name="bringChildToFront(Landroid/view/View;)V" />
 		<method name="canAnimate()Z" />
 		<method name="checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z" />
-		<method name="childDrawableStateChanged(Landroid/view/View;)V" />
 		<method name="cleanupLayoutState(Landroid/view/View;)V" />
-		<method name="clearChildFocus(Landroid/view/View;)V" />
 		<method name="clearDisappearingChildren()V" />
 		<method name="debug(I)V" />
 		<method name="detachAllViewsFromParent()V" />
@@ -23747,13 +23196,9 @@
 		<method name="detachViewFromParent(Landroid/view/View;)V" />
 		<method name="detachViewsFromParent(II)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;)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;" />
-		<method name="focusableViewAvailable(Landroid/view/View;)V" />
 		<method name="gatherTransparentRegion(Landroid/graphics/Region;)Z" />
 		<method name="generateDefaultLayoutParams()Landroid/view/ViewGroup$LayoutParams;" />
 		<method name="generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;" />
@@ -23763,7 +23208,6 @@
 		<method name="getChildDrawingOrder(II)I" />
 		<method name="getChildMeasureSpec(III)I" />
 		<method name="getChildStaticTransformation(Landroid/view/View;Landroid/view/animation/Transformation;)Z" />
-		<method name="getChildVisibleRect(Landroid/view/View;Landroid/graphics/Rect;Landroid/graphics/Point;)Z" />
 		<method name="getDescendantFocusability()I" />
 		<method name="getFocusedChild()Landroid/view/View;" />
 		<method name="getLayoutAnimation()Landroid/view/animation/LayoutAnimationController;" />
@@ -23771,14 +23215,11 @@
 		<method name="getLayoutTransition()Landroid/animation/LayoutTransition;" since="11" />
 		<method name="getPersistentDrawingCache()I" />
 		<method name="indexOfChild(Landroid/view/View;)I" />
-		<method name="invalidateChild(Landroid/view/View;Landroid/graphics/Rect;)V" />
-		<method name="invalidateChildInParent([ILandroid/graphics/Rect;)Landroid/view/ViewParent;" />
 		<method name="isAlwaysDrawnWithCacheEnabled()Z" />
 		<method name="isAnimationCacheEnabled()Z" />
 		<method name="isChildrenDrawingOrderEnabled()Z" since="7" />
 		<method name="isChildrenDrawnWithCacheEnabled()Z" />
 		<method name="isMotionEventSplittingEnabled()Z" since="11" />
-		<method name="layout(IIII)V" since="11" />
 		<method name="measureChild(Landroid/view/View;II)V" />
 		<method name="measureChildWithMargins(Landroid/view/View;IIII)V" />
 		<method name="measureChildren(II)V" />
@@ -23786,23 +23227,16 @@
 		<method name="offsetRectIntoDescendantCoords(Landroid/view/View;Landroid/graphics/Rect;)V" />
 		<method name="onInterceptHoverEvent(Landroid/view/MotionEvent;)Z" since="14" />
 		<method name="onInterceptTouchEvent(Landroid/view/MotionEvent;)Z" />
-		<method name="onLayout(ZIIII)V" />
 		<method name="onRequestFocusInDescendants(ILandroid/graphics/Rect;)Z" />
 		<method name="onRequestSendAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)Z" since="14" />
-		<method name="recomputeViewAttributes(Landroid/view/View;)V" />
 		<method name="removeAllViews()V" />
 		<method name="removeAllViewsInLayout()V" />
 		<method name="removeDetachedView(Landroid/view/View;Z)V" />
-		<method name="removeView(Landroid/view/View;)V" />
 		<method name="removeViewAt(I)V" />
 		<method name="removeViewInLayout(Landroid/view/View;)V" />
 		<method name="removeViews(II)V" />
 		<method name="removeViewsInLayout(II)V" />
-		<method name="requestChildFocus(Landroid/view/View;Landroid/view/View;)V" />
 		<method name="requestChildRectangleOnScreen(Landroid/view/View;Landroid/graphics/Rect;Z)Z" />
-		<method name="requestDisallowInterceptTouchEvent(Z)V" />
-		<method name="requestSendAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)Z" since="14" />
-		<method name="requestTransparentRegion(Landroid/view/View;)V" />
 		<method name="resetResolvedLayoutDirection()V" since="14" />
 		<method name="resetResolvedTextDirection()V" since="14" />
 		<method name="scheduleLayoutAnimation()V" />
@@ -23823,11 +23257,8 @@
 		<method name="setPersistentDrawingCache(I)V" />
 		<method name="setStaticTransformationsEnabled(Z)V" since="3" />
 		<method name="shouldDelayChildPressedState()Z" since="14" />
-		<method name="showContextMenuForChild(Landroid/view/View;)Z" />
-		<method name="startActionModeForChild(Landroid/view/View;Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode;" since="11" />
 		<method name="startLayoutAnimation()V" />
 		<method name="startViewTransition(Landroid/view/View;)V" since="11" />
-		<method name="updateViewLayout(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V" />
 		<field name="CLIP_TO_PADDING_MASK" />
 		<field name="FLAG_USE_CHILD_DRAWING_ORDER" />
 		<field name="FOCUS_AFTER_DESCENDANTS" />
@@ -23864,15 +23295,18 @@
 		<field name="topMargin" />
 	</class>
 	<class name="android/view/ViewGroup$OnHierarchyChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onChildViewAdded(Landroid/view/View;Landroid/view/View;)V" />
 		<method name="onChildViewRemoved(Landroid/view/View;Landroid/view/View;)V" />
 	</class>
 	<class name="android/view/ViewManager" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V" />
 		<method name="removeView(Landroid/view/View;)V" />
 		<method name="updateViewLayout(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V" />
 	</class>
 	<class name="android/view/ViewParent" since="1">
+		<extends name="java/lang/Object" />
 		<method name="bringChildToFront(Landroid/view/View;)V" />
 		<method name="childDrawableStateChanged(Landroid/view/View;)V" />
 		<method name="clearChildFocus(Landroid/view/View;)V" />
@@ -23896,6 +23330,7 @@
 	</class>
 	<class name="android/view/ViewPropertyAnimator" since="12">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="alpha(F)Landroid/view/ViewPropertyAnimator;" />
 		<method name="alphaBy(F)Landroid/view/ViewPropertyAnimator;" />
 		<method name="cancel()V" since="14" />
@@ -23939,10 +23374,12 @@
 		<method name="setOnInflateListener(Landroid/view/ViewStub$OnInflateListener;)V" />
 	</class>
 	<class name="android/view/ViewStub$OnInflateListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onInflate(Landroid/view/ViewStub;Landroid/view/View;)V" />
 	</class>
 	<class name="android/view/ViewTreeObserver" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="addOnGlobalFocusChangeListener(Landroid/view/ViewTreeObserver$OnGlobalFocusChangeListener;)V" />
 		<method name="addOnGlobalLayoutListener(Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;)V" />
 		<method name="addOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V" />
@@ -23958,18 +23395,23 @@
 		<method name="removeOnTouchModeChangeListener(Landroid/view/ViewTreeObserver$OnTouchModeChangeListener;)V" />
 	</class>
 	<class name="android/view/ViewTreeObserver$OnGlobalFocusChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onGlobalFocusChanged(Landroid/view/View;Landroid/view/View;)V" />
 	</class>
 	<class name="android/view/ViewTreeObserver$OnGlobalLayoutListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onGlobalLayout()V" />
 	</class>
 	<class name="android/view/ViewTreeObserver$OnPreDrawListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onPreDraw()Z" />
 	</class>
 	<class name="android/view/ViewTreeObserver$OnScrollChangedListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onScrollChanged()V" />
 	</class>
 	<class name="android/view/ViewTreeObserver$OnTouchModeChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onTouchModeChanged(Z)V" />
 	</class>
 	<class name="android/view/Window" since="1">
@@ -24075,6 +23517,7 @@
 		<field name="PROGRESS_VISIBILITY_ON" />
 	</class>
 	<class name="android/view/Window$Callback" since="1">
+		<extends name="java/lang/Object" />
 		<method name="dispatchGenericMotionEvent(Landroid/view/MotionEvent;)Z" since="12" />
 		<method name="dispatchKeyEvent(Landroid/view/KeyEvent;)Z" />
 		<method name="dispatchKeyShortcutEvent(Landroid/view/KeyEvent;)Z" since="11" />
@@ -24098,6 +23541,7 @@
 		<method name="onWindowStartingActionMode(Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode;" since="11" />
 	</class>
 	<class name="android/view/WindowManager" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/view/ViewManager" />
 		<method name="getDefaultDisplay()Landroid/view/Display;" />
 		<method name="removeViewImmediate(Landroid/view/View;)V" />
@@ -24119,11 +23563,9 @@
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="copyFrom(Landroid/view/WindowManager$LayoutParams;)I" />
 		<method name="debug(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="describeContents()I" />
 		<method name="getTitle()Ljava/lang/CharSequence;" />
 		<method name="mayUseInputMethod(I)Z" since="3" />
 		<method name="setTitle(Ljava/lang/CharSequence;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ALPHA_CHANGED" />
 		<field name="ANIMATION_CHANGED" />
 		<field name="BRIGHTNESS_OVERRIDE_FULL" since="8" />
@@ -24233,11 +23675,11 @@
 		<field name="y" />
 	</class>
 	<class name="android/view/accessibility/AccessibilityEvent" since="4">
-		<extends name="java/lang/Object" />
 		<extends name="android/view/accessibility/AccessibilityRecord" since="14" />
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<method name="appendRecord(Landroid/view/accessibility/AccessibilityRecord;)V" since="14" />
-		<method name="describeContents()I" />
 		<method name="eventTypeToString(I)Ljava/lang/String;" since="14" />
 		<method name="getAddedCount()I" />
 		<method name="getBeforeText()Ljava/lang/CharSequence;" />
@@ -24279,7 +23721,6 @@
 		<method name="setParcelableData(Landroid/os/Parcelable;)V" />
 		<method name="setPassword(Z)V" />
 		<method name="setRemovedCount(I)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="INVALID_POSITION" />
 		<field name="MAX_TEXT_LENGTH" />
@@ -24300,11 +23741,13 @@
 		<field name="TYPE_WINDOW_STATE_CHANGED" />
 	</class>
 	<class name="android/view/accessibility/AccessibilityEventSource" since="4">
+		<extends name="java/lang/Object" />
 		<method name="sendAccessibilityEvent(I)V" />
 		<method name="sendAccessibilityEventUnchecked(Landroid/view/accessibility/AccessibilityEvent;)V" />
 	</class>
 	<class name="android/view/accessibility/AccessibilityManager" since="4">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="addAccessibilityStateChangeListener(Landroid/view/accessibility/AccessibilityManager$AccessibilityStateChangeListener;)Z" since="14" />
 		<method name="getAccessibilityServiceList()Ljava/util/List;" />
 		<method name="getEnabledAccessibilityServiceList(I)Ljava/util/List;" since="14" />
@@ -24316,13 +23759,15 @@
 		<method name="sendAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V" />
 	</class>
 	<class name="android/view/accessibility/AccessibilityManager$AccessibilityStateChangeListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onAccessibilityStateChanged(Z)V" />
 	</class>
 	<class name="android/view/accessibility/AccessibilityNodeInfo" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<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;" />
 		<method name="getActions()I" />
 		<method name="getBoundsInParent(Landroid/graphics/Rect;)V" />
@@ -24368,7 +23813,6 @@
 		<method name="setSelected(Z)V" />
 		<method name="setSource(Landroid/view/View;)V" />
 		<method name="setText(Ljava/lang/CharSequence;)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="ACTION_CLEAR_FOCUS" />
 		<field name="ACTION_CLEAR_SELECTION" />
 		<field name="ACTION_FOCUS" />
@@ -24376,6 +23820,8 @@
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/accessibility/AccessibilityRecord" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getAddedCount()I" />
 		<method name="getBeforeText()Ljava/lang/CharSequence;" />
 		<method name="getClassName()Ljava/lang/CharSequence;" />
@@ -24427,7 +23873,6 @@
 		<implements name="android/view/animation/Interpolator" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
-		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/view/animation/AccelerateInterpolator" since="1">
 		<extends name="java/lang/Object" />
@@ -24435,7 +23880,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(F)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
-		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/view/animation/AlphaAnimation" since="1">
 		<extends name="android/view/animation/Animation" />
@@ -24449,6 +23893,7 @@
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
 		<method name="applyTransformation(FLandroid/view/animation/Transformation;)V" />
 		<method name="cancel()V" since="8" />
+		<method name="clone()Landroid/view/animation/Animation;" since="3" />
 		<method name="computeDurationHint()J" since="3" />
 		<method name="ensureInterpolator()V" />
 		<method name="getBackgroundColor()I" since="12" />
@@ -24504,6 +23949,7 @@
 		<field name="ZORDER_TOP" />
 	</class>
 	<class name="android/view/animation/Animation$AnimationListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onAnimationEnd(Landroid/view/animation/Animation;)V" />
 		<method name="onAnimationRepeat(Landroid/view/animation/Animation;)V" />
 		<method name="onAnimationStart(Landroid/view/animation/Animation;)V" />
@@ -24519,6 +23965,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="clone()Landroid/view/animation/AnimationSet;" since="3" />
 		<method name="getAnimations()Ljava/util/List;" />
 	</class>
 	<class name="android/view/animation/AnimationUtils" since="1">
@@ -24538,7 +23985,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(F)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
-		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/view/animation/AnticipateOvershootInterpolator" since="4">
 		<extends name="java/lang/Object" />
@@ -24547,21 +23993,18 @@
 		<method name="&lt;init>(F)V" />
 		<method name="&lt;init>(FF)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
-		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/view/animation/BounceInterpolator" since="4">
 		<extends name="java/lang/Object" />
 		<implements name="android/view/animation/Interpolator" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
-		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/view/animation/CycleInterpolator" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/view/animation/Interpolator" />
 		<method name="&lt;init>(F)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
-		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/view/animation/DecelerateInterpolator" since="1">
 		<extends name="java/lang/Object" />
@@ -24569,7 +24012,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(F)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
-		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/view/animation/GridLayoutAnimationController" since="1">
 		<extends name="android/view/animation/LayoutAnimationController" />
@@ -24603,6 +24045,7 @@
 		<field name="rowsCount" />
 	</class>
 	<class name="android/view/animation/Interpolator" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/animation/TimeInterpolator" since="11" />
 		<method name="getInterpolation(F)F" />
 	</class>
@@ -24645,7 +24088,6 @@
 		<implements name="android/view/animation/Interpolator" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
-		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/view/animation/OvershootInterpolator" since="4">
 		<extends name="java/lang/Object" />
@@ -24653,7 +24095,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(F)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
-		<method name="getInterpolation(F)F" />
 	</class>
 	<class name="android/view/animation/RotateAnimation" since="1">
 		<extends name="android/view/animation/Animation" />
@@ -24699,66 +24140,39 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/view/inputmethod/InputConnection" />
 		<method name="&lt;init>(Landroid/view/View;Z)V" />
-		<method name="beginBatchEdit()Z" />
-		<method name="clearMetaKeyStates(I)Z" />
-		<method name="commitCompletion(Landroid/view/inputmethod/CompletionInfo;)Z" />
-		<method name="commitCorrection(Landroid/view/inputmethod/CorrectionInfo;)Z" since="11" />
-		<method name="commitText(Ljava/lang/CharSequence;I)Z" />
-		<method name="deleteSurroundingText(II)Z" />
-		<method name="endBatchEdit()Z" />
-		<method name="finishComposingText()Z" />
 		<method name="getComposingSpanEnd(Landroid/text/Spannable;)I" />
 		<method name="getComposingSpanStart(Landroid/text/Spannable;)I" />
-		<method name="getCursorCapsMode(I)I" />
 		<method name="getEditable()Landroid/text/Editable;" />
-		<method name="getExtractedText(Landroid/view/inputmethod/ExtractedTextRequest;I)Landroid/view/inputmethod/ExtractedText;" />
-		<method name="getSelectedText(I)Ljava/lang/CharSequence;" since="9" />
-		<method name="getTextAfterCursor(II)Ljava/lang/CharSequence;" />
-		<method name="getTextBeforeCursor(II)Ljava/lang/CharSequence;" />
-		<method name="performContextMenuAction(I)Z" />
-		<method name="performEditorAction(I)Z" />
-		<method name="performPrivateCommand(Ljava/lang/String;Landroid/os/Bundle;)Z" />
 		<method name="removeComposingSpans(Landroid/text/Spannable;)V" />
-		<method name="reportFullscreenMode(Z)Z" />
-		<method name="sendKeyEvent(Landroid/view/KeyEvent;)Z" />
-		<method name="setComposingRegion(II)Z" since="9" />
 		<method name="setComposingSpans(Landroid/text/Spannable;)V" />
-		<method name="setComposingText(Ljava/lang/CharSequence;I)Z" />
-		<method name="setSelection(II)Z" />
 	</class>
 	<class name="android/view/inputmethod/CompletionInfo" since="3">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(JILjava/lang/CharSequence;)V" />
 		<method name="&lt;init>(JILjava/lang/CharSequence;Ljava/lang/CharSequence;)V" />
-		<method name="describeContents()I" />
 		<method name="getId()J" />
 		<method name="getLabel()Ljava/lang/CharSequence;" />
 		<method name="getPosition()I" />
 		<method name="getText()Ljava/lang/CharSequence;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/inputmethod/CorrectionInfo" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(ILjava/lang/CharSequence;Ljava/lang/CharSequence;)V" />
-		<method name="describeContents()I" />
 		<method name="getNewText()Ljava/lang/CharSequence;" />
 		<method name="getOffset()I" />
 		<method name="getOldText()Ljava/lang/CharSequence;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/inputmethod/EditorInfo" since="3">
 		<extends name="java/lang/Object" />
-		<implements name="android/text/InputType" />
 		<implements name="android/os/Parcelable" />
+		<implements name="android/text/InputType" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="makeCompatible(I)V" since="11" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="IME_ACTION_DONE" />
 		<field name="IME_ACTION_GO" />
@@ -24795,8 +24209,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="FLAG_SELECTING" />
 		<field name="FLAG_SINGLE_LINE" />
@@ -24812,8 +24224,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>()V" />
-		<method name="describeContents()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="flags" />
 		<field name="hintMaxChars" />
@@ -24825,15 +24235,14 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/view/inputmethod/InputConnection;Landroid/os/IBinder;II)V" />
 		<method name="&lt;init>(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/InputBinding;)V" />
-		<method name="describeContents()I" />
 		<method name="getConnection()Landroid/view/inputmethod/InputConnection;" />
 		<method name="getConnectionToken()Landroid/os/IBinder;" />
 		<method name="getPid()I" />
 		<method name="getUid()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/inputmethod/InputConnection" since="3">
+		<extends name="java/lang/Object" />
 		<method name="beginBatchEdit()Z" />
 		<method name="clearMetaKeyStates(I)Z" />
 		<method name="commitCompletion(Landroid/view/inputmethod/CompletionInfo;)Z" />
@@ -24862,30 +24271,10 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/view/inputmethod/InputConnection" />
 		<method name="&lt;init>(Landroid/view/inputmethod/InputConnection;Z)V" />
-		<method name="beginBatchEdit()Z" />
-		<method name="clearMetaKeyStates(I)Z" />
-		<method name="commitCompletion(Landroid/view/inputmethod/CompletionInfo;)Z" />
-		<method name="commitCorrection(Landroid/view/inputmethod/CorrectionInfo;)Z" since="11" />
-		<method name="commitText(Ljava/lang/CharSequence;I)Z" />
-		<method name="deleteSurroundingText(II)Z" />
-		<method name="endBatchEdit()Z" />
-		<method name="finishComposingText()Z" />
-		<method name="getCursorCapsMode(I)I" />
-		<method name="getExtractedText(Landroid/view/inputmethod/ExtractedTextRequest;I)Landroid/view/inputmethod/ExtractedText;" />
-		<method name="getSelectedText(I)Ljava/lang/CharSequence;" since="9" />
-		<method name="getTextAfterCursor(II)Ljava/lang/CharSequence;" />
-		<method name="getTextBeforeCursor(II)Ljava/lang/CharSequence;" />
-		<method name="performContextMenuAction(I)Z" />
-		<method name="performEditorAction(I)Z" />
-		<method name="performPrivateCommand(Ljava/lang/String;Landroid/os/Bundle;)Z" />
-		<method name="reportFullscreenMode(Z)Z" />
-		<method name="sendKeyEvent(Landroid/view/KeyEvent;)Z" />
-		<method name="setComposingRegion(II)Z" since="9" />
-		<method name="setComposingText(Ljava/lang/CharSequence;I)Z" />
-		<method name="setSelection(II)Z" />
 		<method name="setTarget(Landroid/view/inputmethod/InputConnection;)V" />
 	</class>
 	<class name="android/view/inputmethod/InputMethod" since="3">
+		<extends name="java/lang/Object" />
 		<method name="attachToken(Landroid/os/IBinder;)V" />
 		<method name="bindInput(Landroid/view/inputmethod/InputBinding;)V" />
 		<method name="changeInputMethodSubtype(Landroid/view/inputmethod/InputMethodSubtype;)V" since="11" />
@@ -24903,6 +24292,7 @@
 		<field name="SHOW_FORCED" />
 	</class>
 	<class name="android/view/inputmethod/InputMethod$SessionCallback" since="3">
+		<extends name="java/lang/Object" />
 		<method name="sessionCreated(Landroid/view/inputmethod/InputMethodSession;)V" />
 	</class>
 	<class name="android/view/inputmethod/InputMethodInfo" since="3">
@@ -24910,7 +24300,6 @@
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/content/pm/ResolveInfo;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/String;)V" />
-		<method name="describeContents()I" />
 		<method name="dump(Landroid/util/Printer;Ljava/lang/String;)V" />
 		<method name="getComponent()Landroid/content/ComponentName;" />
 		<method name="getId()Ljava/lang/String;" />
@@ -24923,11 +24312,11 @@
 		<method name="getSubtypeCount()I" since="11" />
 		<method name="loadIcon(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;" />
 		<method name="loadLabel(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/inputmethod/InputMethodManager" since="3">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<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;" />
@@ -24973,6 +24362,7 @@
 		<field name="SHOW_IMPLICIT" />
 	</class>
 	<class name="android/view/inputmethod/InputMethodSession" since="3">
+		<extends name="java/lang/Object" />
 		<method name="appPrivateCommand(Ljava/lang/String;Landroid/os/Bundle;)V" />
 		<method name="dispatchKeyEvent(ILandroid/view/KeyEvent;Landroid/view/inputmethod/InputMethodSession$EventCallback;)V" />
 		<method name="dispatchTrackballEvent(ILandroid/view/MotionEvent;Landroid/view/inputmethod/InputMethodSession$EventCallback;)V" />
@@ -24985,14 +24375,15 @@
 		<method name="viewClicked(Z)V" since="14" />
 	</class>
 	<class name="android/view/inputmethod/InputMethodSession$EventCallback" since="3">
+		<extends name="java/lang/Object" />
 		<method name="finishedEvent(IZ)V" />
 	</class>
 	<class name="android/view/inputmethod/InputMethodSubtype" since="11">
 		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
+		<method name="&lt;init>()V" />
 		<method name="&lt;init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)V" since="14" />
 		<method name="containsExtraValueKey(Ljava/lang/String;)Z" since="12" />
-		<method name="describeContents()I" />
 		<method name="getDisplayName(Landroid/content/Context;Ljava/lang/String;Landroid/content/pm/ApplicationInfo;)Ljava/lang/CharSequence;" since="14" />
 		<method name="getExtraValue()Ljava/lang/String;" />
 		<method name="getExtraValueOf(Ljava/lang/String;)Ljava/lang/String;" since="12" />
@@ -25002,12 +24393,12 @@
 		<method name="getNameResId()I" />
 		<method name="isAuxiliary()Z" since="14" />
 		<method name="overridesImplicitlyEnabledSubtype()Z" since="14" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/textservice/SpellCheckerInfo" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
-		<method name="describeContents()I" />
+		<method name="&lt;init>()V" />
 		<method name="getComponent()Landroid/content/ComponentName;" />
 		<method name="getId()Ljava/lang/String;" />
 		<method name="getPackageName()Ljava/lang/String;" />
@@ -25017,10 +24408,11 @@
 		<method name="getSubtypeCount()I" />
 		<method name="loadIcon(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;" />
 		<method name="loadLabel(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/textservice/SpellCheckerSession" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="cancel()V" since="15" />
 		<method name="close()V" />
 		<method name="getSpellChecker()Landroid/view/textservice/SpellCheckerInfo;" />
@@ -25030,50 +24422,50 @@
 		<field name="SERVICE_META_DATA" />
 	</class>
 	<class name="android/view/textservice/SpellCheckerSession$SpellCheckerSessionListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onGetSuggestions([Landroid/view/textservice/SuggestionsInfo;)V" />
 	</class>
 	<class name="android/view/textservice/SpellCheckerSubtype" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(ILjava/lang/String;Ljava/lang/String;)V" />
-		<method name="describeContents()I" />
 		<method name="getDisplayName(Landroid/content/Context;Ljava/lang/String;Landroid/content/pm/ApplicationInfo;)Ljava/lang/CharSequence;" />
 		<method name="getExtraValue()Ljava/lang/String;" />
 		<method name="getLocale()Ljava/lang/String;" />
 		<method name="getNameResId()I" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/textservice/SuggestionsInfo" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(I[Ljava/lang/String;)V" />
 		<method name="&lt;init>(I[Ljava/lang/String;II)V" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
-		<method name="describeContents()I" />
 		<method name="getCookie()I" />
 		<method name="getSequence()I" />
 		<method name="getSuggestionAt(I)Ljava/lang/String;" />
 		<method name="getSuggestionsAttributes()I" />
 		<method name="getSuggestionsCount()I" />
 		<method name="setCookieAndSequence(II)V" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 		<field name="RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS" since="15" />
 		<field name="RESULT_ATTR_IN_THE_DICTIONARY" />
 		<field name="RESULT_ATTR_LOOKS_LIKE_TYPO" />
 	</class>
 	<class name="android/view/textservice/TextInfo" since="14">
+		<extends name="java/lang/Object" />
 		<implements name="android/os/Parcelable" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;II)V" />
-		<method name="describeContents()I" />
 		<method name="getCookie()I" />
 		<method name="getSequence()I" />
 		<method name="getText()Ljava/lang/String;" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/view/textservice/TextServicesManager" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="newSpellCheckerSession(Landroid/os/Bundle;Ljava/util/Locale;Landroid/view/textservice/SpellCheckerSession$SpellCheckerSessionListener;Z)Landroid/view/textservice/SpellCheckerSession;" />
 	</class>
 	<class name="android/webkit/CacheManager" since="1">
@@ -25167,6 +24559,7 @@
 	</class>
 	<class name="android/webkit/CookieManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="acceptCookie()Z" />
 		<method name="allowFileSchemeCookies()Z" since="12" />
 		<method name="getCookie(Ljava/lang/String;)Ljava/lang/String;" />
@@ -25181,6 +24574,7 @@
 	</class>
 	<class name="android/webkit/CookieSyncManager" since="1">
 		<extends name="android/webkit/WebSyncManager" />
+		<method name="&lt;init>()V" />
 		<method name="createInstance(Landroid/content/Context;)Landroid/webkit/CookieSyncManager;" />
 		<method name="getInstance()Landroid/webkit/CookieSyncManager;" />
 		<method name="syncFromRamToFlash()V" />
@@ -25194,6 +24588,7 @@
 		<field name="DAY_COUNT" />
 	</class>
 	<class name="android/webkit/DownloadListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onDownloadStart(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V" />
 	</class>
 	<class name="android/webkit/GeolocationPermissions" since="5">
@@ -25207,20 +24602,24 @@
 		<method name="getOrigins(Landroid/webkit/ValueCallback;)V" since="7" />
 	</class>
 	<class name="android/webkit/GeolocationPermissions$Callback" since="5">
+		<extends name="java/lang/Object" />
 		<method name="invoke(Ljava/lang/String;ZZ)V" />
 	</class>
 	<class name="android/webkit/HttpAuthHandler" since="1">
 		<extends name="android/os/Handler" />
+		<method name="&lt;init>()V" />
 		<method name="cancel()V" />
 		<method name="proceed(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="useHttpAuthUsernamePassword()Z" />
 	</class>
 	<class name="android/webkit/JsPromptResult" since="1">
 		<extends name="android/webkit/JsResult" />
+		<method name="&lt;init>()V" />
 		<method name="confirm(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/webkit/JsResult" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="cancel()V" />
 		<method name="confirm()V" />
 		<method name="wakeUp()V" />
@@ -25229,6 +24628,7 @@
 	</class>
 	<class name="android/webkit/MimeTypeMap" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getExtensionFromMimeType(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getFileExtensionFromUrl(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getMimeTypeFromExtension(Ljava/lang/String;)Ljava/lang/String;" />
@@ -25251,6 +24651,7 @@
 		<method name="setPath(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/webkit/Plugin$PreferencesClickHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="handleClickEvent(Landroid/content/Context;)V" />
 	</class>
 	<class name="android/webkit/PluginData" since="3">
@@ -25271,11 +24672,13 @@
 		<method name="removePlugin(Landroid/webkit/Plugin;)V" />
 	</class>
 	<class name="android/webkit/PluginStub" since="5">
+		<extends name="java/lang/Object" />
 		<method name="getEmbeddedView(ILandroid/content/Context;)Landroid/view/View;" />
 		<method name="getFullScreenView(ILandroid/content/Context;)Landroid/view/View;" />
 	</class>
 	<class name="android/webkit/SslErrorHandler" since="1">
 		<extends name="android/os/Handler" />
+		<method name="&lt;init>()V" />
 		<method name="cancel()V" />
 		<method name="proceed()V" />
 	</class>
@@ -25300,6 +24703,7 @@
 		<method name="stripAnchor(Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="android/webkit/UrlInterceptHandler" since="1">
+		<extends name="java/lang/Object" />
 		<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>
@@ -25314,12 +24718,15 @@
 		<method name="urlInterceptDisabled()Z" />
 	</class>
 	<class name="android/webkit/ValueCallback" since="7">
-		<method name="onReceiveValue(LT;)V" />
+		<extends name="java/lang/Object" />
+		<method name="onReceiveValue(Ljava/lang/Object;)V" />
 	</class>
 	<class name="android/webkit/WebBackForwardList" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
+		<method name="&lt;init>()V" />
+		<method name="clone()Landroid/webkit/WebBackForwardList;" />
 		<method name="getCurrentIndex()I" />
 		<method name="getCurrentItem()Landroid/webkit/WebHistoryItem;" />
 		<method name="getItemAtIndex(I)Landroid/webkit/WebHistoryItem;" />
@@ -25354,11 +24761,14 @@
 		<method name="onShowCustomView(Landroid/view/View;Landroid/webkit/WebChromeClient$CustomViewCallback;)V" since="7" />
 	</class>
 	<class name="android/webkit/WebChromeClient$CustomViewCallback" since="7">
+		<extends name="java/lang/Object" />
 		<method name="onCustomViewHidden()V" />
 	</class>
 	<class name="android/webkit/WebHistoryItem" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
+		<method name="&lt;init>()V" />
+		<method name="clone()Landroid/webkit/WebHistoryItem;" />
 		<method name="getFavicon()Landroid/graphics/Bitmap;" />
 		<method name="getId()I" />
 		<method name="getOriginalUrl()Ljava/lang/String;" since="3" />
@@ -25367,6 +24777,7 @@
 	</class>
 	<class name="android/webkit/WebIconDatabase" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="close()V" />
 		<method name="getInstance()Landroid/webkit/WebIconDatabase;" />
 		<method name="open(Ljava/lang/String;)V" />
@@ -25376,6 +24787,7 @@
 		<method name="retainIconForPageUrl(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/webkit/WebIconDatabase$IconListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onReceivedIcon(Ljava/lang/String;Landroid/graphics/Bitmap;)V" />
 	</class>
 	<class name="android/webkit/WebResourceResponse" since="11">
@@ -25390,6 +24802,7 @@
 	</class>
 	<class name="android/webkit/WebSettings" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="enableSmoothTransition()Z" since="11" />
 		<method name="getAllowContentAccess()Z" since="11" />
 		<method name="getAllowFileAccess()Z" since="3" />
@@ -25546,11 +24959,13 @@
 	</class>
 	<class name="android/webkit/WebStorage$Origin" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getOrigin()Ljava/lang/String;" />
 		<method name="getQuota()J" />
 		<method name="getUsage()J" />
 	</class>
 	<class name="android/webkit/WebStorage$QuotaUpdater" since="5">
+		<extends name="java/lang/Object" />
 		<method name="updateQuota(J)V" />
 	</class>
 	<class name="android/webkit/WebSyncManager" since="1">
@@ -25559,7 +24974,6 @@
 		<method name="&lt;init>(Landroid/content/Context;Ljava/lang/String;)V" />
 		<method name="onSyncInit()V" />
 		<method name="resetSync()V" />
-		<method name="run()V" />
 		<method name="startSync()V" />
 		<method name="stopSync()V" />
 		<method name="sync()V" />
@@ -25623,9 +25037,6 @@
 		<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;)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" />
 		<method name="onPause()V" since="11" />
 		<method name="onResume()V" since="11" />
 		<method name="overlayHorizontalScrollbar()Z" />
@@ -25668,6 +25079,7 @@
 	</class>
 	<class name="android/webkit/WebView$HitTestResult" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/webkit/WebView;)V" />
 		<method name="getExtra()Ljava/lang/String;" />
 		<method name="getType()I" />
 		<field name="ANCHOR_TYPE" />
@@ -25682,11 +25094,12 @@
 		<field name="UNKNOWN_TYPE" />
 	</class>
 	<class name="android/webkit/WebView$PictureListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onNewPicture(Landroid/webkit/WebView;Landroid/graphics/Picture;)V" />
 	</class>
 	<class name="android/webkit/WebView$WebViewTransport" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>()V" />
+		<method name="&lt;init>(Landroid/webkit/WebView;)V" />
 		<method name="getWebView()Landroid/webkit/WebView;" />
 		<method name="setWebView(Landroid/webkit/WebView;)V" />
 	</class>
@@ -25726,6 +25139,7 @@
 	</class>
 	<class name="android/webkit/WebViewDatabase" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="clearFormData()V" />
 		<method name="clearHttpAuthUsernamePassword()V" />
 		<method name="clearUsernamePassword()V" />
@@ -25742,18 +25156,17 @@
 	</class>
 	<class name="android/widget/AbsListView" since="1">
 		<extends name="android/widget/AdapterView" />
-		<implements name="android/widget/Filter$FilterListener" />
 		<implements name="android/text/TextWatcher" />
 		<implements name="android/view/ViewTreeObserver$OnGlobalLayoutListener" />
 		<implements name="android/view/ViewTreeObserver$OnTouchModeChangeListener" />
+		<implements name="android/widget/Filter$FilterListener" />
 		<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="afterTextChanged(Landroid/text/Editable;)V" />
-		<method name="beforeTextChanged(Ljava/lang/CharSequence;III)V" />
 		<method name="clearChoices()V" since="11" />
 		<method name="clearTextFilter()V" />
 		<method name="deferNotifyDataSetChanged()V" since="14" />
+		<method name="generateLayoutParams(Landroid/util/AttributeSet;)Landroid/widget/AbsListView$LayoutParams;" />
 		<method name="getCacheColorHint()I" />
 		<method name="getCheckedItemCount()I" since="11" />
 		<method name="getCheckedItemIds()[J" since="11" />
@@ -25764,7 +25177,6 @@
 		<method name="getListPaddingLeft()I" />
 		<method name="getListPaddingRight()I" />
 		<method name="getListPaddingTop()I" />
-		<method name="getSelectedView()Landroid/view/View;" />
 		<method name="getSelector()Landroid/graphics/drawable/Drawable;" />
 		<method name="getTextFilter()Ljava/lang/CharSequence;" since="3" />
 		<method name="getTranscriptMode()I" />
@@ -25780,14 +25192,8 @@
 		<method name="isStackFromBottom()Z" />
 		<method name="isTextFilterEnabled()Z" />
 		<method name="layoutChildren()V" />
-		<method name="onFilterComplete(I)V" />
-		<method name="onGlobalLayout()V" />
 		<method name="onRemoteAdapterConnected()Z" since="11" />
 		<method name="onRemoteAdapterDisconnected()V" since="11" />
-		<method name="onRestoreInstanceState(Landroid/os/Parcelable;)V" />
-		<method name="onSaveInstanceState()Landroid/os/Parcelable;" />
-		<method name="onTextChanged(Ljava/lang/CharSequence;III)V" />
-		<method name="onTouchModeChanged(Z)V" />
 		<method name="pointToPosition(II)I" />
 		<method name="pointToRowId(II)J" />
 		<method name="reclaimViews(Ljava/util/List;)V" />
@@ -25818,7 +25224,6 @@
 		<method name="smoothScrollToPosition(II)V" since="8" />
 		<method name="smoothScrollToPositionFromTop(II)V" since="11" />
 		<method name="smoothScrollToPositionFromTop(III)V" since="11" />
-		<method name="verifyDrawable(Landroid/graphics/drawable/Drawable;)Z" />
 		<field name="CHOICE_MODE_MULTIPLE" since="11" />
 		<field name="CHOICE_MODE_MULTIPLE_MODAL" since="11" />
 		<field name="CHOICE_MODE_NONE" since="11" />
@@ -25835,10 +25240,12 @@
 		<method name="&lt;init>(Landroid/view/ViewGroup$LayoutParams;)V" />
 	</class>
 	<class name="android/widget/AbsListView$MultiChoiceModeListener" since="11">
+		<extends name="java/lang/Object" />
 		<implements name="android/view/ActionMode$Callback" />
 		<method name="onItemCheckedStateChanged(Landroid/view/ActionMode;IJZ)V" />
 	</class>
 	<class name="android/widget/AbsListView$OnScrollListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onScroll(Landroid/widget/AbsListView;III)V" />
 		<method name="onScrollStateChanged(Landroid/widget/AbsListView;I)V" />
 		<field name="SCROLL_STATE_FLING" />
@@ -25846,9 +25253,11 @@
 		<field name="SCROLL_STATE_TOUCH_SCROLL" />
 	</class>
 	<class name="android/widget/AbsListView$RecyclerListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onMovedToScrapHeap(Landroid/view/View;)V" />
 	</class>
 	<class name="android/widget/AbsListView$SelectionBoundsAdjuster" since="11">
+		<extends name="java/lang/Object" />
 		<method name="adjustListItemSelectionBounds(Landroid/graphics/Rect;)V" />
 	</class>
 	<class name="android/widget/AbsSeekBar" since="1">
@@ -25868,12 +25277,8 @@
 		<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="getAdapter()Landroid/widget/SpinnerAdapter;" />
-		<method name="getSelectedView()Landroid/view/View;" />
-		<method name="onRestoreInstanceState(Landroid/os/Parcelable;)V" />
-		<method name="onSaveInstanceState()Landroid/os/Parcelable;" />
 		<method name="pointToPosition(II)I" />
 		<method name="setAdapter(Landroid/widget/SpinnerAdapter;)V" />
-		<method name="setSelection(I)V" />
 		<method name="setSelection(IZ)V" />
 	</class>
 	<class name="android/widget/AbsoluteLayout" since="1">
@@ -25881,7 +25286,6 @@
 		<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="onLayout(ZIIII)V" />
 	</class>
 	<class name="android/widget/AbsoluteLayout$LayoutParams" since="1">
 		<extends name="android/view/ViewGroup$LayoutParams" />
@@ -25893,6 +25297,7 @@
 		<field name="y" />
 	</class>
 	<class name="android/widget/Adapter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getCount()I" />
 		<method name="getItem(I)Ljava/lang/Object;" />
 		<method name="getItemId(I)J" />
@@ -25911,7 +25316,7 @@
 		<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="getAdapter()LT;" />
+		<method name="getAdapter()Landroid/widget/Adapter;" />
 		<method name="getCount()I" />
 		<method name="getEmptyView()Landroid/view/View;" />
 		<method name="getFirstVisiblePosition()I" />
@@ -25926,9 +25331,8 @@
 		<method name="getSelectedItemId()J" />
 		<method name="getSelectedItemPosition()I" />
 		<method name="getSelectedView()Landroid/view/View;" />
-		<method name="onLayout(ZIIII)V" />
 		<method name="performItemClick(Landroid/view/View;IJ)Z" />
-		<method name="setAdapter(LT;)V" />
+		<method name="setAdapter(Landroid/widget/Adapter;)V" />
 		<method name="setEmptyView(Landroid/view/View;)V" />
 		<method name="setOnItemClickListener(Landroid/widget/AdapterView$OnItemClickListener;)V" />
 		<method name="setOnItemLongClickListener(Landroid/widget/AdapterView$OnItemLongClickListener;)V" />
@@ -25948,12 +25352,15 @@
 		<field name="targetView" />
 	</class>
 	<class name="android/widget/AdapterView$OnItemClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onItemClick(Landroid/widget/AdapterView;Landroid/view/View;IJ)V" />
 	</class>
 	<class name="android/widget/AdapterView$OnItemLongClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onItemLongClick(Landroid/widget/AdapterView;Landroid/view/View;IJ)Z" />
 	</class>
 	<class name="android/widget/AdapterView$OnItemSelectedListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onItemSelected(Landroid/widget/AdapterView;Landroid/view/View;IJ)V" />
 		<method name="onNothingSelected(Landroid/widget/AdapterView;)V" />
 	</class>
@@ -25965,17 +25372,12 @@
 		<method name="advance()V" />
 		<method name="deferNotifyDataSetChanged()V" since="14" />
 		<method name="fyiWillBeAdvancedByHostKThx()V" />
-		<method name="getAdapter()Landroid/widget/Adapter;" />
 		<method name="getCurrentView()Landroid/view/View;" />
 		<method name="getDisplayedChild()I" />
 		<method name="getInAnimation()Landroid/animation/ObjectAnimator;" />
 		<method name="getOutAnimation()Landroid/animation/ObjectAnimator;" />
-		<method name="getSelectedView()Landroid/view/View;" />
 		<method name="onRemoteAdapterConnected()Z" />
 		<method name="onRemoteAdapterDisconnected()V" />
-		<method name="onRestoreInstanceState(Landroid/os/Parcelable;)V" />
-		<method name="onSaveInstanceState()Landroid/os/Parcelable;" />
-		<method name="setAdapter(Landroid/widget/Adapter;)V" />
 		<method name="setAnimateFirstView(Z)V" />
 		<method name="setDisplayedChild(I)V" />
 		<method name="setInAnimation(Landroid/animation/ObjectAnimator;)V" />
@@ -25983,7 +25385,6 @@
 		<method name="setOutAnimation(Landroid/animation/ObjectAnimator;)V" />
 		<method name="setOutAnimation(Landroid/content/Context;I)V" />
 		<method name="setRemoteViewsAdapter(Landroid/content/Intent;)V" />
-		<method name="setSelection(I)V" />
 		<method name="showNext()V" />
 		<method name="showPrevious()V" />
 	</class>
@@ -26003,9 +25404,6 @@
 		<implements name="android/widget/SectionIndexer" />
 		<method name="&lt;init>(Landroid/database/Cursor;ILjava/lang/CharSequence;)V" />
 		<method name="compare(Ljava/lang/String;Ljava/lang/String;)I" />
-		<method name="getPositionForSection(I)I" />
-		<method name="getSectionForPosition(I)I" />
-		<method name="getSections()[Ljava/lang/Object;" />
 		<method name="setCursor(Landroid/database/Cursor;)V" />
 		<field name="mAlphabet" />
 		<field name="mColumnIndex" />
@@ -26023,23 +25421,18 @@
 		<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;)V" />
-		<method name="&lt;init>(Landroid/content/Context;II[LT;)V" />
+		<method name="&lt;init>(Landroid/content/Context;II[Ljava/lang/Object;)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="&lt;init>(Landroid/content/Context;I[Ljava/lang/Object;)V" />
+		<method name="add(Ljava/lang/Object;)V" />
 		<method name="addAll(Ljava/util/Collection;)V" since="11" />
-		<method name="addAll([LT;)V" since="11" />
+		<method name="addAll([Ljava/lang/Object;)V" since="11" />
 		<method name="clear()V" />
 		<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;" />
-		<method name="getItem(I)LT;" />
-		<method name="getItemId(I)J" />
-		<method name="getPosition(LT;)I" />
-		<method name="getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
-		<method name="insert(LT;I)V" />
-		<method name="remove(LT;)V" />
+		<method name="getPosition(Ljava/lang/Object;)I" />
+		<method name="insert(Ljava/lang/Object;I)V" />
+		<method name="remove(Ljava/lang/Object;)V" />
 		<method name="setDropDownViewResource(I)V" />
 		<method name="setNotifyOnChange(Z)V" />
 		<method name="sort(Ljava/util/Comparator;)V" since="3" />
@@ -26071,12 +25464,11 @@
 		<method name="getValidator()Landroid/widget/AutoCompleteTextView$Validator;" />
 		<method name="isPerformingCompletion()Z" since="3" />
 		<method name="isPopupShowing()Z" />
-		<method name="onFilterComplete(I)V" />
 		<method name="performCompletion()V" />
 		<method name="performFiltering(Ljava/lang/CharSequence;I)V" />
 		<method name="performValidation()V" />
 		<method name="replaceText(Ljava/lang/CharSequence;)V" />
-		<method name="setAdapter(LT;)V" />
+		<method name="setAdapter(Landroid/widget/ListAdapter;)V" />
 		<method name="setCompletionHint(Ljava/lang/CharSequence;)V" />
 		<method name="setDropDownAnchor(I)V" since="3" />
 		<method name="setDropDownBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V" since="5" />
@@ -26093,6 +25485,7 @@
 		<method name="showDropDown()V" />
 	</class>
 	<class name="android/widget/AutoCompleteTextView$Validator" since="1">
+		<extends name="java/lang/Object" />
 		<method name="fixText(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 		<method name="isValid(Ljava/lang/CharSequence;)Z" />
 	</class>
@@ -26101,37 +25494,16 @@
 		<implements name="android/widget/ListAdapter" />
 		<implements name="android/widget/SpinnerAdapter" />
 		<method name="&lt;init>()V" />
-		<method name="areAllItemsEnabled()Z" />
-		<method name="getDropDownView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
-		<method name="getItemViewType(I)I" />
-		<method name="getViewTypeCount()I" />
-		<method name="hasStableIds()Z" />
-		<method name="isEmpty()Z" />
-		<method name="isEnabled(I)Z" />
 		<method name="notifyDataSetChanged()V" />
 		<method name="notifyDataSetInvalidated()V" />
-		<method name="registerDataSetObserver(Landroid/database/DataSetObserver;)V" />
-		<method name="unregisterDataSetObserver(Landroid/database/DataSetObserver;)V" />
 	</class>
 	<class name="android/widget/BaseExpandableListAdapter" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="android/widget/ExpandableListAdapter" />
 		<implements name="android/widget/HeterogeneousExpandableList" since="8" />
 		<method name="&lt;init>()V" />
-		<method name="areAllItemsEnabled()Z" />
-		<method name="getChildType(II)I" since="8" />
-		<method name="getChildTypeCount()I" since="8" />
-		<method name="getCombinedChildId(JJ)J" />
-		<method name="getCombinedGroupId(J)J" />
-		<method name="getGroupType(I)I" since="8" />
-		<method name="getGroupTypeCount()I" since="8" />
-		<method name="isEmpty()Z" />
 		<method name="notifyDataSetChanged()V" />
 		<method name="notifyDataSetInvalidated()V" />
-		<method name="onGroupCollapsed(I)V" />
-		<method name="onGroupExpanded(I)V" />
-		<method name="registerDataSetObserver(Landroid/database/DataSetObserver;)V" />
-		<method name="unregisterDataSetObserver(Landroid/database/DataSetObserver;)V" />
 	</class>
 	<class name="android/widget/Button" since="1">
 		<extends name="android/widget/TextView" />
@@ -26158,6 +25530,7 @@
 		<method name="setShowWeekNumber(Z)V" />
 	</class>
 	<class name="android/widget/CalendarView$OnDateChangeListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onSelectedDayChange(Landroid/widget/CalendarView;III)V" />
 	</class>
 	<class name="android/widget/CheckBox" since="1">
@@ -26167,6 +25540,7 @@
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V" />
 	</class>
 	<class name="android/widget/Checkable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="isChecked()Z" />
 		<method name="setChecked(Z)V" />
 		<method name="toggle()V" />
@@ -26177,11 +25551,8 @@
 		<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="isChecked()Z" />
 		<method name="setCheckMarkDrawable(I)V" />
 		<method name="setCheckMarkDrawable(Landroid/graphics/drawable/Drawable;)V" />
-		<method name="setChecked(Z)V" />
-		<method name="toggle()V" />
 	</class>
 	<class name="android/widget/Chronometer" since="1">
 		<extends name="android/widget/TextView" />
@@ -26198,6 +25569,7 @@
 		<method name="stop()V" />
 	</class>
 	<class name="android/widget/Chronometer$OnChronometerTickListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onChronometerTick(Landroid/widget/Chronometer;)V" />
 	</class>
 	<class name="android/widget/CompoundButton" since="1">
@@ -26206,14 +25578,12 @@
 		<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="isChecked()Z" />
 		<method name="setButtonDrawable(I)V" />
 		<method name="setButtonDrawable(Landroid/graphics/drawable/Drawable;)V" />
-		<method name="setChecked(Z)V" />
 		<method name="setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V" />
-		<method name="toggle()V" />
 	</class>
 	<class name="android/widget/CompoundButton$OnCheckedChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onCheckedChanged(Landroid/widget/CompoundButton;Z)V" />
 	</class>
 	<class name="android/widget/CursorAdapter" since="1">
@@ -26225,13 +25595,8 @@
 		<method name="bindView(Landroid/view/View;Landroid/content/Context;Landroid/database/Cursor;)V" />
 		<method name="changeCursor(Landroid/database/Cursor;)V" />
 		<method name="convertToString(Landroid/database/Cursor;)Ljava/lang/CharSequence;" />
-		<method name="getCount()I" />
 		<method name="getCursor()Landroid/database/Cursor;" />
-		<method name="getFilter()Landroid/widget/Filter;" />
 		<method name="getFilterQueryProvider()Landroid/widget/FilterQueryProvider;" />
-		<method name="getItem(I)Ljava/lang/Object;" />
-		<method name="getItemId(I)J" />
-		<method name="getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
 		<method name="init(Landroid/content/Context;Landroid/database/Cursor;Z)V" />
 		<method name="newDropDownView(Landroid/content/Context;Landroid/database/Cursor;Landroid/view/ViewGroup;)Landroid/view/View;" />
 		<method name="newView(Landroid/content/Context;Landroid/database/Cursor;Landroid/view/ViewGroup;)Landroid/view/View;" />
@@ -26252,19 +25617,10 @@
 		<method name="changeCursor(Landroid/database/Cursor;)V" />
 		<method name="convertToString(Landroid/database/Cursor;)Ljava/lang/String;" />
 		<method name="getChild(II)Landroid/database/Cursor;" />
-		<method name="getChildId(II)J" />
-		<method name="getChildView(IIZLandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
-		<method name="getChildrenCount(I)I" />
 		<method name="getChildrenCursor(Landroid/database/Cursor;)Landroid/database/Cursor;" />
 		<method name="getCursor()Landroid/database/Cursor;" />
-		<method name="getFilter()Landroid/widget/Filter;" />
 		<method name="getFilterQueryProvider()Landroid/widget/FilterQueryProvider;" />
 		<method name="getGroup(I)Landroid/database/Cursor;" />
-		<method name="getGroupCount()I" />
-		<method name="getGroupId(I)J" />
-		<method name="getGroupView(IZLandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
-		<method name="hasStableIds()Z" />
-		<method name="isChildSelectable(II)Z" />
 		<method name="newChildView(Landroid/content/Context;Landroid/database/Cursor;ZLandroid/view/ViewGroup;)Landroid/view/View;" />
 		<method name="newGroupView(Landroid/content/Context;Landroid/database/Cursor;ZLandroid/view/ViewGroup;)Landroid/view/View;" />
 		<method name="notifyDataSetChanged(Z)V" />
@@ -26294,6 +25650,7 @@
 		<method name="updateDate(III)V" />
 	</class>
 	<class name="android/widget/DatePicker$OnDateChangedListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onDateChanged(Landroid/widget/DatePicker;III)V" />
 	</class>
 	<class name="android/widget/DialerFilter" since="1">
@@ -26325,6 +25682,7 @@
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
 	</class>
 	<class name="android/widget/EdgeEffect" since="14">
+		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="draw(Landroid/graphics/Canvas;)Z" />
 		<method name="finish()V" />
@@ -26340,11 +25698,13 @@
 		<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="extendSelection(I)V" />
+		<method name="getText()Landroid/text/Editable;" />
 		<method name="selectAll()V" />
 		<method name="setSelection(I)V" />
 		<method name="setSelection(II)V" />
 	</class>
 	<class name="android/widget/ExpandableListAdapter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="areAllItemsEnabled()Z" />
 		<method name="getChild(II)Ljava/lang/Object;" />
 		<method name="getChildId(II)J" />
@@ -26410,15 +25770,19 @@
 		<field name="targetView" />
 	</class>
 	<class name="android/widget/ExpandableListView$OnChildClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onChildClick(Landroid/widget/ExpandableListView;Landroid/view/View;IIJ)Z" />
 	</class>
 	<class name="android/widget/ExpandableListView$OnGroupClickListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onGroupClick(Landroid/widget/ExpandableListView;Landroid/view/View;IJ)Z" />
 	</class>
 	<class name="android/widget/ExpandableListView$OnGroupCollapseListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onGroupCollapse(I)V" />
 	</class>
 	<class name="android/widget/ExpandableListView$OnGroupExpandListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onGroupExpand(I)V" />
 	</class>
 	<class name="android/widget/Filter" since="1">
@@ -26431,6 +25795,7 @@
 		<method name="publishResults(Ljava/lang/CharSequence;Landroid/widget/Filter$FilterResults;)V" />
 	</class>
 	<class name="android/widget/Filter$FilterListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onFilterComplete(I)V" />
 	</class>
 	<class name="android/widget/Filter$FilterResults" since="1">
@@ -26440,9 +25805,11 @@
 		<field name="values" />
 	</class>
 	<class name="android/widget/FilterQueryProvider" since="1">
+		<extends name="java/lang/Object" />
 		<method name="runQuery(Ljava/lang/CharSequence;)Landroid/database/Cursor;" />
 	</class>
 	<class name="android/widget/Filterable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getFilter()Landroid/widget/Filter;" />
 	</class>
 	<class name="android/widget/FrameLayout" since="1">
@@ -26450,10 +25817,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="generateDefaultLayoutParams()Landroid/widget/FrameLayout$LayoutParams;" />
+		<method name="generateLayoutParams(Landroid/util/AttributeSet;)Landroid/widget/FrameLayout$LayoutParams;" />
 		<method name="getConsiderGoneChildrenWhenMeasuring()Z" />
 		<method name="getForeground()Landroid/graphics/drawable/Drawable;" />
 		<method name="getMeasureAllChildren()Z" since="14" />
-		<method name="onLayout(ZIIII)V" />
 		<method name="setForeground(Landroid/graphics/drawable/Drawable;)V" />
 		<method name="setForegroundGravity(I)V" />
 		<method name="setMeasureAllChildren(Z)V" />
@@ -26473,12 +25841,6 @@
 		<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="onDown(Landroid/view/MotionEvent;)Z" />
-		<method name="onFling(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z" />
-		<method name="onLongPress(Landroid/view/MotionEvent;)V" />
-		<method name="onScroll(Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z" />
-		<method name="onShowPress(Landroid/view/MotionEvent;)V" />
-		<method name="onSingleTapUp(Landroid/view/MotionEvent;)Z" />
 		<method name="setAnimationDuration(I)V" />
 		<method name="setCallbackDuringFling(Z)V" />
 		<method name="setGravity(I)V" />
@@ -26496,6 +25858,9 @@
 		<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="generateDefaultLayoutParams()Landroid/widget/GridLayout$LayoutParams;" />
+		<method name="generateLayoutParams(Landroid/util/AttributeSet;)Landroid/widget/GridLayout$LayoutParams;" />
+		<method name="generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroid/widget/GridLayout$LayoutParams;" />
 		<method name="getAlignmentMode()I" />
 		<method name="getColumnCount()I" />
 		<method name="getOrientation()I" />
@@ -26503,7 +25868,6 @@
 		<method name="getUseDefaultMargins()Z" />
 		<method name="isColumnOrderPreserved()Z" />
 		<method name="isRowOrderPreserved()Z" />
-		<method name="onLayout(ZIIII)V" />
 		<method name="setAlignmentMode(I)V" />
 		<method name="setColumnCount(I)V" />
 		<method name="setColumnOrderPreserved(Z)V" />
@@ -26529,6 +25893,8 @@
 		<field name="VERTICAL" />
 	</class>
 	<class name="android/widget/GridLayout$Alignment" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/widget/GridLayout$LayoutParams" since="14">
 		<extends name="android/view/ViewGroup$MarginLayoutParams" />
@@ -26543,6 +25909,8 @@
 		<field name="rowSpec" />
 	</class>
 	<class name="android/widget/GridLayout$Spec" since="14">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="android/widget/GridView" since="1">
 		<extends name="android/widget/AbsListView" />
@@ -26557,7 +25925,6 @@
 		<method name="setGravity(I)V" />
 		<method name="setHorizontalSpacing(I)V" />
 		<method name="setNumColumns(I)V" />
-		<method name="setSelection(I)V" />
 		<method name="setStretchMode(I)V" />
 		<method name="setVerticalSpacing(I)V" />
 		<method name="smoothScrollByOffset(I)V" since="11" />
@@ -26572,26 +25939,13 @@
 		<implements name="android/widget/Filterable" />
 		<implements name="android/widget/WrapperListAdapter" />
 		<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;" />
 		<method name="getFootersCount()I" />
 		<method name="getHeadersCount()I" />
-		<method name="getItem(I)Ljava/lang/Object;" />
-		<method name="getItemId(I)J" />
-		<method name="getItemViewType(I)I" />
-		<method name="getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
-		<method name="getViewTypeCount()I" />
-		<method name="getWrappedAdapter()Landroid/widget/ListAdapter;" />
-		<method name="hasStableIds()Z" />
-		<method name="isEmpty()Z" />
-		<method name="isEnabled(I)Z" />
-		<method name="registerDataSetObserver(Landroid/database/DataSetObserver;)V" />
 		<method name="removeFooter(Landroid/view/View;)Z" />
 		<method name="removeHeader(Landroid/view/View;)Z" />
-		<method name="unregisterDataSetObserver(Landroid/database/DataSetObserver;)V" />
 	</class>
 	<class name="android/widget/HeterogeneousExpandableList" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getChildType(II)I" />
 		<method name="getChildTypeCount()I" />
 		<method name="getGroupType(I)I" />
@@ -26640,7 +25994,6 @@
 		<method name="getDrawable()Landroid/graphics/drawable/Drawable;" />
 		<method name="getImageMatrix()Landroid/graphics/Matrix;" />
 		<method name="getScaleType()Landroid/widget/ImageView$ScaleType;" />
-		<method name="onCreateDrawableState(I)[I" />
 		<method name="setAdjustViewBounds(Z)V" />
 		<method name="setAlpha(I)V" />
 		<method name="setBaseline(I)V" since="11" />
@@ -26678,6 +26031,9 @@
 		<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" since="11" />
+		<method name="generateDefaultLayoutParams()Landroid/widget/LinearLayout$LayoutParams;" />
+		<method name="generateLayoutParams(Landroid/util/AttributeSet;)Landroid/widget/LinearLayout$LayoutParams;" />
+		<method name="generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroid/widget/LinearLayout$LayoutParams;" />
 		<method name="getBaselineAlignedChildIndex()I" />
 		<method name="getDividerPadding()I" since="14" />
 		<method name="getOrientation()I" />
@@ -26685,7 +26041,6 @@
 		<method name="getWeightSum()F" />
 		<method name="isBaselineAligned()Z" />
 		<method name="isMeasureWithLargestChildEnabled()Z" since="11" />
-		<method name="onLayout(ZIIII)V" />
 		<method name="setBaselineAligned(Z)V" />
 		<method name="setBaselineAlignedChildIndex(I)V" />
 		<method name="setDividerDrawable(Landroid/graphics/drawable/Drawable;)V" since="11" />
@@ -26716,6 +26071,7 @@
 		<field name="weight" />
 	</class>
 	<class name="android/widget/ListAdapter" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/widget/Adapter" />
 		<method name="areAllItemsEnabled()Z" />
 		<method name="isEnabled(I)Z" />
@@ -26818,7 +26174,6 @@
 		<method name="setItemsCanFocus(Z)V" />
 		<method name="setOverscrollFooter(Landroid/graphics/drawable/Drawable;)V" since="9" />
 		<method name="setOverscrollHeader(Landroid/graphics/drawable/Drawable;)V" since="9" />
-		<method name="setSelection(I)V" />
 		<method name="setSelectionAfterHeaderView()V" />
 		<method name="setSelectionFromTop(II)V" />
 		<method name="smoothScrollByOffset(I)V" since="11" />
@@ -26828,7 +26183,7 @@
 	</class>
 	<class name="android/widget/ListView$FixedViewInfo" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>()V" />
+		<method name="&lt;init>(Landroid/widget/ListView;)V" />
 		<field name="data" />
 		<field name="isSelectable" />
 		<field name="view" />
@@ -26840,7 +26195,6 @@
 		<method name="&lt;init>(Landroid/content/Context;Z)V" />
 		<method name="hide()V" />
 		<method name="isShowing()Z" />
-		<method name="onFinishInflate()V" />
 		<method name="setAnchorView(Landroid/view/View;)V" />
 		<method name="setMediaPlayer(Landroid/widget/MediaController$MediaPlayerControl;)V" />
 		<method name="setPrevNextListeners(Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;)V" />
@@ -26848,6 +26202,7 @@
 		<method name="show(I)V" />
 	</class>
 	<class name="android/widget/MediaController$MediaPlayerControl" since="1">
+		<extends name="java/lang/Object" />
 		<method name="canPause()Z" since="5" />
 		<method name="canSeekBackward()Z" since="5" />
 		<method name="canSeekForward()Z" since="5" />
@@ -26871,11 +26226,9 @@
 		<extends name="java/lang/Object" />
 		<implements name="android/widget/MultiAutoCompleteTextView$Tokenizer" />
 		<method name="&lt;init>()V" />
-		<method name="findTokenEnd(Ljava/lang/CharSequence;I)I" />
-		<method name="findTokenStart(Ljava/lang/CharSequence;I)I" />
-		<method name="terminateToken(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;" />
 	</class>
 	<class name="android/widget/MultiAutoCompleteTextView$Tokenizer" since="1">
+		<extends name="java/lang/Object" />
 		<method name="findTokenEnd(Ljava/lang/CharSequence;I)I" />
 		<method name="findTokenStart(Ljava/lang/CharSequence;I)I" />
 		<method name="terminateToken(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;" />
@@ -26901,15 +26254,18 @@
 		<method name="setWrapSelectorWheel(Z)V" />
 	</class>
 	<class name="android/widget/NumberPicker$Formatter" since="11">
+		<extends name="java/lang/Object" />
 		<method name="format(I)Ljava/lang/String;" />
 	</class>
 	<class name="android/widget/NumberPicker$OnScrollListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onScrollStateChange(Landroid/widget/NumberPicker;I)V" />
 		<field name="SCROLL_STATE_FLING" />
 		<field name="SCROLL_STATE_IDLE" />
 		<field name="SCROLL_STATE_TOUCH_SCROLL" />
 	</class>
 	<class name="android/widget/NumberPicker$OnValueChangeListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onValueChange(Landroid/widget/NumberPicker;II)V" />
 	</class>
 	<class name="android/widget/OverScroller" since="9">
@@ -26951,9 +26307,11 @@
 		<method name="show()V" />
 	</class>
 	<class name="android/widget/PopupMenu$OnDismissListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onDismiss(Landroid/widget/PopupMenu;)V" />
 	</class>
 	<class name="android/widget/PopupMenu$OnMenuItemClickListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onMenuItemClick(Landroid/view/MenuItem;)Z" />
 	</class>
 	<class name="android/widget/PopupWindow" since="1">
@@ -27014,6 +26372,7 @@
 		<field name="INPUT_METHOD_NOT_NEEDED" since="3" />
 	</class>
 	<class name="android/widget/PopupWindow$OnDismissListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onDismiss()V" />
 	</class>
 	<class name="android/widget/ProgressBar" since="1">
@@ -27030,8 +26389,6 @@
 		<method name="incrementProgressBy(I)V" />
 		<method name="incrementSecondaryProgressBy(I)V" />
 		<method name="isIndeterminate()Z" />
-		<method name="onRestoreInstanceState(Landroid/os/Parcelable;)V" since="3" />
-		<method name="onSaveInstanceState()Landroid/os/Parcelable;" since="3" />
 		<method name="setIndeterminate(Z)V" />
 		<method name="setIndeterminateDrawable(Landroid/graphics/drawable/Drawable;)V" />
 		<method name="setInterpolator(Landroid/content/Context;I)V" />
@@ -27050,7 +26407,6 @@
 		<method name="assignContactFromEmail(Ljava/lang/String;Z)V" />
 		<method name="assignContactFromPhone(Ljava/lang/String;Z)V" />
 		<method name="assignContactUri(Landroid/net/Uri;)V" />
-		<method name="onClick(Landroid/view/View;)V" />
 		<method name="setExcludeMimes([Ljava/lang/String;)V" />
 		<method name="setImageToDefault()V" since="11" />
 		<method name="setMode(I)V" />
@@ -27068,6 +26424,7 @@
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
 		<method name="check(I)V" />
 		<method name="clearCheck()V" />
+		<method name="generateLayoutParams(Landroid/util/AttributeSet;)Landroid/widget/RadioGroup$LayoutParams;" />
 		<method name="getCheckedRadioButtonId()I" />
 		<method name="setOnCheckedChangeListener(Landroid/widget/RadioGroup$OnCheckedChangeListener;)V" />
 	</class>
@@ -27080,6 +26437,7 @@
 		<method name="&lt;init>(Landroid/view/ViewGroup$MarginLayoutParams;)V" />
 	</class>
 	<class name="android/widget/RadioGroup$OnCheckedChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onCheckedChanged(Landroid/widget/RadioGroup;I)V" />
 	</class>
 	<class name="android/widget/RatingBar" since="1">
@@ -27099,6 +26457,7 @@
 		<method name="setStepSize(F)V" />
 	</class>
 	<class name="android/widget/RatingBar$OnRatingBarChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onRatingChanged(Landroid/widget/RatingBar;FZ)V" />
 	</class>
 	<class name="android/widget/RelativeLayout" since="1">
@@ -27106,7 +26465,7 @@
 		<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="onLayout(ZIIII)V" />
+		<method name="generateLayoutParams(Landroid/util/AttributeSet;)Landroid/widget/RelativeLayout$LayoutParams;" />
 		<method name="setGravity(I)V" />
 		<method name="setHorizontalGravity(I)V" />
 		<method name="setIgnoreGravity(I)V" />
@@ -27143,17 +26502,15 @@
 	</class>
 	<class name="android/widget/RemoteViews" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="android/view/LayoutInflater$Filter" />
 		<implements name="android/os/Parcelable" />
+		<implements name="android/view/LayoutInflater$Filter" />
 		<method name="&lt;init>(Landroid/os/Parcel;)V" />
 		<method name="&lt;init>(Ljava/lang/String;I)V" />
 		<method name="addView(ILandroid/widget/RemoteViews;)V" since="7" />
 		<method name="apply(Landroid/content/Context;Landroid/view/ViewGroup;)Landroid/view/View;" />
 		<method name="clone()Landroid/widget/RemoteViews;" since="9" />
-		<method name="describeContents()I" />
 		<method name="getLayoutId()I" />
 		<method name="getPackage()Ljava/lang/String;" />
-		<method name="onLoadClass(Ljava/lang/Class;)Z" />
 		<method name="reapply(Landroid/content/Context;Landroid/view/View;)V" />
 		<method name="removeAllViews(I)V" since="7" />
 		<method name="setBitmap(ILjava/lang/String;Landroid/graphics/Bitmap;)V" since="3" />
@@ -27190,7 +26547,6 @@
 		<method name="setViewVisibility(II)V" />
 		<method name="showNext(I)V" since="11" />
 		<method name="showPrevious(I)V" since="11" />
-		<method name="writeToParcel(Landroid/os/Parcel;I)V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/widget/RemoteViews$ActionException" since="1">
@@ -27205,10 +26561,10 @@
 	<class name="android/widget/RemoteViewsService" since="11">
 		<extends name="android/app/Service" />
 		<method name="&lt;init>()V" />
-		<method name="onBind(Landroid/content/Intent;)Landroid/os/IBinder;" />
 		<method name="onGetViewFactory(Landroid/content/Intent;)Landroid/widget/RemoteViewsService$RemoteViewsFactory;" />
 	</class>
 	<class name="android/widget/RemoteViewsService$RemoteViewsFactory" since="11">
+		<extends name="java/lang/Object" />
 		<method name="getCount()I" />
 		<method name="getItemId(I)J" />
 		<method name="getLoadingView()Landroid/widget/RemoteViews;" />
@@ -27224,7 +26580,6 @@
 		<method name="&lt;init>(Landroid/content/Context;ILandroid/database/Cursor;)V" />
 		<method name="&lt;init>(Landroid/content/Context;ILandroid/database/Cursor;I)V" since="11" />
 		<method name="&lt;init>(Landroid/content/Context;ILandroid/database/Cursor;Z)V" since="3" />
-		<method name="newView(Landroid/content/Context;Landroid/database/Cursor;Landroid/view/ViewGroup;)Landroid/view/View;" />
 		<method name="setDropDownViewResource(I)V" />
 		<method name="setViewResource(I)V" since="3" />
 	</class>
@@ -27233,8 +26588,6 @@
 		<method name="&lt;init>(Landroid/content/Context;Landroid/database/Cursor;II)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/database/Cursor;III)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/database/Cursor;IIII)V" />
-		<method name="newChildView(Landroid/content/Context;Landroid/database/Cursor;ZLandroid/view/ViewGroup;)Landroid/view/View;" />
-		<method name="newGroupView(Landroid/content/Context;Landroid/database/Cursor;ZLandroid/view/ViewGroup;)Landroid/view/View;" />
 	</class>
 	<class name="android/widget/ScrollView" since="1">
 		<extends name="android/widget/FrameLayout" />
@@ -27292,8 +26645,6 @@
 		<method name="isIconified()Z" />
 		<method name="isQueryRefinementEnabled()Z" />
 		<method name="isSubmitButtonEnabled()Z" />
-		<method name="onActionViewCollapsed()V" since="14" />
-		<method name="onActionViewExpanded()V" since="14" />
 		<method name="setIconified(Z)V" />
 		<method name="setIconifiedByDefault(Z)V" />
 		<method name="setImeOptions(I)V" since="14" />
@@ -27312,17 +26663,21 @@
 		<method name="setSuggestionsAdapter(Landroid/widget/CursorAdapter;)V" />
 	</class>
 	<class name="android/widget/SearchView$OnCloseListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onClose()Z" />
 	</class>
 	<class name="android/widget/SearchView$OnQueryTextListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onQueryTextChange(Ljava/lang/String;)Z" />
 		<method name="onQueryTextSubmit(Ljava/lang/String;)Z" />
 	</class>
 	<class name="android/widget/SearchView$OnSuggestionListener" since="11">
+		<extends name="java/lang/Object" />
 		<method name="onSuggestionClick(I)Z" />
 		<method name="onSuggestionSelect(I)Z" />
 	</class>
 	<class name="android/widget/SectionIndexer" since="3">
+		<extends name="java/lang/Object" />
 		<method name="getPositionForSection(I)I" />
 		<method name="getSectionForPosition(I)I" />
 		<method name="getSections()[Ljava/lang/Object;" />
@@ -27335,6 +26690,7 @@
 		<method name="setOnSeekBarChangeListener(Landroid/widget/SeekBar$OnSeekBarChangeListener;)V" />
 	</class>
 	<class name="android/widget/SeekBar$OnSeekBarChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onProgressChanged(Landroid/widget/SeekBar;IZ)V" />
 		<method name="onStartTrackingTouch(Landroid/widget/SeekBar;)V" />
 		<method name="onStopTrackingTouch(Landroid/widget/SeekBar;)V" />
@@ -27342,24 +26698,19 @@
 	<class name="android/widget/ShareActionProvider" since="14">
 		<extends name="android/view/ActionProvider" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
-		<method name="onCreateActionView()Landroid/view/View;" />
 		<method name="setOnShareTargetSelectedListener(Landroid/widget/ShareActionProvider$OnShareTargetSelectedListener;)V" />
 		<method name="setShareHistoryFileName(Ljava/lang/String;)V" />
 		<method name="setShareIntent(Landroid/content/Intent;)V" />
 		<field name="DEFAULT_SHARE_HISTORY_FILE_NAME" />
 	</class>
 	<class name="android/widget/ShareActionProvider$OnShareTargetSelectedListener" since="14">
+		<extends name="java/lang/Object" />
 		<method name="onShareTargetSelected(Landroid/widget/ShareActionProvider;Landroid/content/Intent;)Z" />
 	</class>
 	<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;I[Ljava/lang/String;[I)V" />
-		<method name="getCount()I" />
-		<method name="getFilter()Landroid/widget/Filter;" />
-		<method name="getItem(I)Ljava/lang/Object;" />
-		<method name="getItemId(I)J" />
-		<method name="getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
 		<method name="getViewBinder()Landroid/widget/SimpleAdapter$ViewBinder;" />
 		<method name="setDropDownViewResource(I)V" />
 		<method name="setViewBinder(Landroid/widget/SimpleAdapter$ViewBinder;)V" />
@@ -27368,13 +26719,13 @@
 		<method name="setViewText(Landroid/widget/TextView;Ljava/lang/String;)V" />
 	</class>
 	<class name="android/widget/SimpleAdapter$ViewBinder" since="1">
+		<extends name="java/lang/Object" />
 		<method name="setViewValue(Landroid/view/View;Ljava/lang/Object;Ljava/lang/String;)Z" />
 	</class>
 	<class name="android/widget/SimpleCursorAdapter" since="1">
 		<extends name="android/widget/ResourceCursorAdapter" />
 		<method name="&lt;init>(Landroid/content/Context;ILandroid/database/Cursor;[Ljava/lang/String;[I)V" />
 		<method name="&lt;init>(Landroid/content/Context;ILandroid/database/Cursor;[Ljava/lang/String;[II)V" since="11" />
-		<method name="bindView(Landroid/view/View;Landroid/content/Context;Landroid/database/Cursor;)V" />
 		<method name="changeCursorAndColumns(Landroid/database/Cursor;[Ljava/lang/String;[I)V" since="3" />
 		<method name="getCursorToStringConverter()Landroid/widget/SimpleCursorAdapter$CursorToStringConverter;" />
 		<method name="getStringConversionColumn()I" />
@@ -27386,9 +26737,11 @@
 		<method name="setViewText(Landroid/widget/TextView;Ljava/lang/String;)V" />
 	</class>
 	<class name="android/widget/SimpleCursorAdapter$CursorToStringConverter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="convertToString(Landroid/database/Cursor;)Ljava/lang/CharSequence;" />
 	</class>
 	<class name="android/widget/SimpleCursorAdapter$ViewBinder" since="1">
+		<extends name="java/lang/Object" />
 		<method name="setViewValue(Landroid/view/View;Landroid/database/Cursor;I)Z" />
 	</class>
 	<class name="android/widget/SimpleCursorTreeAdapter" since="1">
@@ -27396,14 +26749,13 @@
 		<method name="&lt;init>(Landroid/content/Context;Landroid/database/Cursor;II[Ljava/lang/String;[III[Ljava/lang/String;[I)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/database/Cursor;II[Ljava/lang/String;[II[Ljava/lang/String;[I)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/database/Cursor;I[Ljava/lang/String;[II[Ljava/lang/String;[I)V" />
-		<method name="bindChildView(Landroid/view/View;Landroid/content/Context;Landroid/database/Cursor;Z)V" />
-		<method name="bindGroupView(Landroid/view/View;Landroid/content/Context;Landroid/database/Cursor;Z)V" />
 		<method name="getViewBinder()Landroid/widget/SimpleCursorTreeAdapter$ViewBinder;" since="5" />
 		<method name="setViewBinder(Landroid/widget/SimpleCursorTreeAdapter$ViewBinder;)V" since="5" />
 		<method name="setViewImage(Landroid/widget/ImageView;Ljava/lang/String;)V" />
 		<method name="setViewText(Landroid/widget/TextView;Ljava/lang/String;)V" since="5" />
 	</class>
 	<class name="android/widget/SimpleCursorTreeAdapter$ViewBinder" since="5">
+		<extends name="java/lang/Object" />
 		<method name="setViewValue(Landroid/view/View;Landroid/database/Cursor;I)Z" />
 	</class>
 	<class name="android/widget/SimpleExpandableListAdapter" since="1">
@@ -27411,16 +26763,6 @@
 		<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;" />
-		<method name="getChildrenCount(I)I" />
-		<method name="getGroup(I)Ljava/lang/Object;" />
-		<method name="getGroupCount()I" />
-		<method name="getGroupId(I)J" />
-		<method name="getGroupView(IZLandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
-		<method name="hasStableIds()Z" />
-		<method name="isChildSelectable(II)Z" />
 		<method name="newChildView(ZLandroid/view/ViewGroup;)Landroid/view/View;" />
 		<method name="newGroupView(ZLandroid/view/ViewGroup;)Landroid/view/View;" />
 	</class>
@@ -27437,7 +26779,6 @@
 		<method name="isMoving()Z" />
 		<method name="isOpened()Z" />
 		<method name="lock()V" />
-		<method name="onLayout(ZIIII)V" />
 		<method name="open()V" />
 		<method name="setOnDrawerCloseListener(Landroid/widget/SlidingDrawer$OnDrawerCloseListener;)V" />
 		<method name="setOnDrawerOpenListener(Landroid/widget/SlidingDrawer$OnDrawerOpenListener;)V" />
@@ -27448,12 +26789,15 @@
 		<field name="ORIENTATION_VERTICAL" />
 	</class>
 	<class name="android/widget/SlidingDrawer$OnDrawerCloseListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onDrawerClosed()V" />
 	</class>
 	<class name="android/widget/SlidingDrawer$OnDrawerOpenListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onDrawerOpened()V" />
 	</class>
 	<class name="android/widget/SlidingDrawer$OnDrawerScrollListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onScrollEnded()V" />
 		<method name="onScrollStarted()V" />
 	</class>
@@ -27472,7 +26816,6 @@
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V" since="11" />
 		<method name="getPrompt()Ljava/lang/CharSequence;" />
-		<method name="onClick(Landroid/content/DialogInterface;I)V" />
 		<method name="setGravity(I)V" since="11" />
 		<method name="setPrompt(Ljava/lang/CharSequence;)V" />
 		<method name="setPromptId(I)V" />
@@ -27480,6 +26823,7 @@
 		<field name="MODE_DROPDOWN" since="11" />
 	</class>
 	<class name="android/widget/SpinnerAdapter" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/widget/Adapter" />
 		<method name="getDropDownView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;" />
 	</class>
@@ -27496,7 +26840,6 @@
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V" />
 		<method name="getTextOff()Ljava/lang/CharSequence;" />
 		<method name="getTextOn()Ljava/lang/CharSequence;" />
-		<method name="onMeasure(II)V" />
 		<method name="setSwitchTextAppearance(Landroid/content/Context;I)V" />
 		<method name="setSwitchTypeface(Landroid/graphics/Typeface;)V" />
 		<method name="setSwitchTypeface(Landroid/graphics/Typeface;I)V" />
@@ -27517,7 +26860,6 @@
 		<method name="getTabContentView()Landroid/widget/FrameLayout;" />
 		<method name="getTabWidget()Landroid/widget/TabWidget;" />
 		<method name="newTabSpec(Ljava/lang/String;)Landroid/widget/TabHost$TabSpec;" />
-		<method name="onTouchModeChanged(Z)V" />
 		<method name="setCurrentTab(I)V" />
 		<method name="setCurrentTabByTag(Ljava/lang/String;)V" />
 		<method name="setOnTabChangedListener(Landroid/widget/TabHost$OnTabChangeListener;)V" />
@@ -27525,13 +26867,16 @@
 		<method name="setup(Landroid/app/LocalActivityManager;)V" />
 	</class>
 	<class name="android/widget/TabHost$OnTabChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onTabChanged(Ljava/lang/String;)V" />
 	</class>
 	<class name="android/widget/TabHost$TabContentFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="createTabContent(Ljava/lang/String;)Landroid/view/View;" />
 	</class>
 	<class name="android/widget/TabHost$TabSpec" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Landroid/widget/TabHost;)V" />
 		<method name="getTag()Ljava/lang/String;" since="4" />
 		<method name="setContent(I)Landroid/widget/TabHost$TabSpec;" />
 		<method name="setContent(Landroid/content/Intent;)Landroid/widget/TabHost$TabSpec;" />
@@ -27546,12 +26891,10 @@
 		<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="dispatchDraw(Landroid/graphics/Canvas;)V" />
 		<method name="focusCurrentTab(I)V" />
 		<method name="getChildTabViewAt(I)Landroid/view/View;" since="4" />
 		<method name="getTabCount()I" since="4" />
 		<method name="isStripEnabled()Z" since="8" />
-		<method name="onFocusChange(Landroid/view/View;Z)V" />
 		<method name="setCurrentTab(I)V" />
 		<method name="setDividerDrawable(I)V" since="4" />
 		<method name="setDividerDrawable(Landroid/graphics/drawable/Drawable;)V" since="4" />
@@ -27565,6 +26908,7 @@
 		<extends name="android/widget/LinearLayout" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
+		<method name="generateLayoutParams(Landroid/util/AttributeSet;)Landroid/widget/TableLayout$LayoutParams;" />
 		<method name="isColumnCollapsed(I)Z" />
 		<method name="isColumnShrinkable(I)Z" />
 		<method name="isColumnStretchable(I)Z" />
@@ -27589,6 +26933,7 @@
 		<extends name="android/widget/LinearLayout" />
 		<method name="&lt;init>(Landroid/content/Context;)V" />
 		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
+		<method name="generateLayoutParams(Landroid/util/AttributeSet;)Landroid/widget/TableRow$LayoutParams;" />
 		<method name="getVirtualChildAt(I)Landroid/view/View;" />
 		<method name="getVirtualChildCount()I" />
 	</class>
@@ -27692,10 +27037,7 @@
 		<method name="onCommitCorrection(Landroid/view/inputmethod/CorrectionInfo;)V" since="11" />
 		<method name="onEditorAction(I)V" since="3" />
 		<method name="onEndBatchEdit()V" since="3" />
-		<method name="onPreDraw()Z" />
 		<method name="onPrivateIMECommand(Ljava/lang/String;Landroid/os/Bundle;)Z" since="3" />
-		<method name="onRestoreInstanceState(Landroid/os/Parcelable;)V" />
-		<method name="onSaveInstanceState()Landroid/os/Parcelable;" />
 		<method name="onSelectionChanged(II)V" since="3" />
 		<method name="onTextChanged(Ljava/lang/CharSequence;III)V" />
 		<method name="onTextContextMenuItem(I)Z" since="3" />
@@ -27788,10 +27130,12 @@
 		<field name="SPANNABLE" />
 	</class>
 	<class name="android/widget/TextView$OnEditorActionListener" since="3">
+		<extends name="java/lang/Object" />
 		<method name="onEditorAction(Landroid/widget/TextView;ILandroid/view/KeyEvent;)Z" />
 	</class>
 	<class name="android/widget/TextView$SavedState" since="1">
 		<extends name="android/view/View$BaseSavedState" />
+		<method name="&lt;init>()V" />
 		<field name="CREATOR" />
 	</class>
 	<class name="android/widget/TimePicker" since="1">
@@ -27808,6 +27152,7 @@
 		<method name="setOnTimeChangedListener(Landroid/widget/TimePicker$OnTimeChangedListener;)V" />
 	</class>
 	<class name="android/widget/TimePicker$OnTimeChangedListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="onTimeChanged(Landroid/widget/TimePicker;II)V" />
 	</class>
 	<class name="android/widget/Toast" since="1">
@@ -27857,24 +27202,14 @@
 		<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="canPause()Z" since="5" />
-		<method name="canSeekBackward()Z" since="5" />
-		<method name="canSeekForward()Z" since="5" />
-		<method name="getBufferPercentage()I" />
-		<method name="getCurrentPosition()I" />
-		<method name="getDuration()I" />
-		<method name="isPlaying()Z" />
-		<method name="pause()V" />
 		<method name="resolveAdjustedSize(II)I" />
 		<method name="resume()V" since="8" />
-		<method name="seekTo(I)V" />
 		<method name="setMediaController(Landroid/widget/MediaController;)V" />
 		<method name="setOnCompletionListener(Landroid/media/MediaPlayer$OnCompletionListener;)V" />
 		<method name="setOnErrorListener(Landroid/media/MediaPlayer$OnErrorListener;)V" />
 		<method name="setOnPreparedListener(Landroid/media/MediaPlayer$OnPreparedListener;)V" />
 		<method name="setVideoPath(Ljava/lang/String;)V" />
 		<method name="setVideoURI(Landroid/net/Uri;)V" />
-		<method name="start()V" />
 		<method name="stopPlayback()V" />
 		<method name="suspend()V" since="8" />
 	</class>
@@ -27915,9 +27250,11 @@
 		<method name="setFactory(Landroid/widget/ViewSwitcher$ViewFactory;)V" />
 	</class>
 	<class name="android/widget/ViewSwitcher$ViewFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="makeView()Landroid/view/View;" />
 	</class>
 	<class name="android/widget/WrapperListAdapter" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="android/widget/ListAdapter" />
 		<method name="getWrappedAdapter()Landroid/widget/ListAdapter;" />
 	</class>
@@ -27927,7 +27264,6 @@
 		<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="onLongClick(Landroid/view/View;)Z" />
 		<method name="setZoomSpeed(J)V" />
 	</class>
 	<class name="android/widget/ZoomButtonsController" since="4">
@@ -27938,7 +27274,6 @@
 		<method name="getZoomControls()Landroid/view/View;" />
 		<method name="isAutoDismissed()Z" />
 		<method name="isVisible()Z" />
-		<method name="onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z" />
 		<method name="setAutoDismissed(Z)V" />
 		<method name="setFocusable(Z)V" />
 		<method name="setOnZoomListener(Landroid/widget/ZoomButtonsController$OnZoomListener;)V" />
@@ -27948,6 +27283,7 @@
 		<method name="setZoomSpeed(J)V" />
 	</class>
 	<class name="android/widget/ZoomButtonsController$OnZoomListener" since="4">
+		<extends name="java/lang/Object" />
 		<method name="onVisibilityChanged(Z)V" />
 		<method name="onZoom(Z)V" />
 	</class>
@@ -27964,28 +27300,219 @@
 		<method name="show()V" />
 	</class>
 	<class name="com/android/internal/util/Predicate" since="1">
-		<method name="apply(LT;)Z" />
+		<extends name="java/lang/Object" />
+		<method name="apply(Ljava/lang/Object;)Z" />
+	</class>
+	<class name="com/google/android/maps/GeoPoint" since="1">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>(II)V" />
+		<method name="getLatitudeE6()I" />
+		<method name="getLongitudeE6()I" />
+	</class>
+	<class name="com/google/android/maps/ItemizedOverlay" since="1">
+		<extends name="com/google/android/maps/Overlay" />
+		<method name="&lt;init>(Landroid/graphics/drawable/Drawable;)V" />
+		<method name="boundCenter(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;" />
+		<method name="boundCenterBottom(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;" />
+		<method name="createItem(I)Lcom/google/android/maps/OverlayItem;" />
+		<method name="getCenter()Lcom/google/android/maps/GeoPoint;" />
+		<method name="getFocus()Lcom/google/android/maps/OverlayItem;" />
+		<method name="getIndexToDraw(I)I" />
+		<method name="getItem(I)Lcom/google/android/maps/OverlayItem;" />
+		<method name="getLastFocusedIndex()I" />
+		<method name="getLatSpanE6()I" />
+		<method name="getLonSpanE6()I" />
+		<method name="hitTest(Lcom/google/android/maps/OverlayItem;Landroid/graphics/drawable/Drawable;II)Z" />
+		<method name="nextFocus(Z)Lcom/google/android/maps/OverlayItem;" />
+		<method name="onTap(I)Z" />
+		<method name="populate()V" />
+		<method name="setDrawFocusedItem(Z)V" />
+		<method name="setFocus(Lcom/google/android/maps/OverlayItem;)V" />
+		<method name="setLastFocusedIndex(I)V" />
+		<method name="setOnFocusChangeListener(Lcom/google/android/maps/ItemizedOverlay$OnFocusChangeListener;)V" />
+		<method name="size()I" />
+	</class>
+	<class name="com/google/android/maps/ItemizedOverlay$OnFocusChangeListener" since="1">
+		<extends name="java/lang/Object" />
+		<method name="onFocusChanged(Lcom/google/android/maps/ItemizedOverlay;Lcom/google/android/maps/OverlayItem;)V" />
+	</class>
+	<class name="com/google/android/maps/MapActivity" since="1">
+		<extends name="android/app/Activity" />
+		<method name="&lt;init>()V" />
+		<method name="isLocationDisplayed()Z" />
+		<method name="isRouteDisplayed()Z" />
+	</class>
+	<class name="com/google/android/maps/MapController" since="1">
+		<extends name="java/lang/Object" />
+		<implements name="android/view/View$OnKeyListener" />
+		<method name="&lt;init>()V" />
+		<method name="animateTo(Lcom/google/android/maps/GeoPoint;)V" />
+		<method name="animateTo(Lcom/google/android/maps/GeoPoint;Landroid/os/Message;)V" />
+		<method name="animateTo(Lcom/google/android/maps/GeoPoint;Ljava/lang/Runnable;)V" />
+		<method name="scrollBy(II)V" />
+		<method name="setCenter(Lcom/google/android/maps/GeoPoint;)V" />
+		<method name="setZoom(I)I" />
+		<method name="stopAnimation(Z)V" />
+		<method name="stopPanning()V" />
+		<method name="zoomIn()Z" />
+		<method name="zoomInFixing(II)Z" />
+		<method name="zoomOut()Z" />
+		<method name="zoomOutFixing(II)Z" />
+		<method name="zoomToSpan(II)V" />
+	</class>
+	<class name="com/google/android/maps/MapView" since="1">
+		<extends name="android/view/ViewGroup" />
+		<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="&lt;init>(Landroid/content/Context;Ljava/lang/String;)V" />
+		<method name="canCoverCenter()Z" />
+		<method name="displayZoomControls(Z)V" />
+		<method name="generateDefaultLayoutParams()Lcom/google/android/maps/MapView$LayoutParams;" />
+		<method name="getController()Lcom/google/android/maps/MapController;" />
+		<method name="getLatitudeSpan()I" />
+		<method name="getLongitudeSpan()I" />
+		<method name="getMapCenter()Lcom/google/android/maps/GeoPoint;" />
+		<method name="getMaxZoomLevel()I" />
+		<method name="getOverlays()Ljava/util/List;" />
+		<method name="getProjection()Lcom/google/android/maps/Projection;" />
+		<method name="getZoomControls()Landroid/view/View;" />
+		<method name="getZoomLevel()I" />
+		<method name="isSatellite()Z" />
+		<method name="isStreetView()Z" />
+		<method name="isTraffic()Z" />
+		<method name="onRestoreInstanceState(Landroid/os/Bundle;)V" />
+		<method name="onSaveInstanceState(Landroid/os/Bundle;)V" />
+		<method name="preLoad()V" />
+		<method name="setReticleDrawMode(Lcom/google/android/maps/MapView$ReticleDrawMode;)V" />
+		<method name="setSatellite(Z)V" />
+		<method name="setStreetView(Z)V" />
+		<method name="setTraffic(Z)V" />
+	</class>
+	<class name="com/google/android/maps/MapView$LayoutParams" since="1">
+		<extends name="android/view/ViewGroup$LayoutParams" />
+		<method name="&lt;init>(IIIII)V" />
+		<method name="&lt;init>(IILcom/google/android/maps/GeoPoint;I)V" />
+		<method name="&lt;init>(IILcom/google/android/maps/GeoPoint;III)V" />
+		<method name="&lt;init>(Landroid/content/Context;Landroid/util/AttributeSet;)V" />
+		<method name="&lt;init>(Landroid/view/ViewGroup$LayoutParams;)V" />
+		<method name="debug(Ljava/lang/String;)Ljava/lang/String;" />
+		<field name="BOTTOM" />
+		<field name="BOTTOM_CENTER" />
+		<field name="CENTER" />
+		<field name="CENTER_HORIZONTAL" />
+		<field name="CENTER_VERTICAL" />
+		<field name="LEFT" />
+		<field name="MODE_MAP" />
+		<field name="MODE_VIEW" />
+		<field name="RIGHT" />
+		<field name="TOP" />
+		<field name="TOP_LEFT" />
+		<field name="alignment" />
+		<field name="mode" />
+		<field name="point" />
+		<field name="x" />
+		<field name="y" />
 	</class>
 	<class name="com/google/android/maps/MapView$ReticleDrawMode" since="1">
 		<extends name="java/lang/Enum" />
+		<method name="valueOf(Ljava/lang/String;)Lcom/google/android/maps/MapView$ReticleDrawMode;" />
+		<method name="values()[Lcom/google/android/maps/MapView$ReticleDrawMode;" />
 		<field name="DRAW_RETICLE_NEVER" />
 		<field name="DRAW_RETICLE_OVER" />
 		<field name="DRAW_RETICLE_UNDER" />
 	</class>
+	<class name="com/google/android/maps/MyLocationOverlay" since="1">
+		<extends name="com/google/android/maps/Overlay" />
+		<implements name="android/hardware/SensorListener" />
+		<implements name="android/location/LocationListener" />
+		<method name="&lt;init>(Landroid/content/Context;Lcom/google/android/maps/MapView;)V" />
+		<method name="disableCompass()V" />
+		<method name="disableMyLocation()V" />
+		<method name="dispatchTap()Z" />
+		<method name="drawCompass(Landroid/graphics/Canvas;F)V" />
+		<method name="drawMyLocation(Landroid/graphics/Canvas;Lcom/google/android/maps/MapView;Landroid/location/Location;Lcom/google/android/maps/GeoPoint;J)V" />
+		<method name="enableCompass()Z" />
+		<method name="enableMyLocation()Z" />
+		<method name="getLastFix()Landroid/location/Location;" />
+		<method name="getMyLocation()Lcom/google/android/maps/GeoPoint;" />
+		<method name="getOrientation()F" />
+		<method name="isCompassEnabled()Z" />
+		<method name="isMyLocationEnabled()Z" />
+		<method name="runOnFirstFix(Ljava/lang/Runnable;)Z" />
+	</class>
+	<class name="com/google/android/maps/Overlay" since="1">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
+		<method name="draw(Landroid/graphics/Canvas;Lcom/google/android/maps/MapView;Z)V" />
+		<method name="draw(Landroid/graphics/Canvas;Lcom/google/android/maps/MapView;ZJ)Z" />
+		<method name="drawAt(Landroid/graphics/Canvas;Landroid/graphics/drawable/Drawable;IIZ)V" />
+		<method name="onKeyDown(ILandroid/view/KeyEvent;Lcom/google/android/maps/MapView;)Z" />
+		<method name="onKeyUp(ILandroid/view/KeyEvent;Lcom/google/android/maps/MapView;)Z" />
+		<method name="onTap(Lcom/google/android/maps/GeoPoint;Lcom/google/android/maps/MapView;)Z" />
+		<method name="onTouchEvent(Landroid/view/MotionEvent;Lcom/google/android/maps/MapView;)Z" />
+		<method name="onTrackballEvent(Landroid/view/MotionEvent;Lcom/google/android/maps/MapView;)Z" />
+		<field name="SHADOW_X_SKEW" />
+		<field name="SHADOW_Y_SCALE" />
+	</class>
+	<class name="com/google/android/maps/OverlayItem" since="1">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>(Lcom/google/android/maps/GeoPoint;Ljava/lang/String;Ljava/lang/String;)V" />
+		<method name="getMarker(I)Landroid/graphics/drawable/Drawable;" />
+		<method name="getPoint()Lcom/google/android/maps/GeoPoint;" />
+		<method name="getSnippet()Ljava/lang/String;" />
+		<method name="getTitle()Ljava/lang/String;" />
+		<method name="routableAddress()Ljava/lang/String;" />
+		<method name="setMarker(Landroid/graphics/drawable/Drawable;)V" />
+		<method name="setState(Landroid/graphics/drawable/Drawable;I)V" />
+		<field name="ITEM_STATE_FOCUSED_MASK" />
+		<field name="ITEM_STATE_PRESSED_MASK" />
+		<field name="ITEM_STATE_SELECTED_MASK" />
+		<field name="mMarker" />
+		<field name="mPoint" />
+		<field name="mSnippet" />
+		<field name="mTitle" />
+	</class>
+	<class name="com/google/android/maps/Projection" since="1">
+		<extends name="java/lang/Object" />
+		<method name="fromPixels(II)Lcom/google/android/maps/GeoPoint;" />
+		<method name="metersToEquatorPixels(F)F" />
+		<method name="toPixels(Lcom/google/android/maps/GeoPoint;Landroid/graphics/Point;)Landroid/graphics/Point;" />
+	</class>
+	<class name="com/google/android/maps/TrackballGestureDetector" since="1">
+		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
+		<method name="analyze(Landroid/view/MotionEvent;)V" />
+		<method name="getCurrentDownX()F" />
+		<method name="getCurrentDownY()F" />
+		<method name="getFirstDownX()F" />
+		<method name="getFirstDownY()F" />
+		<method name="isDoubleTap()Z" />
+		<method name="isScroll()Z" />
+		<method name="isTap()Z" />
+		<method name="registerLongPressCallback(Ljava/lang/Runnable;)V" />
+		<method name="scrollX()F" />
+		<method name="scrollY()F" />
+	</class>
 	<class name="dalvik/annotation/TestTarget" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="conceptName()Ljava/lang/String;" since="3" />
+		<method name="methodArgs()[Ljava/lang/Class;" />
+		<method name="methodName()Ljava/lang/String;" />
 	</class>
 	<class name="dalvik/annotation/TestTargetClass" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="value()Ljava/lang/Class;" />
 	</class>
 	<class name="dalvik/bytecode/OpcodeInfo" since="11">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="MAXIMUM_PACKED_VALUE" />
 		<field name="MAXIMUM_VALUE" />
 	</class>
 	<class name="dalvik/bytecode/Opcodes" since="1">
+		<extends name="java/lang/Object" />
 		<field name="OP_ADD_DOUBLE" />
 		<field name="OP_ADD_DOUBLE_2ADDR" />
 		<field name="OP_ADD_FLOAT" />
@@ -28297,11 +27824,10 @@
 	<class name="dalvik/system/BaseDexClassLoader" since="14">
 		<extends name="java/lang/ClassLoader" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/io/File;Ljava/lang/String;Ljava/lang/ClassLoader;)V" />
-		<method name="findLibrary(Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="dalvik/system/DexClassLoader" since="3">
-		<extends name="java/lang/ClassLoader" />
 		<extends name="dalvik/system/BaseDexClassLoader" since="14" />
+		<extends name="java/lang/ClassLoader" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)V" />
 	</class>
 	<class name="dalvik/system/DexFile" since="1">
@@ -28316,11 +27842,10 @@
 		<method name="loadDex(Ljava/lang/String;Ljava/lang/String;I)Ldalvik/system/DexFile;" since="3" />
 	</class>
 	<class name="dalvik/system/PathClassLoader" since="1">
-		<extends name="java/lang/ClassLoader" />
 		<extends name="dalvik/system/BaseDexClassLoader" since="14" />
+		<extends name="java/lang/ClassLoader" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/ClassLoader;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)V" />
-		<method name="findLibrary(Ljava/lang/String;)Ljava/lang/String;" since="9" />
 	</class>
 	<class name="dalvik/system/PotentialDeadlockError" since="1">
 		<extends name="java/lang/VirtualMachineError" />
@@ -28346,6 +27871,7 @@
 	</class>
 	<class name="dalvik/system/VMDebug" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="dumpHprofData(Ljava/lang/String;)V" since="3" />
 		<method name="getAllocCount(I)I" />
 		<method name="getInstructionCount([I)V" />
@@ -28396,6 +27922,7 @@
 	</class>
 	<class name="dalvik/system/VMRuntime" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="gcSoftReferences()V" />
 		<method name="getExternalBytesAllocated()J" />
 		<method name="getMinimumHeapSize()J" />
@@ -28415,6 +27942,7 @@
 	</class>
 	<class name="dalvik/system/Zygote" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="fork()I" />
 		<method name="forkAndSpecialize(II[II[[I)I" since="3" />
 		<method name="forkAndSpecialize(II[IZ[[I)I" />
@@ -28428,6 +27956,7 @@
 	<class name="java/awt/font/NumericShaper" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
+		<method name="&lt;init>()V" />
 		<method name="getContextualShaper(I)Ljava/awt/font/NumericShaper;" />
 		<method name="getContextualShaper(II)Ljava/awt/font/NumericShaper;" />
 		<method name="getRanges()I" />
@@ -28534,6 +28063,7 @@
 		<method name="setPropagationId(Ljava/lang/Object;)V" />
 	</class>
 	<class name="java/beans/PropertyChangeListener" since="3">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/EventListener" />
 		<method name="propertyChange(Ljava/beans/PropertyChangeEvent;)V" />
 	</class>
@@ -28542,7 +28072,6 @@
 		<implements name="java/beans/PropertyChangeListener" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/beans/PropertyChangeListener;)V" />
 		<method name="getPropertyName()Ljava/lang/String;" />
-		<method name="propertyChange(Ljava/beans/PropertyChangeEvent;)V" />
 	</class>
 	<class name="java/beans/PropertyChangeSupport" since="3">
 		<extends name="java/lang/Object" />
@@ -28584,24 +28113,18 @@
 		<extends name="java/io/Reader" />
 		<method name="&lt;init>(Ljava/io/Reader;)V" />
 		<method name="&lt;init>(Ljava/io/Reader;I)V" />
-		<method name="close()V" />
-		<method name="read([CII)I" />
 		<method name="readLine()Ljava/lang/String;" />
 	</class>
 	<class name="java/io/BufferedWriter" since="1">
 		<extends name="java/io/Writer" />
 		<method name="&lt;init>(Ljava/io/Writer;)V" />
 		<method name="&lt;init>(Ljava/io/Writer;I)V" />
-		<method name="close()V" />
-		<method name="flush()V" />
 		<method name="newLine()V" />
-		<method name="write([CII)V" />
 	</class>
 	<class name="java/io/ByteArrayInputStream" since="1">
 		<extends name="java/io/InputStream" />
 		<method name="&lt;init>([B)V" />
 		<method name="&lt;init>([BII)V" />
-		<method name="read()I" />
 		<field name="buf" />
 		<field name="count" />
 		<field name="mark" />
@@ -28616,7 +28139,6 @@
 		<method name="toByteArray()[B" />
 		<method name="toString(I)Ljava/lang/String;" />
 		<method name="toString(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="write(I)V" />
 		<method name="writeTo(Ljava/io/OutputStream;)V" />
 		<field name="buf" />
 		<field name="count" />
@@ -28625,8 +28147,6 @@
 		<extends name="java/io/Reader" />
 		<method name="&lt;init>([C)V" />
 		<method name="&lt;init>([CII)V" />
-		<method name="close()V" />
-		<method name="read([CII)I" />
 		<field name="buf" />
 		<field name="count" />
 		<field name="markedPos" />
@@ -28636,12 +28156,12 @@
 		<extends name="java/io/Writer" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="close()V" />
-		<method name="flush()V" />
+		<method name="append(C)Ljava/io/CharArrayWriter;" />
+		<method name="append(Ljava/lang/CharSequence;)Ljava/io/CharArrayWriter;" />
+		<method name="append(Ljava/lang/CharSequence;II)Ljava/io/CharArrayWriter;" />
 		<method name="reset()V" />
 		<method name="size()I" />
 		<method name="toCharArray()[C" />
-		<method name="write([CII)V" />
 		<method name="writeTo(Ljava/io/Writer;)V" />
 		<field name="buf" />
 		<field name="count" />
@@ -28652,12 +28172,13 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/io/Closeable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="close()V" />
 	</class>
 	<class name="java/io/Console" since="9">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Flushable" />
-		<method name="flush()V" />
+		<method name="&lt;init>()V" />
 		<method name="format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/Console;" />
 		<method name="printf(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/Console;" />
 		<method name="readLine()Ljava/lang/String;" />
@@ -28668,6 +28189,7 @@
 		<method name="writer()Ljava/io/PrintWriter;" />
 	</class>
 	<class name="java/io/DataInput" since="1">
+		<extends name="java/lang/Object" />
 		<method name="readBoolean()Z" />
 		<method name="readByte()B" />
 		<method name="readChar()C" />
@@ -28688,26 +28210,10 @@
 		<extends name="java/io/FilterInputStream" />
 		<implements name="java/io/DataInput" />
 		<method name="&lt;init>(Ljava/io/InputStream;)V" />
-		<method name="read([B)I" />
-		<method name="read([BII)I" />
-		<method name="readBoolean()Z" />
-		<method name="readByte()B" />
-		<method name="readChar()C" />
-		<method name="readDouble()D" />
-		<method name="readFloat()F" />
-		<method name="readFully([B)V" />
-		<method name="readFully([BII)V" />
-		<method name="readInt()I" />
-		<method name="readLine()Ljava/lang/String;" />
-		<method name="readLong()J" />
-		<method name="readShort()S" />
-		<method name="readUTF()Ljava/lang/String;" />
 		<method name="readUTF(Ljava/io/DataInput;)Ljava/lang/String;" />
-		<method name="readUnsignedByte()I" />
-		<method name="readUnsignedShort()I" />
-		<method name="skipBytes(I)I" />
 	</class>
 	<class name="java/io/DataOutput" since="1">
+		<extends name="java/lang/Object" />
 		<method name="write(I)V" />
 		<method name="write([B)V" />
 		<method name="write([BII)V" />
@@ -28728,17 +28234,6 @@
 		<implements name="java/io/DataOutput" />
 		<method name="&lt;init>(Ljava/io/OutputStream;)V" />
 		<method name="size()I" />
-		<method name="writeBoolean(Z)V" />
-		<method name="writeByte(I)V" />
-		<method name="writeBytes(Ljava/lang/String;)V" />
-		<method name="writeChar(I)V" />
-		<method name="writeChars(Ljava/lang/String;)V" />
-		<method name="writeDouble(D)V" />
-		<method name="writeFloat(F)V" />
-		<method name="writeInt(I)V" />
-		<method name="writeLong(J)V" />
-		<method name="writeShort(I)V" />
-		<method name="writeUTF(Ljava/lang/String;)V" />
 		<field name="written" />
 	</class>
 	<class name="java/io/EOFException" since="1">
@@ -28747,14 +28242,15 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/io/Externalizable" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
 		<method name="readExternal(Ljava/io/ObjectInput;)V" />
 		<method name="writeExternal(Ljava/io/ObjectOutput;)V" />
 	</class>
 	<class name="java/io/File" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Comparable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>(Ljava/io/File;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
@@ -28820,6 +28316,7 @@
 		<field name="out" />
 	</class>
 	<class name="java/io/FileFilter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="accept(Ljava/io/File;)Z" />
 	</class>
 	<class name="java/io/FileInputStream" since="1">
@@ -28830,7 +28327,6 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="getChannel()Ljava/nio/channels/FileChannel;" />
 		<method name="getFD()Ljava/io/FileDescriptor;" />
-		<method name="read()I" />
 	</class>
 	<class name="java/io/FileNotFoundException" since="1">
 		<extends name="java/io/IOException" />
@@ -28847,16 +28343,11 @@
 		<method name="&lt;init>(Ljava/lang/String;Z)V" />
 		<method name="getChannel()Ljava/nio/channels/FileChannel;" />
 		<method name="getFD()Ljava/io/FileDescriptor;" />
-		<method name="write(I)V" />
 	</class>
 	<class name="java/io/FilePermission" since="1">
 		<extends name="java/security/Permission" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="getActions()Ljava/lang/String;" />
-		<method name="hashCode()I" />
-		<method name="implies(Ljava/security/Permission;)Z" />
 	</class>
 	<class name="java/io/FileReader" since="1">
 		<extends name="java/io/InputStreamReader" />
@@ -28873,36 +28364,31 @@
 		<method name="&lt;init>(Ljava/lang/String;Z)V" />
 	</class>
 	<class name="java/io/FilenameFilter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="accept(Ljava/io/File;Ljava/lang/String;)Z" />
 	</class>
 	<class name="java/io/FilterInputStream" since="1">
 		<extends name="java/io/InputStream" />
 		<method name="&lt;init>(Ljava/io/InputStream;)V" />
-		<method name="read()I" />
 		<field name="in" />
 	</class>
 	<class name="java/io/FilterOutputStream" since="1">
 		<extends name="java/io/OutputStream" />
 		<method name="&lt;init>(Ljava/io/OutputStream;)V" />
-		<method name="write(I)V" />
 		<field name="out" />
 	</class>
 	<class name="java/io/FilterReader" since="1">
 		<extends name="java/io/Reader" />
 		<method name="&lt;init>(Ljava/io/Reader;)V" />
-		<method name="close()V" />
-		<method name="read([CII)I" />
 		<field name="in" />
 	</class>
 	<class name="java/io/FilterWriter" since="1">
 		<extends name="java/io/Writer" />
 		<method name="&lt;init>(Ljava/io/Writer;)V" />
-		<method name="close()V" />
-		<method name="flush()V" />
-		<method name="write([CII)V" />
 		<field name="out" />
 	</class>
 	<class name="java/io/Flushable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="flush()V" />
 	</class>
 	<class name="java/io/IOError" since="9">
@@ -28921,7 +28407,6 @@
 		<implements name="java/io/Closeable" />
 		<method name="&lt;init>()V" />
 		<method name="available()I" />
-		<method name="close()V" />
 		<method name="mark(I)V" />
 		<method name="markSupported()Z" />
 		<method name="read()I" />
@@ -28936,9 +28421,7 @@
 		<method name="&lt;init>(Ljava/io/InputStream;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/io/InputStream;Ljava/nio/charset/Charset;)V" />
 		<method name="&lt;init>(Ljava/io/InputStream;Ljava/nio/charset/CharsetDecoder;)V" />
-		<method name="close()V" />
 		<method name="getEncoding()Ljava/lang/String;" />
-		<method name="read([CII)I" />
 	</class>
 	<class name="java/io/InterruptedIOException" since="1">
 		<extends name="java/io/IOException" />
@@ -28980,6 +28463,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/io/ObjectInput" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/io/DataInput" />
 		<method name="available()I" />
 		<method name="close()V" />
@@ -28997,32 +28481,15 @@
 		<method name="&lt;init>(Ljava/io/InputStream;)V" />
 		<method name="defaultReadObject()V" />
 		<method name="enableResolveObject(Z)Z" />
-		<method name="read()I" />
-		<method name="readBoolean()Z" />
-		<method name="readByte()B" />
-		<method name="readChar()C" />
 		<method name="readClassDescriptor()Ljava/io/ObjectStreamClass;" />
-		<method name="readDouble()D" />
 		<method name="readFields()Ljava/io/ObjectInputStream$GetField;" />
-		<method name="readFloat()F" />
-		<method name="readFully([B)V" />
-		<method name="readFully([BII)V" />
-		<method name="readInt()I" />
-		<method name="readLine()Ljava/lang/String;" />
-		<method name="readLong()J" />
-		<method name="readObject()Ljava/lang/Object;" />
 		<method name="readObjectOverride()Ljava/lang/Object;" />
-		<method name="readShort()S" />
 		<method name="readStreamHeader()V" />
-		<method name="readUTF()Ljava/lang/String;" />
 		<method name="readUnshared()Ljava/lang/Object;" />
-		<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;" />
 		<method name="resolveObject(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="resolveProxyClass([Ljava/lang/String;)Ljava/lang/Class;" />
-		<method name="skipBytes(I)I" />
 	</class>
 	<class name="java/io/ObjectInputStream$GetField" since="1">
 		<extends name="java/lang/Object" />
@@ -29040,15 +28507,14 @@
 		<method name="getObjectStreamClass()Ljava/io/ObjectStreamClass;" />
 	</class>
 	<class name="java/io/ObjectInputValidation" since="1">
+		<extends name="java/lang/Object" />
 		<method name="validateObject()V" />
 	</class>
 	<class name="java/io/ObjectOutput" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/io/DataOutput" />
 		<method name="close()V" />
 		<method name="flush()V" />
-		<method name="write(I)V" />
-		<method name="write([B)V" />
-		<method name="write([BII)V" />
 		<method name="writeObject(Ljava/lang/Object;)V" />
 	</class>
 	<class name="java/io/ObjectOutputStream" since="1">
@@ -29066,23 +28532,10 @@
 		<method name="replaceObject(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="reset()V" />
 		<method name="useProtocolVersion(I)V" />
-		<method name="write(I)V" />
-		<method name="writeBoolean(Z)V" />
-		<method name="writeByte(I)V" />
-		<method name="writeBytes(Ljava/lang/String;)V" />
-		<method name="writeChar(I)V" />
-		<method name="writeChars(Ljava/lang/String;)V" />
 		<method name="writeClassDescriptor(Ljava/io/ObjectStreamClass;)V" />
-		<method name="writeDouble(D)V" />
 		<method name="writeFields()V" />
-		<method name="writeFloat(F)V" />
-		<method name="writeInt(I)V" />
-		<method name="writeLong(J)V" />
-		<method name="writeObject(Ljava/lang/Object;)V" />
 		<method name="writeObjectOverride(Ljava/lang/Object;)V" />
-		<method name="writeShort(I)V" />
 		<method name="writeStreamHeader()V" />
-		<method name="writeUTF(Ljava/lang/String;)V" />
 		<method name="writeUnshared(Ljava/lang/Object;)V" />
 	</class>
 	<class name="java/io/ObjectOutputStream$PutField" since="1">
@@ -29102,6 +28555,7 @@
 	<class name="java/io/ObjectStreamClass" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
+		<method name="&lt;init>()V" />
 		<method name="forClass()Ljava/lang/Class;" />
 		<method name="getField(Ljava/lang/String;)Ljava/io/ObjectStreamField;" />
 		<method name="getFields()[Ljava/io/ObjectStreamField;" />
@@ -29112,6 +28566,7 @@
 		<field name="NO_FIELDS" />
 	</class>
 	<class name="java/io/ObjectStreamConstants" since="1">
+		<extends name="java/lang/Object" />
 		<field name="PROTOCOL_VERSION_1" />
 		<field name="PROTOCOL_VERSION_2" />
 		<field name="SC_BLOCK_DATA" />
@@ -29152,7 +28607,6 @@
 		<implements name="java/lang/Comparable" />
 		<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;" />
@@ -29164,6 +28618,7 @@
 	</class>
 	<class name="java/io/OptionalDataException" since="1">
 		<extends name="java/io/ObjectStreamException" />
+		<method name="&lt;init>()V" />
 		<field name="eof" />
 		<field name="length" />
 	</class>
@@ -29172,8 +28627,6 @@
 		<implements name="java/io/Closeable" />
 		<implements name="java/io/Flushable" />
 		<method name="&lt;init>()V" />
-		<method name="close()V" />
-		<method name="flush()V" />
 		<method name="write(I)V" />
 		<method name="write([B)V" />
 		<method name="write([BII)V" />
@@ -29184,10 +28637,7 @@
 		<method name="&lt;init>(Ljava/io/OutputStream;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/io/OutputStream;Ljava/nio/charset/Charset;)V" />
 		<method name="&lt;init>(Ljava/io/OutputStream;Ljava/nio/charset/CharsetEncoder;)V" />
-		<method name="close()V" />
-		<method name="flush()V" />
 		<method name="getEncoding()Ljava/lang/String;" />
-		<method name="write([CII)V" />
 	</class>
 	<class name="java/io/PipedInputStream" since="1">
 		<extends name="java/io/InputStream" />
@@ -29196,7 +28646,6 @@
 		<method name="&lt;init>(Ljava/io/PipedOutputStream;)V" />
 		<method name="&lt;init>(Ljava/io/PipedOutputStream;I)V" since="9" />
 		<method name="connect(Ljava/io/PipedOutputStream;)V" />
-		<method name="read()I" />
 		<method name="receive(I)V" />
 		<field name="PIPE_SIZE" />
 		<field name="buffer" />
@@ -29208,7 +28657,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/io/PipedInputStream;)V" />
 		<method name="connect(Ljava/io/PipedInputStream;)V" />
-		<method name="write(I)V" />
 	</class>
 	<class name="java/io/PipedReader" since="1">
 		<extends name="java/io/Reader" />
@@ -29216,23 +28664,18 @@
 		<method name="&lt;init>(I)V" since="9" />
 		<method name="&lt;init>(Ljava/io/PipedWriter;)V" />
 		<method name="&lt;init>(Ljava/io/PipedWriter;I)V" since="9" />
-		<method name="close()V" />
 		<method name="connect(Ljava/io/PipedWriter;)V" />
-		<method name="read([CII)I" />
 	</class>
 	<class name="java/io/PipedWriter" since="1">
 		<extends name="java/io/Writer" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/io/PipedReader;)V" />
-		<method name="close()V" />
 		<method name="connect(Ljava/io/PipedReader;)V" />
-		<method name="flush()V" />
-		<method name="write([CII)V" />
 	</class>
 	<class name="java/io/PrintStream" since="1">
 		<extends name="java/io/FilterOutputStream" />
-		<implements name="java/lang/Appendable" />
 		<implements name="java/io/Closeable" />
+		<implements name="java/lang/Appendable" />
 		<method name="&lt;init>(Ljava/io/File;)V" />
 		<method name="&lt;init>(Ljava/io/File;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/io/OutputStream;)V" />
@@ -29280,10 +28723,11 @@
 		<method name="&lt;init>(Ljava/io/Writer;Z)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
+		<method name="append(C)Ljava/io/PrintWriter;" />
+		<method name="append(Ljava/lang/CharSequence;)Ljava/io/PrintWriter;" />
+		<method name="append(Ljava/lang/CharSequence;II)Ljava/io/PrintWriter;" />
 		<method name="checkError()Z" />
 		<method name="clearError()V" since="9" />
-		<method name="close()V" />
-		<method name="flush()V" />
 		<method name="format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintWriter;" />
 		<method name="format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintWriter;" />
 		<method name="print(C)V" />
@@ -29308,7 +28752,6 @@
 		<method name="println(Z)V" />
 		<method name="println([C)V" />
 		<method name="setError()V" />
-		<method name="write([CII)V" />
 		<field name="out" />
 	</class>
 	<class name="java/io/PushbackInputStream" since="1">
@@ -29336,7 +28779,6 @@
 		<implements name="java/io/DataOutput" />
 		<method name="&lt;init>(Ljava/io/File;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="close()V" />
 		<method name="getChannel()Ljava/nio/channels/FileChannel;" />
 		<method name="getFD()Ljava/io/FileDescriptor;" />
 		<method name="getFilePointer()J" />
@@ -29344,37 +28786,8 @@
 		<method name="read()I" />
 		<method name="read([B)I" />
 		<method name="read([BII)I" />
-		<method name="readBoolean()Z" />
-		<method name="readByte()B" />
-		<method name="readChar()C" />
-		<method name="readDouble()D" />
-		<method name="readFloat()F" />
-		<method name="readFully([B)V" />
-		<method name="readFully([BII)V" />
-		<method name="readInt()I" />
-		<method name="readLine()Ljava/lang/String;" />
-		<method name="readLong()J" />
-		<method name="readShort()S" />
-		<method name="readUTF()Ljava/lang/String;" />
-		<method name="readUnsignedByte()I" />
-		<method name="readUnsignedShort()I" />
 		<method name="seek(J)V" />
 		<method name="setLength(J)V" />
-		<method name="skipBytes(I)I" />
-		<method name="write(I)V" />
-		<method name="write([B)V" />
-		<method name="write([BII)V" />
-		<method name="writeBoolean(Z)V" />
-		<method name="writeByte(I)V" />
-		<method name="writeBytes(Ljava/lang/String;)V" />
-		<method name="writeChar(I)V" />
-		<method name="writeChars(Ljava/lang/String;)V" />
-		<method name="writeDouble(D)V" />
-		<method name="writeFloat(F)V" />
-		<method name="writeInt(I)V" />
-		<method name="writeLong(J)V" />
-		<method name="writeShort(I)V" />
-		<method name="writeUTF(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/io/Reader" since="1">
 		<extends name="java/lang/Object" />
@@ -29382,11 +28795,9 @@
 		<implements name="java/lang/Readable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/Object;)V" />
-		<method name="close()V" />
 		<method name="mark(I)V" />
 		<method name="markSupported()Z" />
 		<method name="read()I" />
-		<method name="read(Ljava/nio/CharBuffer;)I" />
 		<method name="read([C)I" />
 		<method name="read([CII)I" />
 		<method name="ready()Z" />
@@ -29398,9 +28809,9 @@
 		<extends name="java/io/InputStream" />
 		<method name="&lt;init>(Ljava/io/InputStream;Ljava/io/InputStream;)V" />
 		<method name="&lt;init>(Ljava/util/Enumeration;)V" />
-		<method name="read()I" />
 	</class>
 	<class name="java/io/Serializable" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/io/SerializablePermission" since="1">
 		<extends name="java/security/BasicPermission" />
@@ -29442,7 +28853,6 @@
 	<class name="java/io/StringBufferInputStream" since="1">
 		<extends name="java/io/InputStream" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="read()I" />
 		<field name="buffer" />
 		<field name="count" />
 		<field name="pos" />
@@ -29450,17 +28860,15 @@
 	<class name="java/io/StringReader" since="1">
 		<extends name="java/io/Reader" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="close()V" />
-		<method name="read([CII)I" />
 	</class>
 	<class name="java/io/StringWriter" since="1">
 		<extends name="java/io/Writer" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
-		<method name="close()V" />
-		<method name="flush()V" />
+		<method name="append(C)Ljava/io/StringWriter;" />
+		<method name="append(Ljava/lang/CharSequence;)Ljava/io/StringWriter;" />
+		<method name="append(Ljava/lang/CharSequence;II)Ljava/io/StringWriter;" />
 		<method name="getBuffer()Ljava/lang/StringBuffer;" />
-		<method name="write([CII)V" />
 	</class>
 	<class name="java/io/SyncFailedException" since="1">
 		<extends name="java/io/IOException" />
@@ -29483,16 +28891,14 @@
 	</class>
 	<class name="java/io/Writer" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Appendable" />
 		<implements name="java/io/Closeable" />
 		<implements name="java/io/Flushable" />
+		<implements name="java/lang/Appendable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/Object;)V" />
 		<method name="append(C)Ljava/io/Writer;" />
 		<method name="append(Ljava/lang/CharSequence;)Ljava/io/Writer;" />
 		<method name="append(Ljava/lang/CharSequence;II)Ljava/io/Writer;" />
-		<method name="close()V" />
-		<method name="flush()V" />
 		<method name="write(I)V" />
 		<method name="write(Ljava/lang/String;)V" />
 		<method name="write(Ljava/lang/String;II)V" />
@@ -29507,6 +28913,7 @@
 	</class>
 	<class name="java/lang/AbstractStringBuilder" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="capacity()I" />
 		<method name="charAt(I)C" />
 		<method name="codePointAt(I)I" />
@@ -29528,6 +28935,7 @@
 		<method name="trimToSize()V" />
 	</class>
 	<class name="java/lang/Appendable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="append(C)Ljava/lang/Appendable;" />
 		<method name="append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;" />
 		<method name="append(Ljava/lang/CharSequence;II)Ljava/lang/Appendable;" />
@@ -29561,8 +28969,8 @@
 	</class>
 	<class name="java/lang/Boolean" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Comparable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Z)V" />
 		<method name="booleanValue()Z" />
@@ -29583,10 +28991,6 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="compareTo(Ljava/lang/Byte;)I" />
 		<method name="decode(Ljava/lang/String;)Ljava/lang/Byte;" />
-		<method name="doubleValue()D" />
-		<method name="floatValue()F" />
-		<method name="intValue()I" />
-		<method name="longValue()J" />
 		<method name="parseByte(Ljava/lang/String;)B" />
 		<method name="parseByte(Ljava/lang/String;I)B" />
 		<method name="toString(B)Ljava/lang/String;" />
@@ -29599,15 +29003,15 @@
 		<field name="TYPE" />
 	</class>
 	<class name="java/lang/CharSequence" since="1">
+		<extends name="java/lang/Object" />
 		<method name="charAt(I)C" />
 		<method name="length()I" />
 		<method name="subSequence(II)Ljava/lang/CharSequence;" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/lang/Character" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Comparable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>(C)V" />
 		<method name="charCount(I)I" />
 		<method name="charValue()C" />
@@ -29752,12 +29156,10 @@
 	<class name="java/lang/Character$Subset" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="hashCode()I" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/lang/Character$UnicodeBlock" since="1">
 		<extends name="java/lang/Character$Subset" />
+		<method name="&lt;init>()V" />
 		<method name="forName(Ljava/lang/String;)Ljava/lang/Character$UnicodeBlock;" />
 		<method name="of(C)Ljava/lang/Character$UnicodeBlock;" />
 		<method name="of(I)Ljava/lang/Character$UnicodeBlock;" />
@@ -29890,24 +29292,22 @@
 	</class>
 	<class name="java/lang/Class" since="1">
 		<extends name="java/lang/Object" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/reflect/AnnotatedElement" />
 		<implements name="java/lang/reflect/GenericDeclaration" />
-		<implements name="java/io/Serializable" />
 		<implements name="java/lang/reflect/Type" />
+		<method name="&lt;init>()V" />
 		<method name="asSubclass(Ljava/lang/Class;)Ljava/lang/Class;" />
-		<method name="cast(Ljava/lang/Object;)LT;" />
+		<method name="cast(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="desiredAssertionStatus()Z" />
 		<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;" />
 		<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;" />
 		<method name="getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;" />
 		<method name="getDeclaredConstructors()[Ljava/lang/reflect/Constructor;" />
@@ -29919,7 +29319,7 @@
 		<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="getEnumConstants()[Ljava/lang/Object;" />
 		<method name="getField(Ljava/lang/String;)Ljava/lang/reflect/Field;" />
 		<method name="getFields()[Ljava/lang/reflect/Field;" />
 		<method name="getGenericInterfaces()[Ljava/lang/reflect/Type;" />
@@ -29936,9 +29336,7 @@
 		<method name="getSigners()[Ljava/lang/Object;" />
 		<method name="getSimpleName()Ljava/lang/String;" />
 		<method name="getSuperclass()Ljava/lang/Class;" />
-		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable;" />
 		<method name="isAnnotation()Z" />
-		<method name="isAnnotationPresent(Ljava/lang/Class;)Z" />
 		<method name="isAnonymousClass()Z" />
 		<method name="isArray()Z" />
 		<method name="isAssignableFrom(Ljava/lang/Class;)Z" />
@@ -29949,7 +29347,7 @@
 		<method name="isMemberClass()Z" />
 		<method name="isPrimitive()Z" />
 		<method name="isSynthetic()Z" />
-		<method name="newInstance()LT;" />
+		<method name="newInstance()Ljava/lang/Object;" />
 	</class>
 	<class name="java/lang/ClassCastException" since="1">
 		<extends name="java/lang/RuntimeException" />
@@ -30013,12 +29411,15 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/lang/Cloneable" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/lang/Comparable" since="1">
-		<method name="compareTo(LT;)I" />
+		<extends name="java/lang/Object" />
+		<method name="compareTo(Ljava/lang/Object;)I" />
 	</class>
 	<class name="java/lang/Compiler" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="command(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="compileClass(Ljava/lang/Class;)Z" />
 		<method name="compileClasses(Ljava/lang/String;)Z" />
@@ -30038,15 +29439,11 @@
 		<method name="compareTo(Ljava/lang/Double;)I" />
 		<method name="doubleToLongBits(D)J" />
 		<method name="doubleToRawLongBits(D)J" />
-		<method name="doubleValue()D" />
-		<method name="floatValue()F" />
-		<method name="intValue()I" />
 		<method name="isInfinite()Z" />
 		<method name="isInfinite(D)Z" />
 		<method name="isNaN()Z" />
 		<method name="isNaN(D)Z" />
 		<method name="longBitsToDouble(J)D" />
-		<method name="longValue()J" />
 		<method name="parseDouble(Ljava/lang/String;)D" />
 		<method name="toHexString(D)Ljava/lang/String;" />
 		<method name="toString(D)Ljava/lang/String;" />
@@ -30065,18 +29462,14 @@
 	</class>
 	<class name="java/lang/Enum" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Comparable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>(Ljava/lang/String;I)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="compareTo(LE;)I" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="finalize()V" since="9" />
+		<method name="compareTo(Ljava/lang/Enum;)I" />
 		<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;Ljava/lang/String;)LT;" />
+		<method name="valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;" />
 	</class>
 	<class name="java/lang/EnumConstantNotPresentException" since="1">
 		<extends name="java/lang/RuntimeException" />
@@ -30113,17 +29506,13 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="compare(FF)I" />
 		<method name="compareTo(Ljava/lang/Float;)I" />
-		<method name="doubleValue()D" />
 		<method name="floatToIntBits(F)I" />
 		<method name="floatToRawIntBits(F)I" />
-		<method name="floatValue()F" />
 		<method name="intBitsToFloat(I)F" />
-		<method name="intValue()I" />
 		<method name="isInfinite()Z" />
 		<method name="isInfinite(F)Z" />
 		<method name="isNaN()Z" />
 		<method name="isNaN(F)Z" />
-		<method name="longValue()J" />
 		<method name="parseFloat(Ljava/lang/String;)F" />
 		<method name="toHexString(F)Ljava/lang/String;" />
 		<method name="toString(F)Ljava/lang/String;" />
@@ -30187,7 +29576,7 @@
 	<class name="java/lang/InheritableThreadLocal" since="1">
 		<extends name="java/lang/ThreadLocal" />
 		<method name="&lt;init>()V" />
-		<method name="childValue(LT;)LT;" />
+		<method name="childValue(Ljava/lang/Object;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/lang/InstantiationError" since="1">
 		<extends name="java/lang/IncompatibleClassChangeError" />
@@ -30207,14 +29596,10 @@
 		<method name="bitCount(I)I" />
 		<method name="compareTo(Ljava/lang/Integer;)I" />
 		<method name="decode(Ljava/lang/String;)Ljava/lang/Integer;" />
-		<method name="doubleValue()D" />
-		<method name="floatValue()F" />
 		<method name="getInteger(Ljava/lang/String;)Ljava/lang/Integer;" />
 		<method name="getInteger(Ljava/lang/String;I)Ljava/lang/Integer;" />
 		<method name="getInteger(Ljava/lang/String;Ljava/lang/Integer;)Ljava/lang/Integer;" />
 		<method name="highestOneBit(I)I" />
-		<method name="intValue()I" />
-		<method name="longValue()J" />
 		<method name="lowestOneBit(I)I" />
 		<method name="numberOfLeadingZeros(I)I" />
 		<method name="numberOfTrailingZeros(I)I" />
@@ -30249,6 +29634,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/lang/Iterable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="iterator()Ljava/util/Iterator;" />
 	</class>
 	<class name="java/lang/LinkageError" since="1">
@@ -30264,14 +29650,10 @@
 		<method name="bitCount(J)I" />
 		<method name="compareTo(Ljava/lang/Long;)I" />
 		<method name="decode(Ljava/lang/String;)Ljava/lang/Long;" />
-		<method name="doubleValue()D" />
-		<method name="floatValue()F" />
 		<method name="getLong(Ljava/lang/String;)Ljava/lang/Long;" />
 		<method name="getLong(Ljava/lang/String;J)Ljava/lang/Long;" />
 		<method name="getLong(Ljava/lang/String;Ljava/lang/Long;)Ljava/lang/Long;" />
 		<method name="highestOneBit(J)J" />
-		<method name="intValue()I" />
-		<method name="longValue()J" />
 		<method name="lowestOneBit(J)J" />
 		<method name="numberOfLeadingZeros(J)I" />
 		<method name="numberOfTrailingZeros(J)I" />
@@ -30297,6 +29679,7 @@
 	</class>
 	<class name="java/lang/Math" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="IEEEremainder(DD)D" />
 		<method name="abs(D)D" />
 		<method name="abs(F)F" />
@@ -30431,10 +29814,7 @@
 	<class name="java/lang/Package" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/reflect/AnnotatedElement" />
-		<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="&lt;init>()V" />
 		<method name="getImplementationTitle()Ljava/lang/String;" />
 		<method name="getImplementationVendor()Ljava/lang/String;" />
 		<method name="getImplementationVersion()Ljava/lang/String;" />
@@ -30444,7 +29824,6 @@
 		<method name="getSpecificationTitle()Ljava/lang/String;" />
 		<method name="getSpecificationVendor()Ljava/lang/String;" />
 		<method name="getSpecificationVersion()Ljava/lang/String;" />
-		<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" />
@@ -30474,13 +29853,16 @@
 		<method name="start()Ljava/lang/Process;" />
 	</class>
 	<class name="java/lang/Readable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="read(Ljava/nio/CharBuffer;)I" />
 	</class>
 	<class name="java/lang/Runnable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="run()V" />
 	</class>
 	<class name="java/lang/Runtime" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="addShutdownHook(Ljava/lang/Thread;)V" />
 		<method name="availableProcessors()I" />
 		<method name="exec(Ljava/lang/String;)Ljava/lang/Process;" />
@@ -30578,10 +29960,6 @@
 		<method name="&lt;init>(S)V" />
 		<method name="compareTo(Ljava/lang/Short;)I" />
 		<method name="decode(Ljava/lang/String;)Ljava/lang/Short;" />
-		<method name="doubleValue()D" />
-		<method name="floatValue()F" />
-		<method name="intValue()I" />
-		<method name="longValue()J" />
 		<method name="parseShort(Ljava/lang/String;)S" />
 		<method name="parseShort(Ljava/lang/String;I)S" />
 		<method name="reverseBytes(S)S" />
@@ -30611,6 +29989,7 @@
 	</class>
 	<class name="java/lang/StrictMath" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="IEEEremainder(DD)D" />
 		<method name="abs(D)D" />
 		<method name="abs(F)F" />
@@ -30670,9 +30049,9 @@
 	</class>
 	<class name="java/lang/String" since="1">
 		<extends name="java/lang/Object" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/CharSequence" />
 		<implements name="java/lang/Comparable" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/StringBuffer;)V" />
@@ -30688,7 +30067,6 @@
 		<method name="&lt;init>([C)V" />
 		<method name="&lt;init>([CII)V" />
 		<method name="&lt;init>([III)V" />
-		<method name="charAt(I)C" />
 		<method name="codePointAt(I)I" />
 		<method name="codePointBefore(I)I" />
 		<method name="codePointCount(II)I" />
@@ -30719,7 +30097,6 @@
 		<method name="lastIndexOf(II)I" />
 		<method name="lastIndexOf(Ljava/lang/String;)I" />
 		<method name="lastIndexOf(Ljava/lang/String;I)I" />
-		<method name="length()I" />
 		<method name="matches(Ljava/lang/String;)Z" />
 		<method name="offsetByCodePoints(II)I" />
 		<method name="regionMatches(ILjava/lang/String;II)Z" />
@@ -30732,7 +30109,6 @@
 		<method name="split(Ljava/lang/String;I)[Ljava/lang/String;" />
 		<method name="startsWith(Ljava/lang/String;)Z" />
 		<method name="startsWith(Ljava/lang/String;I)Z" />
-		<method name="subSequence(II)Ljava/lang/CharSequence;" />
 		<method name="substring(I)Ljava/lang/String;" />
 		<method name="substring(II)Ljava/lang/String;" />
 		<method name="toCharArray()[C" />
@@ -30754,9 +30130,9 @@
 	</class>
 	<class name="java/lang/StringBuffer" since="1">
 		<extends name="java/lang/AbstractStringBuilder" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Appendable" />
 		<implements name="java/lang/CharSequence" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;)V" />
@@ -30794,9 +30170,9 @@
 	</class>
 	<class name="java/lang/StringBuilder" since="1">
 		<extends name="java/lang/AbstractStringBuilder" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Appendable" />
 		<implements name="java/lang/CharSequence" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Ljava/lang/CharSequence;)V" />
@@ -30841,9 +30217,11 @@
 	<class name="java/lang/SuppressWarnings" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="value()[Ljava/lang/String;" />
 	</class>
 	<class name="java/lang/System" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V" />
 		<method name="clearProperty(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="console()Ljava/io/Console;" since="9" />
@@ -30912,7 +30290,6 @@
 		<method name="join(J)V" />
 		<method name="join(JI)V" />
 		<method name="resume()V" />
-		<method name="run()V" />
 		<method name="setContextClassLoader(Ljava/lang/ClassLoader;)V" />
 		<method name="setDaemon(Z)V" />
 		<method name="setDefaultUncaughtExceptionHandler(Ljava/lang/Thread$UncaughtExceptionHandler;)V" />
@@ -30942,6 +30319,7 @@
 		<field name="WAITING" />
 	</class>
 	<class name="java/lang/Thread$UncaughtExceptionHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/lang/ThreadDeath" since="1">
@@ -30975,15 +30353,14 @@
 		<method name="setMaxPriority(I)V" />
 		<method name="stop()V" />
 		<method name="suspend()V" />
-		<method name="uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/lang/ThreadLocal" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="get()LT;" />
-		<method name="initialValue()LT;" />
+		<method name="get()Ljava/lang/Object;" />
+		<method name="initialValue()Ljava/lang/Object;" />
 		<method name="remove()V" />
-		<method name="set(LT;)V" />
+		<method name="set(Ljava/lang/Object;)V" />
 	</class>
 	<class name="java/lang/Throwable" since="1">
 		<extends name="java/lang/Object" />
@@ -31042,13 +30419,12 @@
 	</class>
 	<class name="java/lang/Void" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="TYPE" />
 	</class>
 	<class name="java/lang/annotation/Annotation" since="1">
+		<extends name="java/lang/Object" />
 		<method name="annotationType()Ljava/lang/Class;" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="hashCode()I" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/lang/annotation/AnnotationFormatError" since="1">
 		<extends name="java/lang/Error" />
@@ -31092,6 +30468,7 @@
 	<class name="java/lang/annotation/Retention" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="value()Ljava/lang/annotation/RetentionPolicy;" />
 	</class>
 	<class name="java/lang/annotation/RetentionPolicy" since="1">
 		<extends name="java/lang/Enum" />
@@ -31104,16 +30481,18 @@
 	<class name="java/lang/annotation/Target" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/annotation/Annotation" />
+		<method name="value()[Ljava/lang/annotation/ElementType;" />
 	</class>
 	<class name="java/lang/ref/PhantomReference" since="1">
 		<extends name="java/lang/ref/Reference" />
-		<method name="&lt;init>(LT;Ljava/lang/ref/ReferenceQueue;)V" />
+		<method name="&lt;init>(Ljava/lang/Object;Ljava/lang/ref/ReferenceQueue;)V" />
 	</class>
 	<class name="java/lang/ref/Reference" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="clear()V" />
 		<method name="enqueue()Z" />
-		<method name="get()LT;" />
+		<method name="get()Ljava/lang/Object;" />
 		<method name="isEnqueued()Z" />
 	</class>
 	<class name="java/lang/ref/ReferenceQueue" since="1">
@@ -31125,34 +30504,32 @@
 	</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;)V" />
+		<method name="&lt;init>(Ljava/lang/Object;)V" />
+		<method name="&lt;init>(Ljava/lang/Object;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;)V" />
+		<method name="&lt;init>(Ljava/lang/Object;)V" />
+		<method name="&lt;init>(Ljava/lang/Object;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;" />
-		<method name="getAnnotations()[Ljava/lang/annotation/Annotation;" />
-		<method name="getDeclaredAnnotations()[Ljava/lang/annotation/Annotation;" />
 		<method name="isAccessible()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;" />
+		<extends name="java/lang/Object" />
+		<method name="getAnnotation(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;" />
 		<method name="getAnnotations()[Ljava/lang/annotation/Annotation;" />
 		<method name="getDeclaredAnnotations()[Ljava/lang/annotation/Annotation;" />
 		<method name="isAnnotationPresent(Ljava/lang/Class;)Z" />
 	</class>
 	<class name="java/lang/reflect/Array" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="get(Ljava/lang/Object;I)Ljava/lang/Object;" />
 		<method name="getBoolean(Ljava/lang/Object;I)Z" />
 		<method name="getByte(Ljava/lang/Object;I)B" />
@@ -31179,41 +30556,32 @@
 		<extends name="java/lang/reflect/AccessibleObject" />
 		<implements name="java/lang/reflect/GenericDeclaration" />
 		<implements name="java/lang/reflect/Member" />
-		<method name="getAnnotation(Ljava/lang/Class;)LA;" since="14" />
-		<method name="getDeclaringClass()Ljava/lang/Class;" />
+		<method name="&lt;init>()V" />
 		<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;" />
-		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable;" />
-		<method name="isSynthetic()Z" />
 		<method name="isVarArgs()Z" />
-		<method name="newInstance([Ljava/lang/Object;)LT;" />
+		<method name="newInstance([Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="toGenericString()Ljava/lang/String;" />
 	</class>
 	<class name="java/lang/reflect/Field" since="1">
 		<extends name="java/lang/reflect/AccessibleObject" />
 		<implements name="java/lang/reflect/Member" />
+		<method name="&lt;init>()V" />
 		<method name="get(Ljava/lang/Object;)Ljava/lang/Object;" />
-		<method name="getAnnotation(Ljava/lang/Class;)LA;" />
 		<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;" />
 		<method name="getDouble(Ljava/lang/Object;)D" />
 		<method name="getFloat(Ljava/lang/Object;)F" />
 		<method name="getGenericType()Ljava/lang/reflect/Type;" />
 		<method name="getInt(Ljava/lang/Object;)I" />
 		<method name="getLong(Ljava/lang/Object;)J" />
-		<method name="getModifiers()I" />
-		<method name="getName()Ljava/lang/String;" />
 		<method name="getShort(Ljava/lang/Object;)S" />
 		<method name="getType()Ljava/lang/Class;" />
 		<method name="isEnumConstant()Z" />
-		<method name="isSynthetic()Z" />
 		<method name="set(Ljava/lang/Object;Ljava/lang/Object;)V" />
 		<method name="setBoolean(Ljava/lang/Object;Z)V" />
 		<method name="setByte(Ljava/lang/Object;B)V" />
@@ -31226,10 +30594,12 @@
 		<method name="toGenericString()Ljava/lang/String;" />
 	</class>
 	<class name="java/lang/reflect/GenericArrayType" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/reflect/Type" />
 		<method name="getGenericComponentType()Ljava/lang/reflect/Type;" />
 	</class>
 	<class name="java/lang/reflect/GenericDeclaration" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getTypeParameters()[Ljava/lang/reflect/TypeVariable;" />
 	</class>
 	<class name="java/lang/reflect/GenericSignatureFormatError" since="1">
@@ -31237,6 +30607,7 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/lang/reflect/InvocationHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="invoke(Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/lang/reflect/InvocationTargetException" since="1">
@@ -31251,6 +30622,7 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/lang/reflect/Member" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getDeclaringClass()Ljava/lang/Class;" />
 		<method name="getModifiers()I" />
 		<method name="getName()Ljava/lang/String;" />
@@ -31262,22 +30634,17 @@
 		<extends name="java/lang/reflect/AccessibleObject" />
 		<implements name="java/lang/reflect/GenericDeclaration" />
 		<implements name="java/lang/reflect/Member" />
-		<method name="getAnnotation(Ljava/lang/Class;)LA;" since="14" />
-		<method name="getDeclaringClass()Ljava/lang/Class;" />
+		<method name="&lt;init>()V" />
 		<method name="getDefaultValue()Ljava/lang/Object;" />
 		<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;" />
 		<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" />
 		<method name="isVarArgs()Z" />
 		<method name="toGenericString()Ljava/lang/String;" />
 	</class>
@@ -31311,6 +30678,7 @@
 		<field name="VOLATILE" />
 	</class>
 	<class name="java/lang/reflect/ParameterizedType" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/reflect/Type" />
 		<method name="getActualTypeArguments()[Ljava/lang/reflect/Type;" />
 		<method name="getOwnerType()Ljava/lang/reflect/Type;" />
@@ -31332,11 +30700,13 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
 	<class name="java/lang/reflect/Type" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/lang/reflect/TypeVariable" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/reflect/Type" />
 		<method name="getBounds()[Ljava/lang/reflect/Type;" />
-		<method name="getGenericDeclaration()LD;" />
+		<method name="getGenericDeclaration()Ljava/lang/reflect/GenericDeclaration;" />
 		<method name="getName()Ljava/lang/String;" />
 	</class>
 	<class name="java/lang/reflect/UndeclaredThrowableException" since="1">
@@ -31346,14 +30716,15 @@
 		<method name="getUndeclaredThrowable()Ljava/lang/Throwable;" />
 	</class>
 	<class name="java/lang/reflect/WildcardType" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/reflect/Type" />
 		<method name="getLowerBounds()[Ljava/lang/reflect/Type;" />
 		<method name="getUpperBounds()[Ljava/lang/reflect/Type;" />
 	</class>
 	<class name="java/math/BigDecimal" since="1">
 		<extends name="java/lang/Number" />
-		<implements name="java/lang/Comparable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>(D)V" />
 		<method name="&lt;init>(DLjava/math/MathContext;)V" />
 		<method name="&lt;init>(I)V" />
@@ -31386,11 +30757,7 @@
 		<method name="divideAndRemainder(Ljava/math/BigDecimal;Ljava/math/MathContext;)[Ljava/math/BigDecimal;" />
 		<method name="divideToIntegralValue(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;" />
 		<method name="divideToIntegralValue(Ljava/math/BigDecimal;Ljava/math/MathContext;)Ljava/math/BigDecimal;" />
-		<method name="doubleValue()D" />
-		<method name="floatValue()F" />
-		<method name="intValue()I" />
 		<method name="intValueExact()I" />
-		<method name="longValue()J" />
 		<method name="longValueExact()J" />
 		<method name="max(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;" />
 		<method name="min(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;" />
@@ -31441,8 +30808,8 @@
 	</class>
 	<class name="java/math/BigInteger" since="1">
 		<extends name="java/lang/Number" />
-		<implements name="java/lang/Comparable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>(IILjava/util/Random;)V" />
 		<method name="&lt;init>(ILjava/util/Random;)V" />
 		<method name="&lt;init>(I[B)V" />
@@ -31459,14 +30826,10 @@
 		<method name="compareTo(Ljava/math/BigInteger;)I" />
 		<method name="divide(Ljava/math/BigInteger;)Ljava/math/BigInteger;" />
 		<method name="divideAndRemainder(Ljava/math/BigInteger;)[Ljava/math/BigInteger;" />
-		<method name="doubleValue()D" />
 		<method name="flipBit(I)Ljava/math/BigInteger;" />
-		<method name="floatValue()F" />
 		<method name="gcd(Ljava/math/BigInteger;)Ljava/math/BigInteger;" />
 		<method name="getLowestSetBit()I" />
-		<method name="intValue()I" />
 		<method name="isProbablePrime(I)Z" />
-		<method name="longValue()J" />
 		<method name="max(Ljava/math/BigInteger;)Ljava/math/BigInteger;" />
 		<method name="min(Ljava/math/BigInteger;)Ljava/math/BigInteger;" />
 		<method name="mod(Ljava/math/BigInteger;)Ljava/math/BigInteger;" />
@@ -31574,6 +30937,7 @@
 		<method name="getContent(Ljava/net/URLConnection;[Ljava/lang/Class;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/net/ContentHandlerFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="createContentHandler(Ljava/lang/String;)Ljava/net/ContentHandler;" />
 	</class>
 	<class name="java/net/CookieHandler" since="1">
@@ -31588,18 +30952,18 @@
 		<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;)Ljava/util/Map;" />
 		<method name="getCookieStore()Ljava/net/CookieStore;" />
-		<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">
+		<extends name="java/lang/Object" />
 		<method name="shouldAccept(Ljava/net/URI;Ljava/net/HttpCookie;)Z" />
 		<field name="ACCEPT_ALL" />
 		<field name="ACCEPT_NONE" />
 		<field name="ACCEPT_ORIGINAL_SERVER" />
 	</class>
 	<class name="java/net/CookieStore" since="9">
+		<extends name="java/lang/Object" />
 		<method name="add(Ljava/net/URI;Ljava/net/HttpCookie;)V" />
 		<method name="get(Ljava/net/URI;)Ljava/util/List;" />
 		<method name="getCookies()Ljava/util/List;" />
@@ -31677,7 +31041,6 @@
 		<method name="disconnect()V" />
 		<method name="getFileDescriptor()Ljava/io/FileDescriptor;" />
 		<method name="getLocalPort()I" />
-		<method name="getOption(I)Ljava/lang/Object;" />
 		<method name="getTTL()B" />
 		<method name="getTimeToLive()I" />
 		<method name="join(Ljava/net/InetAddress;)V" />
@@ -31688,23 +31051,23 @@
 		<method name="peekData(Ljava/net/DatagramPacket;)I" />
 		<method name="receive(Ljava/net/DatagramPacket;)V" />
 		<method name="send(Ljava/net/DatagramPacket;)V" />
-		<method name="setOption(ILjava/lang/Object;)V" />
 		<method name="setTTL(B)V" />
 		<method name="setTimeToLive(I)V" />
 		<field name="fd" />
 		<field name="localPort" />
 	</class>
 	<class name="java/net/DatagramSocketImplFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="createDatagramSocketImpl()Ljava/net/DatagramSocketImpl;" />
 	</class>
 	<class name="java/net/FileNameMap" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getContentTypeFor(Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="java/net/HttpCookie" since="9">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="domainMatches(Ljava/lang/String;Ljava/lang/String;)Z" />
 		<method name="getComment()Ljava/lang/String;" />
 		<method name="getCommentURL()Ljava/lang/String;" />
@@ -31799,6 +31162,7 @@
 	</class>
 	<class name="java/net/IDN" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="toASCII(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="toASCII(Ljava/lang/String;I)Ljava/lang/String;" />
 		<method name="toUnicode(Ljava/lang/String;)Ljava/lang/String;" />
@@ -31808,9 +31172,11 @@
 	</class>
 	<class name="java/net/Inet4Address" since="1">
 		<extends name="java/net/InetAddress" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/net/Inet6Address" since="1">
 		<extends name="java/net/InetAddress" />
+		<method name="&lt;init>()V" />
 		<method name="getByAddress(Ljava/lang/String;[BI)Ljava/net/Inet6Address;" />
 		<method name="getByAddress(Ljava/lang/String;[BLjava/net/NetworkInterface;)Ljava/net/Inet6Address;" />
 		<method name="getScopeId()I" />
@@ -31820,6 +31186,7 @@
 	<class name="java/net/InetAddress" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
+		<method name="&lt;init>()V" />
 		<method name="getAddress()[B" />
 		<method name="getAllByName(Ljava/lang/String;)[Ljava/net/InetAddress;" />
 		<method name="getByAddress(Ljava/lang/String;[B)Ljava/net/InetAddress;" />
@@ -31848,15 +31215,14 @@
 		<method name="&lt;init>(Ljava/lang/String;I)V" />
 		<method name="&lt;init>(Ljava/net/InetAddress;I)V" />
 		<method name="createUnresolved(Ljava/lang/String;I)Ljava/net/InetSocketAddress;" />
-		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="getAddress()Ljava/net/InetAddress;" />
 		<method name="getHostName()Ljava/lang/String;" />
 		<method name="getPort()I" />
-		<method name="hashCode()I" />
 		<method name="isUnresolved()Z" />
 	</class>
 	<class name="java/net/InterfaceAddress" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getAddress()Ljava/net/InetAddress;" />
 		<method name="getBroadcast()Ljava/net/InetAddress;" />
 		<method name="getNetworkPrefixLength()S" />
@@ -31907,6 +31273,7 @@
 	</class>
 	<class name="java/net/NetworkInterface" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getByInetAddress(Ljava/net/InetAddress;)Ljava/net/NetworkInterface;" />
 		<method name="getByName(Ljava/lang/String;)Ljava/net/NetworkInterface;" />
 		<method name="getDisplayName()Ljava/lang/String;" />
@@ -31949,8 +31316,6 @@
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/net/Proxy$Type;Ljava/net/SocketAddress;)V" />
 		<method name="address()Ljava/net/SocketAddress;" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="hashCode()I" />
 		<method name="type()Ljava/net/Proxy$Type;" />
 		<field name="NO_PROXY" />
 	</class>
@@ -32093,12 +31458,10 @@
 		<method name="getInetAddress()Ljava/net/InetAddress;" />
 		<method name="getInputStream()Ljava/io/InputStream;" />
 		<method name="getLocalPort()I" />
-		<method name="getOption(I)Ljava/lang/Object;" />
 		<method name="getOutputStream()Ljava/io/OutputStream;" />
 		<method name="getPort()I" />
 		<method name="listen(I)V" />
 		<method name="sendUrgentData(I)V" />
-		<method name="setOption(ILjava/lang/Object;)V" />
 		<method name="setPerformancePreferences(III)V" />
 		<method name="shutdownInput()V" />
 		<method name="shutdownOutput()V" />
@@ -32109,9 +31472,11 @@
 		<field name="port" />
 	</class>
 	<class name="java/net/SocketImplFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="createSocketImpl()Ljava/net/SocketImpl;" />
 	</class>
 	<class name="java/net/SocketOptions" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getOption(I)Ljava/lang/Object;" />
 		<method name="setOption(ILjava/lang/Object;)V" />
 		<field name="IP_MULTICAST_IF" />
@@ -32133,10 +31498,6 @@
 		<extends name="java/security/Permission" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="getActions()Ljava/lang/String;" />
-		<method name="hashCode()I" />
-		<method name="implies(Ljava/security/Permission;)Z" />
 	</class>
 	<class name="java/net/SocketTimeoutException" since="1">
 		<extends name="java/io/InterruptedIOException" />
@@ -32145,8 +31506,8 @@
 	</class>
 	<class name="java/net/URI" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Comparable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
@@ -32225,8 +31586,6 @@
 		<method name="&lt;init>([Ljava/net/URL;Ljava/lang/ClassLoader;Ljava/net/URLStreamHandlerFactory;)V" />
 		<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;" />
 		<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;" />
@@ -32298,6 +31657,7 @@
 	</class>
 	<class name="java/net/URLEncoder" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="encode(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
@@ -32318,6 +31678,7 @@
 		<method name="toExternalForm(Ljava/net/URL;)Ljava/lang/String;" />
 	</class>
 	<class name="java/net/URLStreamHandlerFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="createURLStreamHandler(Ljava/lang/String;)Ljava/net/URLStreamHandler;" />
 	</class>
 	<class name="java/net/UnknownHostException" since="1">
@@ -32332,6 +31693,7 @@
 	</class>
 	<class name="java/nio/Buffer" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="array()Ljava/lang/Object;" since="9" />
 		<method name="arrayOffset()I" since="9" />
 		<method name="capacity()I" />
@@ -32361,6 +31723,7 @@
 	<class name="java/nio/ByteBuffer" since="1">
 		<extends name="java/nio/Buffer" />
 		<implements name="java/lang/Comparable" />
+		<method name="&lt;init>()V" />
 		<method name="allocate(I)Ljava/nio/ByteBuffer;" />
 		<method name="allocateDirect(I)Ljava/nio/ByteBuffer;" />
 		<method name="array()[B" />
@@ -32418,6 +31781,7 @@
 	</class>
 	<class name="java/nio/ByteOrder" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="nativeOrder()Ljava/nio/ByteOrder;" />
 		<field name="BIG_ENDIAN" />
 		<field name="LITTLE_ENDIAN" />
@@ -32428,6 +31792,7 @@
 		<implements name="java/lang/CharSequence" />
 		<implements name="java/lang/Comparable" />
 		<implements name="java/lang/Readable" />
+		<method name="&lt;init>()V" />
 		<method name="allocate(I)Ljava/nio/CharBuffer;" />
 		<method name="append(C)Ljava/nio/CharBuffer;" />
 		<method name="append(Ljava/lang/CharSequence;)Ljava/nio/CharBuffer;" />
@@ -32435,7 +31800,6 @@
 		<method name="array()[C" />
 		<method name="arrayOffset()I" />
 		<method name="asReadOnlyBuffer()Ljava/nio/CharBuffer;" />
-		<method name="charAt(I)C" />
 		<method name="compact()Ljava/nio/CharBuffer;" />
 		<method name="compareTo(Ljava/nio/CharBuffer;)I" />
 		<method name="duplicate()Ljava/nio/CharBuffer;" />
@@ -32445,7 +31809,6 @@
 		<method name="get([CII)Ljava/nio/CharBuffer;" />
 		<method name="hasArray()Z" />
 		<method name="isDirect()Z" />
-		<method name="length()I" />
 		<method name="order()Ljava/nio/ByteOrder;" />
 		<method name="put(C)Ljava/nio/CharBuffer;" />
 		<method name="put(IC)Ljava/nio/CharBuffer;" />
@@ -32454,9 +31817,7 @@
 		<method name="put(Ljava/nio/CharBuffer;)Ljava/nio/CharBuffer;" />
 		<method name="put([C)Ljava/nio/CharBuffer;" />
 		<method name="put([CII)Ljava/nio/CharBuffer;" />
-		<method name="read(Ljava/nio/CharBuffer;)I" />
 		<method name="slice()Ljava/nio/CharBuffer;" />
-		<method name="subSequence(II)Ljava/lang/CharSequence;" />
 		<method name="wrap(Ljava/lang/CharSequence;)Ljava/nio/CharBuffer;" />
 		<method name="wrap(Ljava/lang/CharSequence;II)Ljava/nio/CharBuffer;" />
 		<method name="wrap([C)Ljava/nio/CharBuffer;" />
@@ -32465,6 +31826,7 @@
 	<class name="java/nio/DoubleBuffer" since="1">
 		<extends name="java/nio/Buffer" />
 		<implements name="java/lang/Comparable" />
+		<method name="&lt;init>()V" />
 		<method name="allocate(I)Ljava/nio/DoubleBuffer;" />
 		<method name="array()[D" />
 		<method name="arrayOffset()I" />
@@ -32491,6 +31853,7 @@
 	<class name="java/nio/FloatBuffer" since="1">
 		<extends name="java/nio/Buffer" />
 		<implements name="java/lang/Comparable" />
+		<method name="&lt;init>()V" />
 		<method name="allocate(I)Ljava/nio/FloatBuffer;" />
 		<method name="array()[F" />
 		<method name="arrayOffset()I" />
@@ -32517,6 +31880,7 @@
 	<class name="java/nio/IntBuffer" since="1">
 		<extends name="java/nio/Buffer" />
 		<implements name="java/lang/Comparable" />
+		<method name="&lt;init>()V" />
 		<method name="allocate(I)Ljava/nio/IntBuffer;" />
 		<method name="array()[I" />
 		<method name="arrayOffset()I" />
@@ -32547,6 +31911,7 @@
 	<class name="java/nio/LongBuffer" since="1">
 		<extends name="java/nio/Buffer" />
 		<implements name="java/lang/Comparable" />
+		<method name="&lt;init>()V" />
 		<method name="allocate(I)Ljava/nio/LongBuffer;" />
 		<method name="array()[J" />
 		<method name="arrayOffset()I" />
@@ -32572,6 +31937,7 @@
 	</class>
 	<class name="java/nio/MappedByteBuffer" since="1">
 		<extends name="java/nio/ByteBuffer" />
+		<method name="&lt;init>()V" />
 		<method name="force()Ljava/nio/MappedByteBuffer;" />
 		<method name="isLoaded()Z" />
 		<method name="load()Ljava/nio/MappedByteBuffer;" />
@@ -32583,6 +31949,7 @@
 	<class name="java/nio/ShortBuffer" since="1">
 		<extends name="java/nio/Buffer" />
 		<implements name="java/lang/Comparable" />
+		<method name="&lt;init>()V" />
 		<method name="allocate(I)Ljava/nio/ShortBuffer;" />
 		<method name="array()[S" />
 		<method name="arrayOffset()I" />
@@ -32615,6 +31982,7 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/nio/channels/ByteChannel" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/nio/channels/ReadableByteChannel" />
 		<implements name="java/nio/channels/WritableByteChannel" />
 	</class>
@@ -32623,12 +31991,13 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/nio/channels/Channel" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/io/Closeable" />
-		<method name="close()V" />
 		<method name="isOpen()Z" />
 	</class>
 	<class name="java/nio/channels/Channels" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="newChannel(Ljava/io/InputStream;)Ljava/nio/channels/ReadableByteChannel;" />
 		<method name="newChannel(Ljava/io/OutputStream;)Ljava/nio/channels/WritableByteChannel;" />
 		<method name="newInputStream(Ljava/nio/channels/ReadableByteChannel;)Ljava/io/InputStream;" />
@@ -32664,16 +32033,9 @@
 		<method name="disconnect()Ljava/nio/channels/DatagramChannel;" />
 		<method name="isConnected()Z" />
 		<method name="open()Ljava/nio/channels/DatagramChannel;" />
-		<method name="read(Ljava/nio/ByteBuffer;)I" />
-		<method name="read([Ljava/nio/ByteBuffer;)J" />
-		<method name="read([Ljava/nio/ByteBuffer;II)J" />
 		<method name="receive(Ljava/nio/ByteBuffer;)Ljava/net/SocketAddress;" />
 		<method name="send(Ljava/nio/ByteBuffer;Ljava/net/SocketAddress;)I" />
 		<method name="socket()Ljava/net/DatagramSocket;" />
-		<method name="validOps()I" />
-		<method name="write(Ljava/nio/ByteBuffer;)I" />
-		<method name="write([Ljava/nio/ByteBuffer;)J" />
-		<method name="write([Ljava/nio/ByteBuffer;II)J" />
 	</class>
 	<class name="java/nio/channels/FileChannel" since="1">
 		<extends name="java/nio/channels/spi/AbstractInterruptibleChannel" />
@@ -32687,23 +32049,18 @@
 		<method name="map(Ljava/nio/channels/FileChannel$MapMode;JJ)Ljava/nio/MappedByteBuffer;" />
 		<method name="position()J" />
 		<method name="position(J)Ljava/nio/channels/FileChannel;" />
-		<method name="read(Ljava/nio/ByteBuffer;)I" />
 		<method name="read(Ljava/nio/ByteBuffer;J)I" />
-		<method name="read([Ljava/nio/ByteBuffer;)J" />
-		<method name="read([Ljava/nio/ByteBuffer;II)J" />
 		<method name="size()J" />
 		<method name="transferFrom(Ljava/nio/channels/ReadableByteChannel;JJ)J" />
 		<method name="transferTo(JJLjava/nio/channels/WritableByteChannel;)J" />
 		<method name="truncate(J)Ljava/nio/channels/FileChannel;" />
 		<method name="tryLock()Ljava/nio/channels/FileLock;" />
 		<method name="tryLock(JJZ)Ljava/nio/channels/FileLock;" />
-		<method name="write(Ljava/nio/ByteBuffer;)I" />
 		<method name="write(Ljava/nio/ByteBuffer;J)I" />
-		<method name="write([Ljava/nio/ByteBuffer;)J" />
-		<method name="write([Ljava/nio/ByteBuffer;II)J" />
 	</class>
 	<class name="java/nio/channels/FileChannel$MapMode" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="PRIVATE" />
 		<field name="READ_ONLY" />
 		<field name="READ_WRITE" />
@@ -32718,13 +32075,13 @@
 		<method name="position()J" />
 		<method name="release()V" />
 		<method name="size()J" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/nio/channels/FileLockInterruptionException" since="1">
 		<extends name="java/io/IOException" />
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/nio/channels/GatheringByteChannel" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/nio/channels/WritableByteChannel" />
 		<method name="write([Ljava/nio/ByteBuffer;)J" />
 		<method name="write([Ljava/nio/ByteBuffer;II)J" />
@@ -32738,8 +32095,8 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/nio/channels/InterruptibleChannel" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/nio/channels/Channel" />
-		<method name="close()V" />
 	</class>
 	<class name="java/nio/channels/NoConnectionPendingException" since="1">
 		<extends name="java/lang/IllegalStateException" />
@@ -32777,20 +32134,20 @@
 		<implements name="java/nio/channels/GatheringByteChannel" />
 		<implements name="java/nio/channels/WritableByteChannel" />
 		<method name="&lt;init>(Ljava/nio/channels/spi/SelectorProvider;)V" />
-		<method name="validOps()I" />
 	</class>
 	<class name="java/nio/channels/Pipe$SourceChannel" since="1">
 		<extends name="java/nio/channels/spi/AbstractSelectableChannel" />
 		<implements name="java/nio/channels/ReadableByteChannel" />
 		<implements name="java/nio/channels/ScatteringByteChannel" />
 		<method name="&lt;init>(Ljava/nio/channels/spi/SelectorProvider;)V" />
-		<method name="validOps()I" />
 	</class>
 	<class name="java/nio/channels/ReadableByteChannel" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/nio/channels/Channel" />
 		<method name="read(Ljava/nio/ByteBuffer;)I" />
 	</class>
 	<class name="java/nio/channels/ScatteringByteChannel" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/nio/channels/ReadableByteChannel" />
 		<method name="read([Ljava/nio/ByteBuffer;)J" />
 		<method name="read([Ljava/nio/ByteBuffer;II)J" />
@@ -32850,7 +32207,6 @@
 		<method name="accept()Ljava/nio/channels/SocketChannel;" />
 		<method name="open()Ljava/nio/channels/ServerSocketChannel;" />
 		<method name="socket()Ljava/net/ServerSocket;" />
-		<method name="validOps()I" />
 	</class>
 	<class name="java/nio/channels/SocketChannel" since="1">
 		<extends name="java/nio/channels/spi/AbstractSelectableChannel" />
@@ -32864,14 +32220,7 @@
 		<method name="isConnectionPending()Z" />
 		<method name="open()Ljava/nio/channels/SocketChannel;" />
 		<method name="open(Ljava/net/SocketAddress;)Ljava/nio/channels/SocketChannel;" />
-		<method name="read(Ljava/nio/ByteBuffer;)I" />
-		<method name="read([Ljava/nio/ByteBuffer;)J" />
-		<method name="read([Ljava/nio/ByteBuffer;II)J" />
 		<method name="socket()Ljava/net/Socket;" />
-		<method name="validOps()I" />
-		<method name="write(Ljava/nio/ByteBuffer;)I" />
-		<method name="write([Ljava/nio/ByteBuffer;)J" />
-		<method name="write([Ljava/nio/ByteBuffer;II)J" />
 	</class>
 	<class name="java/nio/channels/UnresolvedAddressException" since="1">
 		<extends name="java/lang/IllegalArgumentException" />
@@ -32882,6 +32231,7 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/nio/channels/WritableByteChannel" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/nio/channels/Channel" />
 		<method name="write(Ljava/nio/ByteBuffer;)I" />
 	</class>
@@ -32891,42 +32241,27 @@
 		<implements name="java/nio/channels/InterruptibleChannel" />
 		<method name="&lt;init>()V" />
 		<method name="begin()V" />
-		<method name="close()V" />
 		<method name="end(Z)V" />
 		<method name="implCloseChannel()V" />
-		<method name="isOpen()Z" />
 	</class>
 	<class name="java/nio/channels/spi/AbstractSelectableChannel" since="1">
 		<extends name="java/nio/channels/SelectableChannel" />
 		<method name="&lt;init>(Ljava/nio/channels/spi/SelectorProvider;)V" />
-		<method name="blockingLock()Ljava/lang/Object;" />
-		<method name="configureBlocking(Z)Ljava/nio/channels/SelectableChannel;" />
-		<method name="implCloseChannel()V" />
 		<method name="implCloseSelectableChannel()V" />
 		<method name="implConfigureBlocking(Z)V" />
-		<method name="isBlocking()Z" />
-		<method name="isRegistered()Z" />
-		<method name="keyFor(Ljava/nio/channels/Selector;)Ljava/nio/channels/SelectionKey;" />
-		<method name="provider()Ljava/nio/channels/spi/SelectorProvider;" />
-		<method name="register(Ljava/nio/channels/Selector;ILjava/lang/Object;)Ljava/nio/channels/SelectionKey;" />
 	</class>
 	<class name="java/nio/channels/spi/AbstractSelectionKey" since="1">
 		<extends name="java/nio/channels/SelectionKey" />
 		<method name="&lt;init>()V" />
-		<method name="cancel()V" />
-		<method name="isValid()Z" />
 	</class>
 	<class name="java/nio/channels/spi/AbstractSelector" since="1">
 		<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;" />
-		<method name="close()V" />
 		<method name="deregister(Ljava/nio/channels/spi/AbstractSelectionKey;)V" />
 		<method name="end()V" />
 		<method name="implCloseSelector()V" />
-		<method name="isOpen()Z" />
-		<method name="provider()Ljava/nio/channels/spi/SelectorProvider;" />
 		<method name="register(Ljava/nio/channels/spi/AbstractSelectableChannel;ILjava/lang/Object;)Ljava/nio/channels/SelectionKey;" />
 	</class>
 	<class name="java/nio/channels/spi/SelectorProvider" since="1">
@@ -32959,15 +32294,12 @@
 		<method name="displayName(Ljava/util/Locale;)Ljava/lang/String;" />
 		<method name="encode(Ljava/lang/String;)Ljava/nio/ByteBuffer;" />
 		<method name="encode(Ljava/nio/CharBuffer;)Ljava/nio/ByteBuffer;" />
-		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="forName(Ljava/lang/String;)Ljava/nio/charset/Charset;" />
-		<method name="hashCode()I" />
 		<method name="isRegistered()Z" />
 		<method name="isSupported(Ljava/lang/String;)Z" />
 		<method name="name()Ljava/lang/String;" />
 		<method name="newDecoder()Ljava/nio/charset/CharsetDecoder;" />
 		<method name="newEncoder()Ljava/nio/charset/CharsetEncoder;" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/nio/charset/CharsetDecoder" since="1">
 		<extends name="java/lang/Object" />
@@ -33028,6 +32360,7 @@
 	</class>
 	<class name="java/nio/charset/CoderResult" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="isError()Z" />
 		<method name="isMalformed()Z" />
 		<method name="isOverflow()Z" />
@@ -33042,6 +32375,7 @@
 	</class>
 	<class name="java/nio/charset/CodingErrorAction" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="IGNORE" />
 		<field name="REPLACE" />
 		<field name="REPORT" />
@@ -33087,13 +32421,14 @@
 	</class>
 	<class name="java/security/AccessController" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="checkPermission(Ljava/security/Permission;)V" />
-		<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="doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;" />
+		<method name="doPrivileged(Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;" />
+		<method name="doPrivileged(Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;" />
+		<method name="doPrivileged(Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;" />
+		<method name="doPrivilegedWithCombiner(Ljava/security/PrivilegedAction;)Ljava/lang/Object;" since="9" />
+		<method name="doPrivilegedWithCombiner(Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;" since="9" />
 		<method name="getContext()Ljava/security/AccessControlContext;" />
 	</class>
 	<class name="java/security/AlgorithmParameterGenerator" since="1">
@@ -33126,19 +32461,18 @@
 		<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;" />
+		<method name="getParameterSpec(Ljava/lang/Class;)Ljava/security/spec/AlgorithmParameterSpec;" />
 		<method name="getProvider()Ljava/security/Provider;" />
 		<method name="init(Ljava/security/spec/AlgorithmParameterSpec;)V" />
 		<method name="init([B)V" />
 		<method name="init([BLjava/lang/String;)V" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/security/AlgorithmParametersSpi" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="engineGetEncoded()[B" />
 		<method name="engineGetEncoded(Ljava/lang/String;)[B" />
-		<method name="engineGetParameterSpec(Ljava/lang/Class;)LT;" />
+		<method name="engineGetParameterSpec(Ljava/lang/Class;)Ljava/security/spec/AlgorithmParameterSpec;" />
 		<method name="engineInit(Ljava/security/spec/AlgorithmParameterSpec;)V" />
 		<method name="engineInit([B)V" />
 		<method name="engineInit([BLjava/lang/String;)V" />
@@ -33148,10 +32482,6 @@
 		<extends name="java/security/Permission" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="getActions()Ljava/lang/String;" />
-		<method name="hashCode()I" />
-		<method name="implies(Ljava/security/Permission;)Z" />
 	</class>
 	<class name="java/security/AuthProvider" since="1">
 		<extends name="java/security/Provider" />
@@ -33165,12 +32495,9 @@
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="getActions()Ljava/lang/String;" />
-		<method name="hashCode()I" />
-		<method name="implies(Ljava/security/Permission;)Z" />
 	</class>
 	<class name="java/security/Certificate" since="1">
+		<extends name="java/lang/Object" />
 		<method name="decode(Ljava/io/InputStream;)V" />
 		<method name="encode(Ljava/io/OutputStream;)V" />
 		<method name="getFormat()Ljava/lang/String;" />
@@ -33220,6 +32547,7 @@
 		<field name="digest" />
 	</class>
 	<class name="java/security/DomainCombiner" since="1">
+		<extends name="java/lang/Object" />
 		<method name="combine([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[Ljava/security/ProtectionDomain;" />
 	</class>
 	<class name="java/security/GeneralSecurityException" since="1">
@@ -33230,6 +32558,7 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/security/Guard" since="1">
+		<extends name="java/lang/Object" />
 		<method name="checkGuard(Ljava/lang/Object;)V" />
 	</class>
 	<class name="java/security/GuardedObject" since="1">
@@ -33240,16 +32569,14 @@
 	</class>
 	<class name="java/security/Identity" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/security/Principal" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/security/Principal" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/security/IdentityScope;)V" />
 		<method name="addCertificate(Ljava/security/Certificate;)V" />
 		<method name="certificates()[Ljava/security/Certificate;" />
-		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="getInfo()Ljava/lang/String;" />
-		<method name="getName()Ljava/lang/String;" />
 		<method name="getPublicKey()Ljava/security/PublicKey;" />
 		<method name="getScope()Ljava/security/IdentityScope;" />
 		<method name="identityEquals(Ljava/security/Identity;)Z" />
@@ -33293,6 +32620,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/security/Key" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
 		<method name="getAlgorithm()Ljava/lang/String;" />
 		<method name="getEncoded()[B" />
@@ -33315,7 +32643,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;" />
+		<method name="getKeySpec(Ljava/security/Key;Ljava/lang/Class;)Ljava/security/spec/KeySpec;" />
 		<method name="getProvider()Ljava/security/Provider;" />
 		<method name="translateKey(Ljava/security/Key;)Ljava/security/Key;" />
 	</class>
@@ -33324,7 +32652,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;" />
+		<method name="engineGetKeySpec(Ljava/security/Key;Ljava/lang/Class;)Ljava/security/spec/KeySpec;" />
 		<method name="engineTranslateKey(Ljava/security/Key;)Ljava/security/Key;" />
 	</class>
 	<class name="java/security/KeyManagementException" since="1">
@@ -33345,14 +32673,12 @@
 		<extends name="java/security/KeyPairGeneratorSpi" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="genKeyPair()Ljava/security/KeyPair;" />
-		<method name="generateKeyPair()Ljava/security/KeyPair;" />
 		<method name="getAlgorithm()Ljava/lang/String;" />
 		<method name="getInstance(Ljava/lang/String;)Ljava/security/KeyPairGenerator;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/lang/String;)Ljava/security/KeyPairGenerator;" />
 		<method name="getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljava/security/KeyPairGenerator;" />
 		<method name="getProvider()Ljava/security/Provider;" />
 		<method name="initialize(I)V" />
-		<method name="initialize(ILjava/security/SecureRandom;)V" />
 		<method name="initialize(Ljava/security/spec/AlgorithmParameterSpec;)V" />
 	</class>
 	<class name="java/security/KeyPairGeneratorSpi" since="1">
@@ -33423,18 +32749,18 @@
 		<method name="getCallbackHandler()Ljavax/security/auth/callback/CallbackHandler;" />
 	</class>
 	<class name="java/security/KeyStore$Entry" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/security/KeyStore$LoadStoreParameter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getProtectionParameter()Ljava/security/KeyStore$ProtectionParameter;" />
 	</class>
 	<class name="java/security/KeyStore$PasswordProtection" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="javax/security/auth/Destroyable" />
 		<implements name="java/security/KeyStore$ProtectionParameter" />
+		<implements name="javax/security/auth/Destroyable" />
 		<method name="&lt;init>([C)V" />
-		<method name="destroy()V" />
 		<method name="getPassword()[C" />
-		<method name="isDestroyed()Z" />
 	</class>
 	<class name="java/security/KeyStore$PrivateKeyEntry" since="1">
 		<extends name="java/lang/Object" />
@@ -33445,6 +32771,7 @@
 		<method name="getPrivateKey()Ljava/security/PrivateKey;" />
 	</class>
 	<class name="java/security/KeyStore$ProtectionParameter" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/security/KeyStore$SecretKeyEntry" since="1">
 		<extends name="java/lang/Object" />
@@ -33512,7 +32839,6 @@
 	<class name="java/security/MessageDigestSpi" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="engineDigest()[B" />
 		<method name="engineDigest([BII)I" />
 		<method name="engineGetDigestLength()I" />
@@ -33535,14 +32861,11 @@
 	</class>
 	<class name="java/security/Permission" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/security/Guard" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/security/Guard" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="checkGuard(Ljava/lang/Object;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="getActions()Ljava/lang/String;" />
 		<method name="getName()Ljava/lang/String;" />
-		<method name="hashCode()I" />
 		<method name="implies(Ljava/security/Permission;)Z" />
 		<method name="newPermissionCollection()Ljava/security/PermissionCollection;" />
 	</class>
@@ -33560,9 +32883,6 @@
 		<extends name="java/security/PermissionCollection" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
-		<method name="add(Ljava/security/Permission;)V" />
-		<method name="elements()Ljava/util/Enumeration;" />
-		<method name="implies(Ljava/security/Permission;)Z" />
 	</class>
 	<class name="java/security/Policy" since="1">
 		<extends name="java/lang/Object" />
@@ -33582,6 +32902,7 @@
 		<field name="UNSUPPORTED_EMPTY_COLLECTION" since="9" />
 	</class>
 	<class name="java/security/Policy$Parameters" since="9">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/security/PolicySpi" since="9">
 		<extends name="java/lang/Object" />
@@ -33592,17 +32913,17 @@
 		<method name="engineRefresh()V" />
 	</class>
 	<class name="java/security/Principal" since="1">
-		<method name="equals(Ljava/lang/Object;)Z" />
+		<extends name="java/lang/Object" />
 		<method name="getName()Ljava/lang/String;" />
-		<method name="hashCode()I" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/security/PrivateKey" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/security/Key" />
 		<field name="serialVersionUID" />
 	</class>
 	<class name="java/security/PrivilegedAction" since="1">
-		<method name="run()LT;" />
+		<extends name="java/lang/Object" />
+		<method name="run()Ljava/lang/Object;" />
 	</class>
 	<class name="java/security/PrivilegedActionException" since="1">
 		<extends name="java/lang/Exception" />
@@ -33610,7 +32931,8 @@
 		<method name="getException()Ljava/lang/Exception;" />
 	</class>
 	<class name="java/security/PrivilegedExceptionAction" since="1">
-		<method name="run()LT;" />
+		<extends name="java/lang/Object" />
+		<method name="run()Ljava/lang/Object;" />
 	</class>
 	<class name="java/security/ProtectionDomain" since="1">
 		<extends name="java/lang/Object" />
@@ -33630,8 +32952,6 @@
 		<method name="getService(Ljava/lang/String;Ljava/lang/String;)Ljava/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;)V" />
 		<method name="putService(Ljava/security/Provider$Service;)V" />
 		<method name="removeService(Ljava/security/Provider$Service;)V" />
 	</class>
@@ -33654,6 +32974,7 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/security/PublicKey" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/security/Key" />
 		<field name="serialVersionUID" />
 	</class>
@@ -33677,7 +32998,6 @@
 		<method name="getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljava/security/SecureRandom;" />
 		<method name="getProvider()Ljava/security/Provider;" />
 		<method name="getSeed(I)[B" />
-		<method name="next(I)I" />
 		<method name="setSeed([B)V" />
 	</class>
 	<class name="java/security/SecureRandomSpi" since="1">
@@ -33690,6 +33010,7 @@
 	</class>
 	<class name="java/security/Security" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<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;" />
@@ -33746,7 +33067,6 @@
 	<class name="java/security/SignatureSpi" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="engineGetParameter(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="engineGetParameters()Ljava/security/AlgorithmParameters;" />
 		<method name="engineInitSign(Ljava/security/PrivateKey;)V" />
@@ -33802,16 +33122,13 @@
 		<extends name="java/security/Permission" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/security/cert/Certificate;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="getActions()Ljava/lang/String;" />
 		<method name="getUnresolvedActions()Ljava/lang/String;" />
 		<method name="getUnresolvedCerts()[Ljava/security/cert/Certificate;" />
 		<method name="getUnresolvedName()Ljava/lang/String;" />
 		<method name="getUnresolvedType()Ljava/lang/String;" />
-		<method name="hashCode()I" />
-		<method name="implies(Ljava/security/Permission;)Z" />
 	</class>
 	<class name="java/security/acl/Acl" since="1">
+		<extends name="java/lang/Object" />
 		<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" />
@@ -33820,26 +33137,25 @@
 		<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;" />
 	</class>
 	<class name="java/security/acl/AclEntry" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
 		<method name="addPermission(Ljava/security/acl/Permission;)Z" />
 		<method name="checkPermission(Ljava/security/acl/Permission;)Z" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getPrincipal()Ljava/security/Principal;" />
 		<method name="isNegative()Z" />
 		<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" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/security/acl/AclNotFoundException" since="1">
 		<extends name="java/lang/Exception" />
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/security/acl/Group" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/security/Principal" />
 		<method name="addMember(Ljava/security/Principal;)Z" />
 		<method name="isMember(Ljava/security/Principal;)Z" />
@@ -33855,20 +33171,19 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/security/acl/Owner" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addOwner(Ljava/security/Principal;Ljava/security/Principal;)Z" />
 		<method name="deleteOwner(Ljava/security/Principal;Ljava/security/Principal;)Z" />
 		<method name="isOwner(Ljava/security/Principal;)Z" />
 	</class>
 	<class name="java/security/acl/Permission" since="1">
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="toString()Ljava/lang/String;" />
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/security/cert/CRL" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="getType()Ljava/lang/String;" />
 		<method name="isRevoked(Ljava/security/cert/Certificate;)Z" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/security/cert/CRLException" since="1">
 		<extends name="java/security/GeneralSecurityException" />
@@ -33878,8 +33193,8 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/security/cert/CRLSelector" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="match(Ljava/security/cert/CRL;)Z" />
 	</class>
 	<class name="java/security/cert/CertPath" since="1">
@@ -33918,8 +33233,8 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/security/cert/CertPathBuilderResult" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getCertPath()Ljava/security/cert/CertPath;" />
 	</class>
 	<class name="java/security/cert/CertPathBuilderSpi" since="1">
@@ -33928,8 +33243,8 @@
 		<method name="engineBuild(Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathBuilderResult;" />
 	</class>
 	<class name="java/security/cert/CertPathParameters" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
-		<method name="clone()Ljava/lang/Object;" />
 	</class>
 	<class name="java/security/cert/CertPathValidator" since="1">
 		<extends name="java/lang/Object" />
@@ -33953,8 +33268,8 @@
 		<method name="getIndex()I" />
 	</class>
 	<class name="java/security/cert/CertPathValidatorResult" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
-		<method name="clone()Ljava/lang/Object;" />
 	</class>
 	<class name="java/security/cert/CertPathValidatorSpi" since="1">
 		<extends name="java/lang/Object" />
@@ -33962,8 +33277,8 @@
 		<method name="engineValidate(Ljava/security/cert/CertPath;Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathValidatorResult;" />
 	</class>
 	<class name="java/security/cert/CertSelector" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="match(Ljava/security/cert/Certificate;)Z" />
 	</class>
 	<class name="java/security/cert/CertStore" since="1">
@@ -33987,8 +33302,8 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/security/cert/CertStoreParameters" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
-		<method name="clone()Ljava/lang/Object;" />
 	</class>
 	<class name="java/security/cert/CertStoreSpi" since="1">
 		<extends name="java/lang/Object" />
@@ -34003,7 +33318,6 @@
 		<method name="getEncoded()[B" />
 		<method name="getPublicKey()Ljava/security/PublicKey;" />
 		<method name="getType()Ljava/lang/String;" />
-		<method name="toString()Ljava/lang/String;" />
 		<method name="verify(Ljava/security/PublicKey;)V" />
 		<method name="verify(Ljava/security/PublicKey;Ljava/lang/String;)V" />
 		<method name="writeReplace()Ljava/lang/Object;" />
@@ -34079,7 +33393,6 @@
 		<implements name="java/security/cert/CertStoreParameters" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/util/Collection;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getCollection()Ljava/util/Collection;" />
 	</class>
 	<class name="java/security/cert/LDAPCertStoreParameters" since="1">
@@ -34088,7 +33401,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;I)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getPort()I" />
 		<method name="getServerName()Ljava/lang/String;" />
 	</class>
@@ -34103,14 +33415,12 @@
 		<extends name="java/security/cert/PKIXCertPathValidatorResult" />
 		<implements name="java/security/cert/CertPathBuilderResult" />
 		<method name="&lt;init>(Ljava/security/cert/CertPath;Ljava/security/cert/TrustAnchor;Ljava/security/cert/PolicyNode;Ljava/security/PublicKey;)V" />
-		<method name="getCertPath()Ljava/security/cert/CertPath;" />
 	</class>
 	<class name="java/security/cert/PKIXCertPathChecker" since="1">
 		<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;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getSupportedExtensions()Ljava/util/Set;" />
 		<method name="init(Z)V" />
 		<method name="isForwardCheckingSupported()Z" />
@@ -34119,7 +33429,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/security/cert/CertPathValidatorResult" />
 		<method name="&lt;init>(Ljava/security/cert/TrustAnchor;Ljava/security/cert/PolicyNode;Ljava/security/PublicKey;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getPolicyTree()Ljava/security/cert/PolicyNode;" />
 		<method name="getPublicKey()Ljava/security/PublicKey;" />
 		<method name="getTrustAnchor()Ljava/security/cert/TrustAnchor;" />
@@ -34131,7 +33440,6 @@
 		<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;" />
 		<method name="getCertStores()Ljava/util/List;" />
 		<method name="getDate()Ljava/util/Date;" />
@@ -34158,6 +33466,7 @@
 		<method name="setTrustAnchors(Ljava/util/Set;)V" />
 	</class>
 	<class name="java/security/cert/PolicyNode" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getChildren()Ljava/util/Iterator;" />
 		<method name="getDepth()I" />
 		<method name="getExpectedPolicies()Ljava/util/Set;" />
@@ -34214,7 +33523,6 @@
 		<method name="getRevocationDate()Ljava/util/Date;" />
 		<method name="getSerialNumber()Ljava/math/BigInteger;" />
 		<method name="hasExtensions()Z" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/security/cert/X509CRLSelector" since="1">
 		<extends name="java/lang/Object" />
@@ -34223,14 +33531,12 @@
 		<method name="addIssuer(Ljavax/security/auth/x500/X500Principal;)V" />
 		<method name="addIssuerName(Ljava/lang/String;)V" />
 		<method name="addIssuerName([B)V" />
-		<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;" />
 		<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;)V" />
@@ -34246,7 +33552,6 @@
 		<method name="addPathToName(I[B)V" />
 		<method name="addSubjectAlternativeName(ILjava/lang/String;)V" />
 		<method name="addSubjectAlternativeName(I[B)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getAuthorityKeyIdentifier()[B" />
 		<method name="getBasicConstraints()I" />
 		<method name="getCertificate()Ljava/security/cert/X509Certificate;" />
@@ -34269,7 +33574,6 @@
 		<method name="getSubjectKeyIdentifier()[B" />
 		<method name="getSubjectPublicKey()Ljava/security/PublicKey;" />
 		<method name="getSubjectPublicKeyAlgID()Ljava/lang/String;" />
-		<method name="match(Ljava/security/cert/Certificate;)Z" />
 		<method name="setAuthorityKeyIdentifier([B)V" />
 		<method name="setBasicConstraints(I)V" />
 		<method name="setCertificate(Ljava/security/cert/X509Certificate;)V" />
@@ -34322,54 +33626,65 @@
 		<method name="getVersion()I" />
 	</class>
 	<class name="java/security/cert/X509Extension" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getCriticalExtensionOIDs()Ljava/util/Set;" />
 		<method name="getExtensionValue(Ljava/lang/String;)[B" />
 		<method name="getNonCriticalExtensionOIDs()Ljava/util/Set;" />
 		<method name="hasUnsupportedCriticalExtension()Z" />
 	</class>
 	<class name="java/security/interfaces/DSAKey" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getParams()Ljava/security/interfaces/DSAParams;" />
 	</class>
 	<class name="java/security/interfaces/DSAKeyPairGenerator" since="1">
+		<extends name="java/lang/Object" />
 		<method name="initialize(IZLjava/security/SecureRandom;)V" />
 		<method name="initialize(Ljava/security/interfaces/DSAParams;Ljava/security/SecureRandom;)V" />
 	</class>
 	<class name="java/security/interfaces/DSAParams" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getG()Ljava/math/BigInteger;" />
 		<method name="getP()Ljava/math/BigInteger;" />
 		<method name="getQ()Ljava/math/BigInteger;" />
 	</class>
 	<class name="java/security/interfaces/DSAPrivateKey" since="1">
-		<implements name="java/security/interfaces/DSAKey" />
+		<extends name="java/lang/Object" />
 		<implements name="java/security/PrivateKey" />
+		<implements name="java/security/interfaces/DSAKey" />
 		<method name="getX()Ljava/math/BigInteger;" />
 		<field name="serialVersionUID" />
 	</class>
 	<class name="java/security/interfaces/DSAPublicKey" since="1">
-		<implements name="java/security/interfaces/DSAKey" />
+		<extends name="java/lang/Object" />
 		<implements name="java/security/PublicKey" />
+		<implements name="java/security/interfaces/DSAKey" />
 		<method name="getY()Ljava/math/BigInteger;" />
 		<field name="serialVersionUID" />
 	</class>
 	<class name="java/security/interfaces/ECKey" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getParams()Ljava/security/spec/ECParameterSpec;" />
 	</class>
 	<class name="java/security/interfaces/ECPrivateKey" since="1">
-		<implements name="java/security/interfaces/ECKey" />
+		<extends name="java/lang/Object" />
 		<implements name="java/security/PrivateKey" />
+		<implements name="java/security/interfaces/ECKey" />
 		<method name="getS()Ljava/math/BigInteger;" />
 		<field name="serialVersionUID" />
 	</class>
 	<class name="java/security/interfaces/ECPublicKey" since="1">
-		<implements name="java/security/interfaces/ECKey" />
+		<extends name="java/lang/Object" />
 		<implements name="java/security/PublicKey" />
+		<implements name="java/security/interfaces/ECKey" />
 		<method name="getW()Ljava/security/spec/ECPoint;" />
 		<field name="serialVersionUID" />
 	</class>
 	<class name="java/security/interfaces/RSAKey" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getModulus()Ljava/math/BigInteger;" />
 	</class>
 	<class name="java/security/interfaces/RSAMultiPrimePrivateCrtKey" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/security/interfaces/RSAPrivateKey" />
 		<method name="getCrtCoefficient()Ljava/math/BigInteger;" />
 		<method name="getOtherPrimeInfo()[Ljava/security/spec/RSAOtherPrimeInfo;" />
@@ -34381,6 +33696,7 @@
 		<field name="serialVersionUID" />
 	</class>
 	<class name="java/security/interfaces/RSAPrivateCrtKey" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/security/interfaces/RSAPrivateKey" />
 		<method name="getCrtCoefficient()Ljava/math/BigInteger;" />
 		<method name="getPrimeExponentP()Ljava/math/BigInteger;" />
@@ -34391,27 +33707,27 @@
 		<field name="serialVersionUID" />
 	</class>
 	<class name="java/security/interfaces/RSAPrivateKey" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/security/PrivateKey" />
 		<implements name="java/security/interfaces/RSAKey" />
 		<method name="getPrivateExponent()Ljava/math/BigInteger;" />
 		<field name="serialVersionUID" />
 	</class>
 	<class name="java/security/interfaces/RSAPublicKey" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/security/PublicKey" />
 		<implements name="java/security/interfaces/RSAKey" />
 		<method name="getPublicExponent()Ljava/math/BigInteger;" />
 		<field name="serialVersionUID" />
 	</class>
 	<class name="java/security/spec/AlgorithmParameterSpec" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/security/spec/DSAParameterSpec" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/security/spec/AlgorithmParameterSpec" />
 		<implements name="java/security/interfaces/DSAParams" />
+		<implements name="java/security/spec/AlgorithmParameterSpec" />
 		<method name="&lt;init>(Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;)V" />
-		<method name="getG()Ljava/math/BigInteger;" />
-		<method name="getP()Ljava/math/BigInteger;" />
-		<method name="getQ()Ljava/math/BigInteger;" />
 	</class>
 	<class name="java/security/spec/DSAPrivateKeySpec" since="1">
 		<extends name="java/lang/Object" />
@@ -34432,6 +33748,7 @@
 		<method name="getY()Ljava/math/BigInteger;" />
 	</class>
 	<class name="java/security/spec/ECField" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getFieldSize()I" />
 	</class>
 	<class name="java/security/spec/ECFieldF2m" since="1">
@@ -34440,7 +33757,6 @@
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(ILjava/math/BigInteger;)V" />
 		<method name="&lt;init>(I[I)V" />
-		<method name="getFieldSize()I" />
 		<method name="getM()I" />
 		<method name="getMidTermsOfReductionPolynomial()[I" />
 		<method name="getReductionPolynomial()Ljava/math/BigInteger;" />
@@ -34449,7 +33765,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/security/spec/ECField" />
 		<method name="&lt;init>(Ljava/math/BigInteger;)V" />
-		<method name="getFieldSize()I" />
 		<method name="getP()Ljava/math/BigInteger;" />
 	</class>
 	<class name="java/security/spec/ECGenParameterSpec" since="1">
@@ -34517,6 +33832,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/security/spec/KeySpec" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/security/spec/MGF1ParameterSpec" since="1">
 		<extends name="java/lang/Object" />
@@ -34531,7 +33847,6 @@
 	<class name="java/security/spec/PKCS8EncodedKeySpec" since="1">
 		<extends name="java/security/spec/EncodedKeySpec" />
 		<method name="&lt;init>([B)V" />
-		<method name="getFormat()Ljava/lang/String;" />
 	</class>
 	<class name="java/security/spec/PSSParameterSpec" since="1">
 		<extends name="java/lang/Object" />
@@ -34599,9 +33914,9 @@
 	<class name="java/security/spec/X509EncodedKeySpec" since="1">
 		<extends name="java/security/spec/EncodedKeySpec" />
 		<method name="&lt;init>([B)V" />
-		<method name="getFormat()Ljava/lang/String;" />
 	</class>
 	<class name="java/sql/Array" since="1">
+		<extends name="java/lang/Object" />
 		<method name="free()V" since="9" />
 		<method name="getArray()Ljava/lang/Object;" />
 		<method name="getArray(JI)Ljava/lang/Object;" />
@@ -34630,6 +33945,7 @@
 		<method name="getUpdateCounts()[I" />
 	</class>
 	<class name="java/sql/Blob" since="1">
+		<extends name="java/lang/Object" />
 		<method name="free()V" since="9" />
 		<method name="getBinaryStream()Ljava/io/InputStream;" />
 		<method name="getBinaryStream(JJ)Ljava/io/InputStream;" since="9" />
@@ -34643,6 +33959,7 @@
 		<method name="truncate(J)V" />
 	</class>
 	<class name="java/sql/CallableStatement" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/PreparedStatement" />
 		<method name="getArray(I)Ljava/sql/Array;" />
 		<method name="getArray(Ljava/lang/String;)Ljava/sql/Array;" />
@@ -34766,6 +34083,7 @@
 		<field name="REASON_VALUE_TRUNCATED" />
 	</class>
 	<class name="java/sql/Clob" since="1">
+		<extends name="java/lang/Object" />
 		<method name="free()V" since="9" />
 		<method name="getAsciiStream()Ljava/io/InputStream;" />
 		<method name="getCharacterStream()Ljava/io/Reader;" />
@@ -34781,6 +34099,7 @@
 		<method name="truncate(J)V" />
 	</class>
 	<class name="java/sql/Connection" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/Wrapper" since="9" />
 		<method name="clearWarnings()V" />
 		<method name="close()V" />
@@ -34847,6 +34166,7 @@
 		<method name="getTransferSize()I" />
 	</class>
 	<class name="java/sql/DatabaseMetaData" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/Wrapper" since="9" />
 		<method name="allProceduresAreCallable()Z" />
 		<method name="allTablesAreSelectable()Z" />
@@ -35089,6 +34409,7 @@
 		<method name="valueOf(Ljava/lang/String;)Ljava/sql/Date;" />
 	</class>
 	<class name="java/sql/Driver" since="1">
+		<extends name="java/lang/Object" />
 		<method name="acceptsURL(Ljava/lang/String;)Z" />
 		<method name="connect(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;" />
 		<method name="getMajorVersion()I" />
@@ -35098,6 +34419,7 @@
 	</class>
 	<class name="java/sql/DriverManager" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="deregisterDriver(Ljava/sql/Driver;)V" />
 		<method name="getConnection(Ljava/lang/String;)Ljava/sql/Connection;" />
 		<method name="getConnection(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/Connection;" />
@@ -35123,9 +34445,11 @@
 		<field name="value" />
 	</class>
 	<class name="java/sql/NClob" since="9">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/Clob" />
 	</class>
 	<class name="java/sql/ParameterMetaData" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/Wrapper" since="9" />
 		<method name="getParameterClassName(I)Ljava/lang/String;" />
 		<method name="getParameterCount()I" />
@@ -35145,6 +34469,7 @@
 		<field name="parameterNullableUnknown" />
 	</class>
 	<class name="java/sql/PreparedStatement" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/Statement" />
 		<method name="addBatch()V" />
 		<method name="clearParameters()V" />
@@ -35203,12 +34528,14 @@
 		<method name="setUnicodeStream(ILjava/io/InputStream;I)V" />
 	</class>
 	<class name="java/sql/Ref" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getBaseTypeName()Ljava/lang/String;" />
 		<method name="getObject()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">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/Wrapper" since="9" />
 		<method name="absolute(I)Z" />
 		<method name="afterLast()V" />
@@ -35409,6 +34736,7 @@
 		<field name="TYPE_SCROLL_SENSITIVE" />
 	</class>
 	<class name="java/sql/ResultSetMetaData" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/Wrapper" since="9" />
 		<method name="getCatalogName(I)Ljava/lang/String;" />
 		<method name="getColumnClassName(I)Ljava/lang/String;" />
@@ -35436,10 +34764,8 @@
 		<field name="columnNullableUnknown" />
 	</class>
 	<class name="java/sql/RowId" since="9">
-		<method name="equals(Ljava/lang/Object;)Z" />
+		<extends name="java/lang/Object" />
 		<method name="getBytes()[B" />
-		<method name="hashCode()I" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="java/sql/RowIdLifetime" since="9">
 		<extends name="java/lang/Enum" />
@@ -35465,6 +34791,7 @@
 		<method name="getFailedProperties()Ljava/util/Map;" />
 	</class>
 	<class name="java/sql/SQLData" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getSQLTypeName()Ljava/lang/String;" />
 		<method name="readSQL(Ljava/sql/SQLInput;Ljava/lang/String;)V" />
 		<method name="writeSQL(Ljava/sql/SQLOutput;)V" />
@@ -35495,7 +34822,6 @@
 		<method name="getErrorCode()I" />
 		<method name="getNextException()Ljava/sql/SQLException;" />
 		<method name="getSQLState()Ljava/lang/String;" />
-		<method name="iterator()Ljava/util/Iterator;" since="9" />
 		<method name="setNextException(Ljava/sql/SQLException;)V" />
 	</class>
 	<class name="java/sql/SQLFeatureNotSupportedException" since="9">
@@ -35510,6 +34836,7 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/sql/SQLInput" since="1">
+		<extends name="java/lang/Object" />
 		<method name="readArray()Ljava/sql/Array;" />
 		<method name="readAsciiStream()Ljava/io/InputStream;" />
 		<method name="readBigDecimal()Ljava/math/BigDecimal;" />
@@ -35583,6 +34910,7 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/sql/SQLOutput" since="1">
+		<extends name="java/lang/Object" />
 		<method name="writeArray(Ljava/sql/Array;)V" />
 		<method name="writeAsciiStream(Ljava/io/InputStream;)V" />
 		<method name="writeBigDecimal(Ljava/math/BigDecimal;)V" />
@@ -35613,8 +34941,8 @@
 	</class>
 	<class name="java/sql/SQLPermission" since="1">
 		<extends name="java/security/BasicPermission" />
-		<implements name="java/security/Guard" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/security/Guard" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
@@ -35699,21 +35027,24 @@
 		<method name="setNextWarning(Ljava/sql/SQLWarning;)V" />
 	</class>
 	<class name="java/sql/SQLXML" since="9">
+		<extends name="java/lang/Object" />
 		<method name="free()V" />
 		<method name="getBinaryStream()Ljava/io/InputStream;" />
 		<method name="getCharacterStream()Ljava/io/Reader;" />
-		<method name="getSource(Ljava/lang/Class;)LT;" />
+		<method name="getSource(Ljava/lang/Class;)Ljavax/xml/transform/Source;" />
 		<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;" />
+		<method name="setResult(Ljava/lang/Class;)Ljavax/xml/transform/Result;" />
 		<method name="setString(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/sql/Savepoint" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getSavepointId()I" />
 		<method name="getSavepointName()Ljava/lang/String;" />
 	</class>
 	<class name="java/sql/Statement" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/Wrapper" since="9" />
 		<method name="addBatch(Ljava/lang/String;)V" />
 		<method name="cancel()V" />
@@ -35764,6 +35095,7 @@
 		<field name="SUCCESS_NO_INFO" />
 	</class>
 	<class name="java/sql/Struct" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getAttributes()[Ljava/lang/Object;" />
 		<method name="getAttributes(Ljava/util/Map;)[Ljava/lang/Object;" />
 		<method name="getSQLTypeName()Ljava/lang/String;" />
@@ -35788,6 +35120,7 @@
 	</class>
 	<class name="java/sql/Types" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="ARRAY" />
 		<field name="BIGINT" />
 		<field name="BINARY" />
@@ -35826,8 +35159,9 @@
 		<field name="VARCHAR" />
 	</class>
 	<class name="java/sql/Wrapper" since="9">
+		<extends name="java/lang/Object" />
 		<method name="isWrapperFor(Ljava/lang/Class;)Z" />
-		<method name="unwrap(Ljava/lang/Class;)LT;" />
+		<method name="unwrap(Ljava/lang/Class;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/text/Annotation" since="1">
 		<extends name="java/lang/Object" />
@@ -35835,6 +35169,7 @@
 		<method name="getValue()Ljava/lang/Object;" />
 	</class>
 	<class name="java/text/AttributedCharacterIterator" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/text/CharacterIterator" />
 		<method name="getAllAttributeKeys()Ljava/util/Set;" />
 		<method name="getAttribute(Ljava/text/AttributedCharacterIterator$Attribute;)Ljava/lang/Object;" />
@@ -35850,9 +35185,7 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="getName()Ljava/lang/String;" />
-		<method name="hashCode()I" />
 		<method name="readResolve()Ljava/lang/Object;" />
 		<field name="INPUT_METHOD_SEGMENT" />
 		<field name="LANGUAGE" />
@@ -35900,7 +35233,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="current()I" />
 		<method name="first()I" />
 		<method name="following(I)I" />
@@ -35928,8 +35260,8 @@
 		<field name="DONE" />
 	</class>
 	<class name="java/text/CharacterIterator" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="current()C" />
 		<method name="first()C" />
 		<method name="getBeginIndex()I" />
@@ -35946,19 +35278,17 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>([D[Ljava/lang/String;)V" />
 		<method name="applyPattern(Ljava/lang/String;)V" />
-		<method name="format(DLjava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
-		<method name="format(JLjava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="getFormats()[Ljava/lang/Object;" />
 		<method name="getLimits()[D" />
 		<method name="nextDouble(D)D" />
 		<method name="nextDouble(DZ)D" />
-		<method name="parse(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/lang/Number;" />
 		<method name="previousDouble(D)D" />
 		<method name="setChoices([D[Ljava/lang/String;)V" />
 		<method name="toPattern()Ljava/lang/String;" />
 	</class>
 	<class name="java/text/CollationElementIterator" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getMaxExpansion(I)I" />
 		<method name="getOffset()I" />
 		<method name="next()I" />
@@ -35975,6 +35305,7 @@
 	<class name="java/text/CollationKey" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Comparable" />
+		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" since="9" />
 		<method name="compareTo(Ljava/text/CollationKey;)I" />
 		<method name="getSourceString()Ljava/lang/String;" />
@@ -35985,8 +35316,6 @@
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/Comparator" />
 		<method name="&lt;init>()V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="compare(Ljava/lang/Object;Ljava/lang/Object;)I" />
 		<method name="compare(Ljava/lang/String;Ljava/lang/String;)I" />
 		<method name="equals(Ljava/lang/String;Ljava/lang/String;)Z" />
 		<method name="getAvailableLocales()[Ljava/util/Locale;" />
@@ -35995,7 +35324,6 @@
 		<method name="getInstance()Ljava/text/Collator;" />
 		<method name="getInstance(Ljava/util/Locale;)Ljava/text/Collator;" />
 		<method name="getStrength()I" />
-		<method name="hashCode()I" />
 		<method name="setDecomposition(I)V" />
 		<method name="setStrength(I)V" />
 		<field name="CANONICAL_DECOMPOSITION" />
@@ -36009,7 +35337,6 @@
 	<class name="java/text/DateFormat" since="1">
 		<extends name="java/text/Format" />
 		<method name="&lt;init>()V" />
-		<method name="format(Ljava/lang/Object;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="format(Ljava/util/Date;)Ljava/lang/String;" />
 		<method name="format(Ljava/util/Date;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="getAvailableLocales()[Ljava/util/Locale;" />
@@ -36029,7 +35356,6 @@
 		<method name="isLenient()Z" />
 		<method name="parse(Ljava/lang/String;)Ljava/util/Date;" />
 		<method name="parse(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;" />
-		<method name="parseObject(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/lang/Object;" />
 		<method name="setCalendar(Ljava/util/Calendar;)V" />
 		<method name="setLenient(Z)V" />
 		<method name="setNumberFormat(Ljava/text/NumberFormat;)V" />
@@ -36086,11 +35412,10 @@
 	</class>
 	<class name="java/text/DateFormatSymbols" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/util/Locale;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getAmPmStrings()[Ljava/lang/String;" />
 		<method name="getAvailableLocales()[Ljava/util/Locale;" since="9" />
 		<method name="getEras()[Ljava/lang/String;" />
@@ -36118,9 +35443,6 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/text/DecimalFormatSymbols;)V" />
 		<method name="applyLocalizedPattern(Ljava/lang/String;)V" />
 		<method name="applyPattern(Ljava/lang/String;)V" />
-		<method name="format(DLjava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
-		<method name="format(JLjava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
-		<method name="format(Ljava/lang/Object;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="getDecimalFormatSymbols()Ljava/text/DecimalFormatSymbols;" />
 		<method name="getGroupingSize()I" />
 		<method name="getMultiplier()I" />
@@ -36130,7 +35452,6 @@
 		<method name="getPositiveSuffix()Ljava/lang/String;" />
 		<method name="isDecimalSeparatorAlwaysShown()Z" />
 		<method name="isParseBigDecimal()Z" />
-		<method name="parse(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/lang/Number;" />
 		<method name="setDecimalFormatSymbols(Ljava/text/DecimalFormatSymbols;)V" />
 		<method name="setDecimalSeparatorAlwaysShown(Z)V" />
 		<method name="setGroupingSize(I)V" />
@@ -36145,11 +35466,10 @@
 	</class>
 	<class name="java/text/DecimalFormatSymbols" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/util/Locale;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getAvailableLocales()[Ljava/util/Locale;" since="9" />
 		<method name="getCurrency()Ljava/util/Currency;" />
 		<method name="getCurrencySymbol()Ljava/lang/String;" />
@@ -36198,10 +35518,9 @@
 	</class>
 	<class name="java/text/Format" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="format(Ljava/lang/Object;)Ljava/lang/String;" />
 		<method name="format(Ljava/lang/Object;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="formatToCharacterIterator(Ljava/lang/Object;)Ljava/text/AttributedCharacterIterator;" />
@@ -36217,7 +35536,6 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Locale;)V" />
 		<method name="applyPattern(Ljava/lang/String;)V" />
-		<method name="format(Ljava/lang/Object;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;" />
 		<method name="format([Ljava/lang/Object;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="getFormats()[Ljava/text/Format;" />
@@ -36225,7 +35543,6 @@
 		<method name="getLocale()Ljava/util/Locale;" />
 		<method name="parse(Ljava/lang/String;)[Ljava/lang/Object;" />
 		<method name="parse(Ljava/lang/String;Ljava/text/ParsePosition;)[Ljava/lang/Object;" />
-		<method name="parseObject(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/lang/Object;" />
 		<method name="setFormat(ILjava/text/Format;)V" />
 		<method name="setFormatByArgumentIndex(ILjava/text/Format;)V" />
 		<method name="setFormats([Ljava/text/Format;)V" />
@@ -36240,6 +35557,7 @@
 	</class>
 	<class name="java/text/Normalizer" since="9">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="isNormalized(Ljava/lang/CharSequence;Ljava/text/Normalizer$Form;)Z" />
 		<method name="normalize(Ljava/lang/CharSequence;Ljava/text/Normalizer$Form;)Ljava/lang/String;" />
 	</class>
@@ -36259,7 +35577,6 @@
 		<method name="format(DLjava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="format(J)Ljava/lang/String;" />
 		<method name="format(JLjava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
-		<method name="format(Ljava/lang/Object;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="getAvailableLocales()[Ljava/util/Locale;" />
 		<method name="getCurrency()Ljava/util/Currency;" />
 		<method name="getCurrencyInstance()Ljava/text/NumberFormat;" />
@@ -36281,7 +35598,6 @@
 		<method name="isParseIntegerOnly()Z" />
 		<method name="parse(Ljava/lang/String;)Ljava/lang/Number;" />
 		<method name="parse(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/lang/Number;" />
-		<method name="parseObject(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/lang/Object;" />
 		<method name="setCurrency(Ljava/util/Currency;)V" />
 		<method name="setGroupingUsed(Z)V" />
 		<method name="setMaximumFractionDigits(I)V" />
@@ -36324,12 +35640,9 @@
 	<class name="java/text/RuleBasedCollator" since="1">
 		<extends name="java/text/Collator" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="compare(Ljava/lang/String;Ljava/lang/String;)I" />
 		<method name="getCollationElementIterator(Ljava/lang/String;)Ljava/text/CollationElementIterator;" />
 		<method name="getCollationElementIterator(Ljava/text/CharacterIterator;)Ljava/text/CollationElementIterator;" />
-		<method name="getCollationKey(Ljava/lang/String;)Ljava/text/CollationKey;" />
 		<method name="getRules()Ljava/lang/String;" />
-		<method name="hashCode()I" />
 	</class>
 	<class name="java/text/SimpleDateFormat" since="1">
 		<extends name="java/text/DateFormat" />
@@ -36339,10 +35652,8 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/util/Locale;)V" />
 		<method name="applyLocalizedPattern(Ljava/lang/String;)V" />
 		<method name="applyPattern(Ljava/lang/String;)V" />
-		<method name="format(Ljava/util/Date;Ljava/lang/StringBuffer;Ljava/text/FieldPosition;)Ljava/lang/StringBuffer;" />
 		<method name="get2DigitYearStart()Ljava/util/Date;" />
 		<method name="getDateFormatSymbols()Ljava/text/DateFormatSymbols;" />
-		<method name="parse(Ljava/lang/String;Ljava/text/ParsePosition;)Ljava/util/Date;" />
 		<method name="set2DigitYearStart(Ljava/util/Date;)V" />
 		<method name="setDateFormatSymbols(Ljava/text/DateFormatSymbols;)V" />
 		<method name="toLocalizedPattern()Ljava/lang/String;" />
@@ -36354,103 +35665,47 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;I)V" />
 		<method name="&lt;init>(Ljava/lang/String;III)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="current()C" />
-		<method name="first()C" />
-		<method name="getBeginIndex()I" />
-		<method name="getEndIndex()I" />
-		<method name="getIndex()I" />
-		<method name="last()C" />
-		<method name="next()C" />
-		<method name="previous()C" />
-		<method name="setIndex(I)C" />
 		<method name="setText(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/util/AbstractCollection" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/Collection" />
 		<method name="&lt;init>()V" />
-		<method name="add(LE;)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;)Z" />
-		<method name="isEmpty()Z" />
-		<method name="iterator()Ljava/util/Iterator;" />
-		<method name="remove(Ljava/lang/Object;)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/AbstractList" since="1">
 		<extends name="java/util/AbstractCollection" />
 		<implements name="java/util/List" />
 		<method name="&lt;init>()V" />
-		<method name="add(ILE;)V" />
-		<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;" />
-		<method name="lastIndexOf(Ljava/lang/Object;)I" />
-		<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;" />
 		<field name="modCount" />
 	</class>
 	<class name="java/util/AbstractMap" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/Map" />
 		<method name="&lt;init>()V" />
-		<method name="clear()V" />
-		<method name="containsKey(Ljava/lang/Object;)Z" />
-		<method name="containsValue(Ljava/lang/Object;)Z" />
-		<method name="entrySet()Ljava/util/Set;" />
-		<method name="get(Ljava/lang/Object;)LV;" />
-		<method name="isEmpty()Z" />
-		<method name="keySet()Ljava/util/Set;" />
-		<method name="put(LK;LV;)LV;" />
-		<method name="putAll(Ljava/util/Map;)V" />
-		<method name="remove(Ljava/lang/Object;)LV;" />
-		<method name="size()I" />
-		<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" />
+		<implements name="java/util/Map$Entry" />
+		<method name="&lt;init>(Ljava/lang/Object;Ljava/lang/Object;)V" />
 		<method name="&lt;init>(Ljava/util/Map$Entry;)V" />
-		<method name="getKey()LK;" />
-		<method name="getValue()LV;" />
-		<method name="setValue(LV;)LV;" />
 	</class>
 	<class name="java/util/AbstractMap$SimpleImmutableEntry" 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" />
+		<implements name="java/util/Map$Entry" />
+		<method name="&lt;init>(Ljava/lang/Object;Ljava/lang/Object;)V" />
 		<method name="&lt;init>(Ljava/util/Map$Entry;)V" />
-		<method name="getKey()LK;" />
-		<method name="getValue()LV;" />
-		<method name="setValue(LV;)LV;" />
 	</class>
 	<class name="java/util/AbstractQueue" since="1">
 		<extends name="java/util/AbstractCollection" />
 		<implements name="java/util/Queue" />
 		<method name="&lt;init>()V" />
-		<method name="element()LE;" />
-		<method name="remove()LE;" />
 	</class>
 	<class name="java/util/AbstractSequentialList" since="1">
 		<extends name="java/util/AbstractList" />
 		<method name="&lt;init>()V" />
-		<method name="get(I)LE;" />
-		<method name="listIterator(I)Ljava/util/ListIterator;" />
 	</class>
 	<class name="java/util/AbstractSet" since="1">
 		<extends name="java/util/AbstractCollection" />
@@ -36459,56 +35714,30 @@
 	</class>
 	<class name="java/util/ArrayDeque" since="9">
 		<extends name="java/util/AbstractCollection" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/Deque" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)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;" />
-		<method name="descendingIterator()Ljava/util/Iterator;" />
-		<method name="element()LE;" />
-		<method name="getFirst()LE;" />
-		<method name="getLast()LE;" />
-		<method name="iterator()Ljava/util/Iterator;" />
-		<method name="offer(LE;)Z" />
-		<method name="offerFirst(LE;)Z" />
-		<method name="offerLast(LE;)Z" />
-		<method name="peek()LE;" />
-		<method name="peekFirst()LE;" />
-		<method name="peekLast()LE;" />
-		<method name="poll()LE;" />
-		<method name="pollFirst()LE;" />
-		<method name="pollLast()LE;" />
-		<method name="pop()LE;" />
-		<method name="push(LE;)V" />
-		<method name="remove()LE;" />
-		<method name="removeFirst()LE;" />
-		<method name="removeFirstOccurrence(Ljava/lang/Object;)Z" />
-		<method name="removeLast()LE;" />
-		<method name="removeLastOccurrence(Ljava/lang/Object;)Z" />
-		<method name="size()I" />
 	</class>
 	<class name="java/util/ArrayList" since="1">
 		<extends name="java/util/AbstractList" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/List" />
 		<implements name="java/util/RandomAccess" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)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;" />
-		<method name="size()I" />
 		<method name="trimToSize()V" />
 	</class>
 	<class name="java/util/Arrays" since="1">
 		<extends name="java/lang/Object" />
-		<method name="asList([LT;)Ljava/util/List;" />
+		<method name="&lt;init>()V" />
+		<method name="asList([Ljava/lang/Object;)Ljava/util/List;" />
 		<method name="binarySearch([BB)I" />
 		<method name="binarySearch([BIIB)I" since="9" />
 		<method name="binarySearch([CC)I" />
@@ -36521,10 +35750,10 @@
 		<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;)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;IILjava/lang/Object;Ljava/util/Comparator;)I" since="9" />
 		<method name="binarySearch([Ljava/lang/Object;Ljava/lang/Object;)I" />
+		<method name="binarySearch([Ljava/lang/Object;Ljava/lang/Object;Ljava/util/Comparator;)I" />
 		<method name="binarySearch([SIIS)I" since="9" />
 		<method name="binarySearch([SS)I" />
 		<method name="copyOf([BI)[B" since="9" />
@@ -36533,8 +35762,8 @@
 		<method name="copyOf([FI)[F" since="9" />
 		<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;" since="9" />
+		<method name="copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;" since="9" />
+		<method name="copyOf([Ljava/lang/Object;ILjava/lang/Class;)[Ljava/lang/Object;" since="9" />
 		<method name="copyOf([SI)[S" since="9" />
 		<method name="copyOf([ZI)[Z" since="9" />
 		<method name="copyOfRange([BII)[B" since="9" />
@@ -36543,8 +35772,8 @@
 		<method name="copyOfRange([FII)[F" since="9" />
 		<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;" since="9" />
+		<method name="copyOfRange([Ljava/lang/Object;II)[Ljava/lang/Object;" since="9" />
+		<method name="copyOfRange([Ljava/lang/Object;IILjava/lang/Class;)[Ljava/lang/Object;" 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" />
@@ -36598,10 +35827,10 @@
 		<method name="sort([III)V" />
 		<method name="sort([J)V" />
 		<method name="sort([JII)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([Ljava/lang/Object;IILjava/util/Comparator;)V" />
+		<method name="sort([Ljava/lang/Object;Ljava/util/Comparator;)V" />
 		<method name="sort([S)V" />
 		<method name="sort([SII)V" />
 		<method name="toString([B)Ljava/lang/String;" />
@@ -36616,8 +35845,8 @@
 	</class>
 	<class name="java/util/BitSet" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="and(Ljava/util/BitSet;)V" />
@@ -36626,7 +35855,6 @@
 		<method name="clear()V" />
 		<method name="clear(I)V" />
 		<method name="clear(II)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="flip(I)V" />
 		<method name="flip(II)V" />
 		<method name="get(I)Z" />
@@ -36646,9 +35874,9 @@
 	</class>
 	<class name="java/util/Calendar" since="1">
 		<extends name="java/lang/Object" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/lang/Comparable" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/util/TimeZone;Ljava/util/Locale;)V" />
 		<method name="add(II)V" />
@@ -36656,7 +35884,6 @@
 		<method name="before(Ljava/lang/Object;)Z" />
 		<method name="clear()V" />
 		<method name="clear(I)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="compareTo(Ljava/util/Calendar;)I" />
 		<method name="complete()V" />
 		<method name="computeFields()V" />
@@ -36746,29 +35973,28 @@
 		<field name="time" />
 	</class>
 	<class name="java/util/Collection" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Iterable" />
-		<method name="add(LE;)Z" />
+		<method name="add(Ljava/lang/Object;)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;)Z" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="hashCode()I" />
 		<method name="isEmpty()Z" />
-		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="remove(Ljava/lang/Object;)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;" />
+		<method name="toArray([Ljava/lang/Object;)[Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/Collections" since="1">
 		<extends name="java/lang/Object" />
-		<method name="addAll(Ljava/util/Collection;[LT;)Z" />
+		<method name="&lt;init>()V" />
+		<method name="addAll(Ljava/util/Collection;[Ljava/lang/Object;)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="binarySearch(Ljava/util/List;Ljava/lang/Object;)I" />
+		<method name="binarySearch(Ljava/util/List;Ljava/lang/Object;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;" />
@@ -36781,27 +36007,27 @@
 		<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="fill(Ljava/util/List;Ljava/lang/Object;)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="max(Ljava/util/Collection;)Ljava/lang/Object;" />
+		<method name="max(Ljava/util/Collection;Ljava/util/Comparator;)Ljava/lang/Object;" />
+		<method name="min(Ljava/util/Collection;)Ljava/lang/Object;" />
+		<method name="min(Ljava/util/Collection;Ljava/util/Comparator;)Ljava/lang/Object;" />
+		<method name="nCopies(ILjava/lang/Object;)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="replaceAll(Ljava/util/List;Ljava/lang/Object;Ljava/lang/Object;)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="singleton(Ljava/lang/Object;)Ljava/util/Set;" />
+		<method name="singletonList(Ljava/lang/Object;)Ljava/util/List;" />
+		<method name="singletonMap(Ljava/lang/Object;Ljava/lang/Object;)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" />
@@ -36822,8 +36048,8 @@
 		<field name="EMPTY_SET" />
 	</class>
 	<class name="java/util/Comparator" since="1">
-		<method name="compare(LT;LT;)I" />
-		<method name="equals(Ljava/lang/Object;)Z" />
+		<extends name="java/lang/Object" />
+		<method name="compare(Ljava/lang/Object;Ljava/lang/Object;)I" />
 	</class>
 	<class name="java/util/ConcurrentModificationException" since="1">
 		<extends name="java/lang/RuntimeException" />
@@ -36833,6 +36059,7 @@
 	<class name="java/util/Currency" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
+		<method name="&lt;init>()V" />
 		<method name="getCurrencyCode()Ljava/lang/String;" />
 		<method name="getDefaultFractionDigits()I" />
 		<method name="getInstance(Ljava/lang/String;)Ljava/util/Currency;" />
@@ -36842,9 +36069,9 @@
 	</class>
 	<class name="java/util/Date" since="1">
 		<extends name="java/lang/Object" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/lang/Comparable" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(III)V" />
 		<method name="&lt;init>(IIIII)V" />
@@ -36854,7 +36081,6 @@
 		<method name="UTC(IIIIII)J" />
 		<method name="after(Ljava/util/Date;)Z" />
 		<method name="before(Ljava/util/Date;)Z" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="compareTo(Ljava/util/Date;)I" />
 		<method name="getDate()I" />
 		<method name="getDay()I" />
@@ -36877,44 +36103,35 @@
 		<method name="toLocaleString()Ljava/lang/String;" />
 	</class>
 	<class name="java/util/Deque" since="9">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Queue" />
-		<method name="add(LE;)Z" since="11" />
-		<method name="addFirst(LE;)V" />
-		<method name="addLast(LE;)V" />
-		<method name="contains(Ljava/lang/Object;)Z" since="11" />
+		<method name="addFirst(Ljava/lang/Object;)V" />
+		<method name="addLast(Ljava/lang/Object;)V" />
 		<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;" since="11" />
-		<method name="offer(LE;)Z" since="11" />
-		<method name="offerFirst(LE;)Z" />
-		<method name="offerLast(LE;)Z" />
-		<method name="peek()LE;" since="11" />
-		<method name="peekFirst()LE;" />
-		<method name="peekLast()LE;" />
-		<method name="poll()LE;" since="11" />
-		<method name="pollFirst()LE;" />
-		<method name="pollLast()LE;" />
-		<method name="pop()LE;" />
-		<method name="push(LE;)V" />
-		<method name="remove()LE;" since="11" />
-		<method name="remove(Ljava/lang/Object;)Z" since="11" />
-		<method name="removeFirst()LE;" />
+		<method name="getFirst()Ljava/lang/Object;" />
+		<method name="getLast()Ljava/lang/Object;" />
+		<method name="offerFirst(Ljava/lang/Object;)Z" />
+		<method name="offerLast(Ljava/lang/Object;)Z" />
+		<method name="peekFirst()Ljava/lang/Object;" />
+		<method name="peekLast()Ljava/lang/Object;" />
+		<method name="pollFirst()Ljava/lang/Object;" />
+		<method name="pollLast()Ljava/lang/Object;" />
+		<method name="pop()Ljava/lang/Object;" />
+		<method name="push(Ljava/lang/Object;)V" />
+		<method name="removeFirst()Ljava/lang/Object;" />
 		<method name="removeFirstOccurrence(Ljava/lang/Object;)Z" />
-		<method name="removeLast()LE;" />
+		<method name="removeLast()Ljava/lang/Object;" />
 		<method name="removeLastOccurrence(Ljava/lang/Object;)Z" />
-		<method name="size()I" since="11" />
 	</class>
 	<class name="java/util/Dictionary" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
 		<method name="elements()Ljava/util/Enumeration;" />
-		<method name="get(Ljava/lang/Object;)LV;" />
+		<method name="get(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="isEmpty()Z" />
 		<method name="keys()Ljava/util/Enumeration;" />
-		<method name="put(LK;LV;)LV;" />
-		<method name="remove(Ljava/lang/Object;)LV;" />
+		<method name="put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="remove(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="size()I" />
 	</class>
 	<class name="java/util/DuplicateFormatFlagsException" since="1">
@@ -36928,38 +36145,41 @@
 	</class>
 	<class name="java/util/EnumMap" since="1">
 		<extends name="java/util/AbstractMap" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/Map" />
-		<implements name="java/io/Serializable" />
 		<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;" />
+		<method name="put(Ljava/lang/Enum;Ljava/lang/Object;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/EnumSet" since="1">
 		<extends name="java/util/AbstractSet" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
+		<method name="&lt;init>()V" />
 		<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;" />
+		<method name="of(Ljava/lang/Enum;)Ljava/util/EnumSet;" />
+		<method name="of(Ljava/lang/Enum;Ljava/lang/Enum;)Ljava/util/EnumSet;" />
+		<method name="of(Ljava/lang/Enum;Ljava/lang/Enum;Ljava/lang/Enum;)Ljava/util/EnumSet;" />
+		<method name="of(Ljava/lang/Enum;Ljava/lang/Enum;Ljava/lang/Enum;Ljava/lang/Enum;)Ljava/util/EnumSet;" />
+		<method name="of(Ljava/lang/Enum;Ljava/lang/Enum;Ljava/lang/Enum;Ljava/lang/Enum;Ljava/lang/Enum;)Ljava/util/EnumSet;" />
+		<method name="of(Ljava/lang/Enum;[Ljava/lang/Enum;)Ljava/util/EnumSet;" />
+		<method name="range(Ljava/lang/Enum;Ljava/lang/Enum;)Ljava/util/EnumSet;" />
 	</class>
 	<class name="java/util/Enumeration" since="1">
+		<extends name="java/lang/Object" />
 		<method name="hasMoreElements()Z" />
-		<method name="nextElement()LE;" />
+		<method name="nextElement()Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/EventListener" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/util/EventListenerProxy" since="1">
 		<extends name="java/lang/Object" />
@@ -36982,10 +36202,12 @@
 		<method name="getFlags()Ljava/lang/String;" />
 	</class>
 	<class name="java/util/Formattable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="formatTo(Ljava/util/Formatter;III)V" />
 	</class>
 	<class name="java/util/FormattableFlags" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="ALTERNATE" />
 		<field name="LEFT_JUSTIFY" />
 		<field name="UPPERCASE" />
@@ -37008,8 +36230,6 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/Locale;)V" />
 		<method name="&lt;init>(Ljava/util/Locale;)V" />
-		<method name="close()V" />
-		<method name="flush()V" />
 		<method name="format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/util/Formatter;" />
 		<method name="format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/util/Formatter;" />
 		<method name="ioException()Ljava/io/IOException;" />
@@ -37037,82 +36257,52 @@
 		<method name="&lt;init>(Ljava/util/Locale;)V" />
 		<method name="&lt;init>(Ljava/util/TimeZone;)V" />
 		<method name="&lt;init>(Ljava/util/TimeZone;Ljava/util/Locale;)V" />
-		<method name="add(II)V" />
-		<method name="computeFields()V" />
-		<method name="computeTime()V" />
-		<method name="getGreatestMinimum(I)I" />
 		<method name="getGregorianChange()Ljava/util/Date;" />
-		<method name="getLeastMaximum(I)I" />
-		<method name="getMaximum(I)I" />
-		<method name="getMinimum(I)I" />
 		<method name="isLeapYear(I)Z" />
-		<method name="roll(IZ)V" />
 		<method name="setGregorianChange(Ljava/util/Date;)V" />
 		<field name="AD" />
 		<field name="BC" />
 	</class>
 	<class name="java/util/HashMap" since="1">
 		<extends name="java/util/AbstractMap" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/Map" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" />
 		<method name="&lt;init>(Ljava/util/Map;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="entrySet()Ljava/util/Set;" />
 	</class>
 	<class name="java/util/HashSet" since="1">
 		<extends name="java/util/AbstractSet" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/Set" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" />
 		<method name="&lt;init>(Ljava/util/Collection;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="iterator()Ljava/util/Iterator;" />
-		<method name="size()I" />
 	</class>
 	<class name="java/util/Hashtable" since="1">
 		<extends name="java/util/Dictionary" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/Map" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)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;" />
-		<method name="entrySet()Ljava/util/Set;" />
-		<method name="get(Ljava/lang/Object;)LV;" />
-		<method name="isEmpty()Z" />
-		<method name="keySet()Ljava/util/Set;" />
-		<method name="keys()Ljava/util/Enumeration;" />
-		<method name="put(LK;LV;)LV;" />
-		<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;" />
 	</class>
 	<class name="java/util/IdentityHashMap" since="1">
 		<extends name="java/util/AbstractMap" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/Map" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Ljava/util/Map;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="entrySet()Ljava/util/Set;" />
 	</class>
 	<class name="java/util/IllegalFormatCodePointException" since="1">
 		<extends name="java/util/IllegalFormatException" />
@@ -37130,6 +36320,7 @@
 	<class name="java/util/IllegalFormatException" since="1">
 		<extends name="java/lang/IllegalArgumentException" />
 		<implements name="java/io/Serializable" />
+		<method name="&lt;init>()V" />
 	</class>
 	<class name="java/util/IllegalFormatFlagsException" since="1">
 		<extends name="java/util/IllegalFormatException" />
@@ -37159,8 +36350,9 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/util/Iterator" since="1">
+		<extends name="java/lang/Object" />
 		<method name="hasNext()Z" />
-		<method name="next()LE;" />
+		<method name="next()Ljava/lang/Object;" />
 		<method name="remove()V" />
 	</class>
 	<class name="java/util/LinkedHashMap" since="1">
@@ -37174,8 +36366,8 @@
 	</class>
 	<class name="java/util/LinkedHashSet" since="1">
 		<extends name="java/util/HashSet" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/Set" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
@@ -37184,94 +36376,56 @@
 	</class>
 	<class name="java/util/LinkedList" since="1">
 		<extends name="java/util/AbstractSequentialList" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
+		<implements name="java/util/Deque" since="9" />
 		<implements name="java/util/List" />
 		<implements name="java/util/Queue" />
-		<implements name="java/io/Serializable" />
-		<implements name="java/util/Deque" since="9" />
 		<method name="&lt;init>()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;" since="9" />
-		<method name="element()LE;" />
-		<method name="getFirst()LE;" />
-		<method name="getLast()LE;" />
-		<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" />
-		<method name="peek()LE;" />
-		<method name="peekFirst()LE;" since="9" />
-		<method name="peekLast()LE;" since="9" />
-		<method name="poll()LE;" />
-		<method name="pollFirst()LE;" since="9" />
-		<method name="pollLast()LE;" since="9" />
-		<method name="pop()LE;" since="9" />
-		<method name="push(LE;)V" since="9" />
-		<method name="remove()LE;" />
-		<method name="removeFirst()LE;" />
-		<method name="removeFirstOccurrence(Ljava/lang/Object;)Z" since="9" />
-		<method name="removeLast()LE;" />
-		<method name="removeLastOccurrence(Ljava/lang/Object;)Z" since="9" />
-		<method name="size()I" />
+		<method name="addFirst(Ljava/lang/Object;)V" />
+		<method name="addLast(Ljava/lang/Object;)V" />
+		<method name="getFirst()Ljava/lang/Object;" />
+		<method name="getLast()Ljava/lang/Object;" />
+		<method name="removeFirst()Ljava/lang/Object;" />
+		<method name="removeLast()Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/List" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Collection" />
-		<method name="add(ILE;)V" />
-		<method name="add(LE;)Z" />
+		<method name="add(ILjava/lang/Object;)V" />
 		<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;)Z" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="get(I)LE;" />
-		<method name="hashCode()I" />
+		<method name="get(I)Ljava/lang/Object;" />
 		<method name="indexOf(Ljava/lang/Object;)I" />
-		<method name="isEmpty()Z" />
-		<method name="iterator()Ljava/util/Iterator;" />
 		<method name="lastIndexOf(Ljava/lang/Object;)I" />
 		<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;)Z" />
-		<method name="retainAll(Ljava/util/Collection;)Z" />
-		<method name="set(ILE;)LE;" />
-		<method name="size()I" />
+		<method name="remove(I)Ljava/lang/Object;" />
+		<method name="set(ILjava/lang/Object;)Ljava/lang/Object;" />
 		<method name="subList(II)Ljava/util/List;" />
-		<method name="toArray()[Ljava/lang/Object;" />
-		<method name="toArray([LT;)[LT;" />
 	</class>
 	<class name="java/util/ListIterator" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Iterator" />
-		<method name="add(LE;)V" />
-		<method name="hasNext()Z" />
+		<method name="add(Ljava/lang/Object;)V" />
 		<method name="hasPrevious()Z" />
-		<method name="next()LE;" />
 		<method name="nextIndex()I" />
-		<method name="previous()LE;" />
+		<method name="previous()Ljava/lang/Object;" />
 		<method name="previousIndex()I" />
-		<method name="remove()V" />
-		<method name="set(LE;)V" />
+		<method name="set(Ljava/lang/Object;)V" />
 	</class>
 	<class name="java/util/ListResourceBundle" since="1">
 		<extends name="java/util/ResourceBundle" />
 		<method name="&lt;init>()V" />
 		<method name="getContents()[[Ljava/lang/Object;" />
-		<method name="getKeys()Ljava/util/Enumeration;" />
-		<method name="handleGetObject(Ljava/lang/String;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/Locale" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getAvailableLocales()[Ljava/util/Locale;" />
 		<method name="getCountry()Ljava/lang/String;" />
 		<method name="getDefault()Ljava/util/Locale;" />
@@ -37290,7 +36444,6 @@
 		<method name="getLanguage()Ljava/lang/String;" />
 		<method name="getVariant()Ljava/lang/String;" />
 		<method name="setDefault(Ljava/util/Locale;)V" />
-		<method name="toString()Ljava/lang/String;" />
 		<field name="CANADA" />
 		<field name="CANADA_FRENCH" />
 		<field name="CHINA" />
@@ -37315,27 +36468,25 @@
 		<field name="US" />
 	</class>
 	<class name="java/util/Map" since="1">
+		<extends name="java/lang/Object" />
 		<method name="clear()V" />
 		<method name="containsKey(Ljava/lang/Object;)Z" />
 		<method name="containsValue(Ljava/lang/Object;)Z" />
 		<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="get(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="isEmpty()Z" />
 		<method name="keySet()Ljava/util/Set;" />
-		<method name="put(LK;LV;)LV;" />
+		<method name="put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="putAll(Ljava/util/Map;)V" />
-		<method name="remove(Ljava/lang/Object;)LV;" />
+		<method name="remove(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="size()I" />
 		<method name="values()Ljava/util/Collection;" />
 	</class>
 	<class name="java/util/Map$Entry" since="1">
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="getKey()LK;" />
-		<method name="getValue()LV;" />
-		<method name="hashCode()I" />
-		<method name="setValue(LV;)LV;" />
+		<extends name="java/lang/Object" />
+		<method name="getKey()Ljava/lang/Object;" />
+		<method name="getValue()Ljava/lang/Object;" />
+		<method name="setValue(Ljava/lang/Object;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/MissingFormatArgumentException" since="1">
 		<extends name="java/util/IllegalFormatException" />
@@ -37354,46 +36505,41 @@
 		<method name="getKey()Ljava/lang/String;" />
 	</class>
 	<class name="java/util/NavigableMap" since="9">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/SortedMap" />
-		<method name="ceilingEntry(LK;)Ljava/util/Map$Entry;" />
-		<method name="ceilingKey(LK;)LK;" />
+		<method name="ceilingEntry(Ljava/lang/Object;)Ljava/util/Map$Entry;" />
+		<method name="ceilingKey(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<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;" 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="floorEntry(Ljava/lang/Object;)Ljava/util/Map$Entry;" />
+		<method name="floorKey(Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="headMap(Ljava/lang/Object;Z)Ljava/util/NavigableMap;" />
+		<method name="higherEntry(Ljava/lang/Object;)Ljava/util/Map$Entry;" />
+		<method name="higherKey(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="lastEntry()Ljava/util/Map$Entry;" />
-		<method name="lowerEntry(LK;)Ljava/util/Map$Entry;" />
-		<method name="lowerKey(LK;)LK;" />
+		<method name="lowerEntry(Ljava/lang/Object;)Ljava/util/Map$Entry;" />
+		<method name="lowerKey(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<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;" />
+		<method name="subMap(Ljava/lang/Object;ZLjava/lang/Object;Z)Ljava/util/NavigableMap;" />
+		<method name="tailMap(Ljava/lang/Object;Z)Ljava/util/NavigableMap;" />
 	</class>
 	<class name="java/util/NavigableSet" since="9">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/SortedSet" />
-		<method name="ceiling(LE;)LE;" />
+		<method name="ceiling(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="descendingIterator()Ljava/util/Iterator;" />
 		<method name="descendingSet()Ljava/util/NavigableSet;" />
-		<method name="floor(LE;)LE;" />
-		<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;" since="11" />
-		<method name="lower(LE;)LE;" />
-		<method name="pollFirst()LE;" />
-		<method name="pollLast()LE;" />
-		<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;" />
+		<method name="floor(Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="headSet(Ljava/lang/Object;Z)Ljava/util/NavigableSet;" />
+		<method name="higher(Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="lower(Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="pollFirst()Ljava/lang/Object;" />
+		<method name="pollLast()Ljava/lang/Object;" />
+		<method name="subSet(Ljava/lang/Object;ZLjava/lang/Object;Z)Ljava/util/NavigableSet;" />
+		<method name="tailSet(Ljava/lang/Object;Z)Ljava/util/NavigableSet;" />
 	</class>
 	<class name="java/util/NoSuchElementException" since="1">
 		<extends name="java/lang/RuntimeException" />
@@ -37414,6 +36560,7 @@
 		<method name="setChanged()V" />
 	</class>
 	<class name="java/util/Observer" since="1">
+		<extends name="java/lang/Object" />
 		<method name="update(Ljava/util/Observable;Ljava/lang/Object;)V" />
 	</class>
 	<class name="java/util/PriorityQueue" since="1">
@@ -37426,11 +36573,6 @@
 		<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;" />
-		<method name="size()I" />
 	</class>
 	<class name="java/util/Properties" since="1">
 		<extends name="java/util/Hashtable" />
@@ -37461,17 +36603,15 @@
 		<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;" />
-		<method name="handleGetObject(Ljava/lang/String;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/Queue" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Collection" />
-		<method name="add(LE;)Z" since="11" />
-		<method name="element()LE;" />
-		<method name="offer(LE;)Z" />
-		<method name="peek()LE;" />
-		<method name="poll()LE;" />
-		<method name="remove()LE;" />
+		<method name="element()Ljava/lang/Object;" />
+		<method name="offer(Ljava/lang/Object;)Z" />
+		<method name="peek()Ljava/lang/Object;" />
+		<method name="poll()Ljava/lang/Object;" />
+		<method name="remove()Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/Random" since="1">
 		<extends name="java/lang/Object" />
@@ -37490,6 +36630,7 @@
 		<method name="setSeed(J)V" />
 	</class>
 	<class name="java/util/RandomAccess" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="java/util/ResourceBundle" since="1">
 		<extends name="java/lang/Object" />
@@ -37550,7 +36691,6 @@
 		<method name="findInLine(Ljava/util/regex/Pattern;)Ljava/lang/String;" />
 		<method name="findWithinHorizon(Ljava/lang/String;I)Ljava/lang/String;" />
 		<method name="findWithinHorizon(Ljava/util/regex/Pattern;I)Ljava/lang/String;" />
-		<method name="hasNext()Z" />
 		<method name="hasNext(Ljava/lang/String;)Z" />
 		<method name="hasNext(Ljava/util/regex/Pattern;)Z" />
 		<method name="hasNextBigDecimal()Z" />
@@ -37590,7 +36730,6 @@
 		<method name="nextShort()S" />
 		<method name="nextShort(I)S" />
 		<method name="radix()I" />
-		<method name="remove()V" />
 		<method name="reset()Ljava/util/Scanner;" since="9" />
 		<method name="skip(Ljava/lang/String;)Ljava/util/Scanner;" />
 		<method name="skip(Ljava/util/regex/Pattern;)Ljava/util/Scanner;" />
@@ -37607,29 +36746,15 @@
 	<class name="java/util/ServiceLoader" since="9">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Iterable" />
-		<method name="iterator()Ljava/util/Iterator;" />
+		<method name="&lt;init>()V" />
 		<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">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Collection" />
-		<method name="add(LE;)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;)Z" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="hashCode()I" />
-		<method name="isEmpty()Z" />
-		<method name="iterator()Ljava/util/Iterator;" />
-		<method name="remove(Ljava/lang/Object;)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/SimpleTimeZone" since="1">
 		<extends name="java/util/TimeZone" />
@@ -37637,48 +36762,45 @@
 		<method name="&lt;init>(ILjava/lang/String;IIIIIIII)V" />
 		<method name="&lt;init>(ILjava/lang/String;IIIIIIIII)V" />
 		<method name="&lt;init>(ILjava/lang/String;IIIIIIIIIII)V" />
-		<method name="getOffset(IIIIII)I" />
-		<method name="getRawOffset()I" />
-		<method name="inDaylightTime(Ljava/util/Date;)Z" />
 		<method name="setDSTSavings(I)V" />
 		<method name="setEndRule(III)V" />
 		<method name="setEndRule(IIII)V" />
 		<method name="setEndRule(IIIIZ)V" />
-		<method name="setRawOffset(I)V" />
 		<method name="setStartRule(III)V" />
 		<method name="setStartRule(IIII)V" />
 		<method name="setStartRule(IIIIZ)V" />
 		<method name="setStartYear(I)V" />
-		<method name="useDaylightTime()Z" />
 		<field name="STANDARD_TIME" />
 		<field name="UTC_TIME" />
 		<field name="WALL_TIME" />
 	</class>
 	<class name="java/util/SortedMap" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Map" />
 		<method name="comparator()Ljava/util/Comparator;" />
-		<method name="firstKey()LK;" />
-		<method name="headMap(LK;)Ljava/util/SortedMap;" />
-		<method name="lastKey()LK;" />
-		<method name="subMap(LK;LK;)Ljava/util/SortedMap;" />
-		<method name="tailMap(LK;)Ljava/util/SortedMap;" />
+		<method name="firstKey()Ljava/lang/Object;" />
+		<method name="headMap(Ljava/lang/Object;)Ljava/util/SortedMap;" />
+		<method name="lastKey()Ljava/lang/Object;" />
+		<method name="subMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedMap;" />
+		<method name="tailMap(Ljava/lang/Object;)Ljava/util/SortedMap;" />
 	</class>
 	<class name="java/util/SortedSet" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Set" />
 		<method name="comparator()Ljava/util/Comparator;" />
-		<method name="first()LE;" />
-		<method name="headSet(LE;)Ljava/util/SortedSet;" />
-		<method name="last()LE;" />
-		<method name="subSet(LE;LE;)Ljava/util/SortedSet;" />
-		<method name="tailSet(LE;)Ljava/util/SortedSet;" />
+		<method name="first()Ljava/lang/Object;" />
+		<method name="headSet(Ljava/lang/Object;)Ljava/util/SortedSet;" />
+		<method name="last()Ljava/lang/Object;" />
+		<method name="subSet(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedSet;" />
+		<method name="tailSet(Ljava/lang/Object;)Ljava/util/SortedSet;" />
 	</class>
 	<class name="java/util/Stack" since="1">
 		<extends name="java/util/Vector" />
 		<method name="&lt;init>()V" />
 		<method name="empty()Z" />
-		<method name="peek()LE;" />
-		<method name="pop()LE;" />
-		<method name="push(LE;)LE;" />
+		<method name="peek()Ljava/lang/Object;" />
+		<method name="pop()Ljava/lang/Object;" />
+		<method name="push(Ljava/lang/Object;)Ljava/lang/Object;" />
 		<method name="search(Ljava/lang/Object;)I" />
 	</class>
 	<class name="java/util/StringTokenizer" since="1">
@@ -37688,18 +36810,15 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Z)V" />
 		<method name="countTokens()I" />
-		<method name="hasMoreElements()Z" />
 		<method name="hasMoreTokens()Z" />
-		<method name="nextElement()Ljava/lang/Object;" />
 		<method name="nextToken()Ljava/lang/String;" />
 		<method name="nextToken(Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="java/util/TimeZone" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getAvailableIDs()[Ljava/lang/String;" />
 		<method name="getAvailableIDs(I)[Ljava/lang/String;" />
 		<method name="getDSTSavings()I" />
@@ -37742,7 +36861,6 @@
 		<implements name="java/lang/Runnable" />
 		<method name="&lt;init>()V" />
 		<method name="cancel()Z" />
-		<method name="run()V" />
 		<method name="scheduledExecutionTime()J" />
 	</class>
 	<class name="java/util/TooManyListenersException" since="1">
@@ -37752,76 +36870,30 @@
 	</class>
 	<class name="java/util/TreeMap" since="1">
 		<extends name="java/util/AbstractMap" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
-		<implements name="java/util/SortedMap" />
+		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/NavigableMap" since="9" />
+		<implements name="java/util/SortedMap" />
 		<method name="&lt;init>()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;" since="9" />
-		<method name="ceilingKey(LK;)LK;" since="9" />
-		<method name="clone()Ljava/lang/Object;" />
-		<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;" since="9" />
-		<method name="floorKey(LK;)LK;" 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;" since="9" />
-		<method name="lastKey()LK;" />
-		<method name="lowerEntry(LK;)Ljava/util/Map$Entry;" since="9" />
-		<method name="lowerKey(LK;)LK;" 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" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
-		<implements name="java/util/SortedSet" />
+		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/NavigableSet" since="9" />
+		<implements name="java/util/SortedSet" />
 		<method name="&lt;init>()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;" />
-		<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;" />
-		<method name="headSet(LE;Z)Ljava/util/NavigableSet;" since="9" />
-		<method name="higher(LE;)LE;" since="9" />
-		<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;" />
-		<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" />
-		<implements name="java/lang/Comparable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Comparable" />
 		<method name="&lt;init>(JJ)V" />
 		<method name="clockSequence()I" />
 		<method name="compareTo(Ljava/util/UUID;)I" />
@@ -37847,33 +36919,30 @@
 	</class>
 	<class name="java/util/Vector" since="1">
 		<extends name="java/util/AbstractList" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/List" />
 		<implements name="java/util/RandomAccess" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(II)V" />
 		<method name="&lt;init>(Ljava/util/Collection;)V" />
-		<method name="addElement(LE;)V" />
+		<method name="addElement(Ljava/lang/Object;)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="elementAt(I)Ljava/lang/Object;" />
 		<method name="elements()Ljava/util/Enumeration;" />
 		<method name="ensureCapacity(I)V" />
-		<method name="firstElement()LE;" />
-		<method name="get(I)LE;" />
+		<method name="firstElement()Ljava/lang/Object;" />
 		<method name="indexOf(Ljava/lang/Object;I)I" />
-		<method name="insertElementAt(LE;I)V" />
-		<method name="lastElement()LE;" />
+		<method name="insertElementAt(Ljava/lang/Object;I)V" />
+		<method name="lastElement()Ljava/lang/Object;" />
 		<method name="lastIndexOf(Ljava/lang/Object;I)I" />
 		<method name="removeAllElements()V" />
 		<method name="removeElement(Ljava/lang/Object;)Z" />
 		<method name="removeElementAt(I)V" />
-		<method name="setElementAt(LE;I)V" />
+		<method name="setElementAt(Ljava/lang/Object;I)V" />
 		<method name="setSize(I)V" />
-		<method name="size()I" />
 		<method name="trimToSize()V" />
 		<field name="capacityIncrement" />
 		<field name="elementCount" />
@@ -37886,88 +36955,45 @@
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)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;)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/lang/Runnable;Ljava/lang/Object;)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" />
-		<implements name="java/util/concurrent/BlockingQueue" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/BlockingQueue" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IZ)V" />
 		<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;" />
-		<method name="poll()LE;" />
-		<method name="poll(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="put(LE;)V" />
-		<method name="remainingCapacity()I" />
-		<method name="size()I" />
-		<method name="take()LE;" />
 	</class>
 	<class name="java/util/concurrent/BlockingDeque" since="9">
-		<implements name="java/util/concurrent/BlockingQueue" />
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Deque" />
-		<method name="add(LE;)Z" />
-		<method name="addFirst(LE;)V" />
-		<method name="addLast(LE;)V" />
-		<method name="contains(Ljava/lang/Object;)Z" />
-		<method name="element()LE;" />
-		<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" />
-		<method name="offerFirst(LE;JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="offerLast(LE;)Z" />
-		<method name="offerLast(LE;JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="peek()LE;" />
-		<method name="poll()LE;" />
-		<method name="poll(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="pollFirst(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="pollLast(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="push(LE;)V" />
-		<method name="put(LE;)V" />
-		<method name="putFirst(LE;)V" />
-		<method name="putLast(LE;)V" />
-		<method name="remove()LE;" />
-		<method name="remove(Ljava/lang/Object;)Z" />
-		<method name="removeFirstOccurrence(Ljava/lang/Object;)Z" />
-		<method name="removeLastOccurrence(Ljava/lang/Object;)Z" />
-		<method name="size()I" />
-		<method name="take()LE;" />
-		<method name="takeFirst()LE;" />
-		<method name="takeLast()LE;" />
+		<implements name="java/util/concurrent/BlockingQueue" />
+		<method name="offerFirst(Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Z" />
+		<method name="offerLast(Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Z" />
+		<method name="pollFirst(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;" />
+		<method name="pollLast(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;" />
+		<method name="putFirst(Ljava/lang/Object;)V" />
+		<method name="putLast(Ljava/lang/Object;)V" />
+		<method name="takeFirst()Ljava/lang/Object;" />
+		<method name="takeLast()Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/concurrent/BlockingQueue" since="1">
+		<extends name="java/lang/Object" />
 		<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;)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;" />
-		<method name="put(LE;)V" />
+		<method name="offer(Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Z" />
+		<method name="poll(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;" />
+		<method name="put(Ljava/lang/Object;)V" />
 		<method name="remainingCapacity()I" />
-		<method name="remove(Ljava/lang/Object;)Z" since="5" />
-		<method name="take()LE;" />
+		<method name="take()Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/concurrent/BrokenBarrierException" since="1">
 		<extends name="java/lang/Exception" />
@@ -37975,7 +37001,8 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/util/concurrent/Callable" since="1">
-		<method name="call()LV;" />
+		<extends name="java/lang/Object" />
+		<method name="call()Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/concurrent/CancellationException" since="1">
 		<extends name="java/lang/IllegalStateException" />
@@ -37983,16 +37010,17 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="java/util/concurrent/CompletionService" since="1">
+		<extends name="java/lang/Object" />
 		<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/lang/Runnable;Ljava/lang/Object;)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" />
-		<implements name="java/util/concurrent/ConcurrentMap" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/ConcurrentMap" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(IF)V" since="9" />
@@ -38000,161 +37028,80 @@
 		<method name="&lt;init>(Ljava/util/Map;)V" />
 		<method name="contains(Ljava/lang/Object;)Z" />
 		<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;" />
-		<method name="replace(LK;LV;LV;)Z" />
 	</class>
 	<class name="java/util/concurrent/ConcurrentLinkedQueue" since="1">
 		<extends name="java/util/AbstractQueue" />
-		<implements name="java/util/Queue" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/Queue" />
 		<method name="&lt;init>()V" />
 		<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;" />
-		<method name="size()I" />
 	</class>
 	<class name="java/util/concurrent/ConcurrentMap" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Map" />
-		<method name="putIfAbsent(LK;LV;)LV;" />
+		<method name="putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
 		<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="replace(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="replace(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z" />
 	</class>
 	<class name="java/util/concurrent/ConcurrentNavigableMap" since="9">
-		<implements name="java/util/concurrent/ConcurrentMap" />
+		<extends name="java/lang/Object" />
 		<implements name="java/util/NavigableMap" />
-		<method name="descendingKeySet()Ljava/util/NavigableSet;" />
+		<implements name="java/util/concurrent/ConcurrentMap" />
 		<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="headMap(Ljava/lang/Object;)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="headMap(Ljava/lang/Object;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;" />
+		<method name="subMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="subMap(Ljava/lang/Object;ZLjava/lang/Object;Z)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="tailMap(Ljava/lang/Object;)Ljava/util/concurrent/ConcurrentNavigableMap;" />
+		<method name="tailMap(Ljava/lang/Object;Z)Ljava/util/concurrent/ConcurrentNavigableMap;" />
 	</class>
 	<class name="java/util/concurrent/ConcurrentSkipListMap" since="9">
 		<extends name="java/util/AbstractMap" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/concurrent/ConcurrentNavigableMap" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()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;" />
-		<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;" />
-		<method name="floorKey(LK;)LK;" />
-		<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;" />
-		<method name="lastKey()LK;" />
-		<method name="lowerEntry(LK;)Ljava/util/Map$Entry;" />
-		<method name="lowerKey(LK;)LK;" />
-		<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;" />
-		<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" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/NavigableSet" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()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;" />
-		<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;" />
-		<method name="headSet(LE;Z)Ljava/util/NavigableSet;" />
-		<method name="higher(LE;)LE;" />
-		<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;" />
-		<method name="subSet(LE;ZLE;Z)Ljava/util/NavigableSet;" />
-		<method name="tailSet(LE;)Ljava/util/NavigableSet;" />
-		<method name="tailSet(LE;Z)Ljava/util/NavigableSet;" />
+		<method name="headSet(Ljava/lang/Object;)Ljava/util/NavigableSet;" />
+		<method name="subSet(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/NavigableSet;" />
+		<method name="tailSet(Ljava/lang/Object;)Ljava/util/NavigableSet;" />
 	</class>
 	<class name="java/util/concurrent/CopyOnWriteArrayList" since="1">
 		<extends name="java/lang/Object" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="java/util/List" />
 		<implements name="java/util/RandomAccess" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()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;)Z" />
-		<method name="addAll(Ljava/util/Collection;)Z" />
+		<method name="&lt;init>([Ljava/lang/Object;)V" />
 		<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;)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;" />
-		<method name="lastIndexOf(LE;I)I" />
-		<method name="lastIndexOf(Ljava/lang/Object;)I" />
-		<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;)Z" />
-		<method name="retainAll(Ljava/util/Collection;)Z" />
-		<method name="set(ILE;)LE;" />
-		<method name="size()I" />
-		<method name="subList(II)Ljava/util/List;" />
-		<method name="toArray()[Ljava/lang/Object;" />
-		<method name="toArray([LT;)[LT;" />
+		<method name="addIfAbsent(Ljava/lang/Object;)Z" />
+		<method name="indexOf(Ljava/lang/Object;I)I" />
+		<method name="lastIndexOf(Ljava/lang/Object;I)I" />
 	</class>
 	<class name="java/util/concurrent/CopyOnWriteArraySet" since="1">
 		<extends name="java/util/AbstractSet" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<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">
 		<extends name="java/lang/Object" />
@@ -38180,28 +37127,25 @@
 		<implements name="java/util/concurrent/BlockingQueue" />
 		<method name="&lt;init>()V" />
 		<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;" />
-		<method name="poll()LE;" />
-		<method name="poll(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="put(LE;)V" />
-		<method name="remainingCapacity()I" />
-		<method name="size()I" />
-		<method name="take()LE;" />
+		<method name="add(Ljava/util/concurrent/Delayed;)Z" />
+		<method name="offer(Ljava/util/concurrent/Delayed;)Z" />
+		<method name="offer(Ljava/util/concurrent/Delayed;JLjava/util/concurrent/TimeUnit;)Z" />
+		<method name="peek()Ljava/util/concurrent/Delayed;" />
+		<method name="poll()Ljava/util/concurrent/Delayed;" />
+		<method name="poll(JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/Delayed;" />
+		<method name="put(Ljava/util/concurrent/Delayed;)V" />
+		<method name="take()Ljava/util/concurrent/Delayed;" />
 	</class>
 	<class name="java/util/concurrent/Delayed" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Comparable" />
 		<method name="getDelay(Ljava/util/concurrent/TimeUnit;)J" />
 	</class>
 	<class name="java/util/concurrent/Exchanger" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="exchange(LV;)LV;" />
-		<method name="exchange(LV;JLjava/util/concurrent/TimeUnit;)LV;" />
+		<method name="exchange(Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="exchange(Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;" />
 	</class>
 	<class name="java/util/concurrent/ExecutionException" since="1">
 		<extends name="java/lang/Exception" />
@@ -38211,6 +37155,7 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/util/concurrent/Executor" since="1">
+		<extends name="java/lang/Object" />
 		<method name="execute(Ljava/lang/Runnable;)V" />
 	</class>
 	<class name="java/util/concurrent/ExecutorCompletionService" since="1">
@@ -38218,31 +37163,28 @@
 		<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;)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">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/Executor" />
 		<method name="awaitTermination(JLjava/util/concurrent/TimeUnit;)Z" />
 		<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="invokeAny(Ljava/util/Collection;)Ljava/lang/Object;" />
+		<method name="invokeAny(Ljava/util/Collection;JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;" />
 		<method name="isShutdown()Z" />
 		<method name="isTerminated()Z" />
 		<method name="shutdown()V" />
 		<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/lang/Runnable;Ljava/lang/Object;)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="&lt;init>()V" />
 		<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/lang/Runnable;Ljava/lang/Object;)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;" />
@@ -38263,116 +37205,50 @@
 		<method name="unconfigurableScheduledExecutorService(Ljava/util/concurrent/ScheduledExecutorService;)Ljava/util/concurrent/ScheduledExecutorService;" />
 	</class>
 	<class name="java/util/concurrent/Future" since="1">
+		<extends name="java/lang/Object" />
 		<method name="cancel(Z)Z" />
-		<method name="get()LV;" />
-		<method name="get(JLjava/util/concurrent/TimeUnit;)LV;" />
+		<method name="get()Ljava/lang/Object;" />
+		<method name="get(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;" />
 		<method name="isCancelled()Z" />
 		<method name="isDone()Z" />
 	</class>
 	<class name="java/util/concurrent/FutureTask" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/concurrent/Future" />
 		<implements name="java/lang/Runnable" />
+		<implements name="java/util/concurrent/Future" />
 		<implements name="java/util/concurrent/RunnableFuture" since="9" />
-		<method name="&lt;init>(Ljava/lang/Runnable;LV;)V" />
+		<method name="&lt;init>(Ljava/lang/Runnable;Ljava/lang/Object;)V" />
 		<method name="&lt;init>(Ljava/util/concurrent/Callable;)V" />
-		<method name="cancel(Z)Z" />
 		<method name="done()V" />
-		<method name="get()LV;" />
-		<method name="get(JLjava/util/concurrent/TimeUnit;)LV;" />
-		<method name="isCancelled()Z" />
-		<method name="isDone()Z" />
-		<method name="run()V" />
 		<method name="runAndReset()Z" />
-		<method name="set(LV;)V" />
+		<method name="set(Ljava/lang/Object;)V" />
 		<method name="setException(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/util/concurrent/LinkedBlockingDeque" since="9">
 		<extends name="java/util/AbstractQueue" />
-		<implements name="java/util/concurrent/BlockingDeque" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/BlockingDeque" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)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;" />
-		<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;" />
-		<method name="offer(LE;)Z" />
-		<method name="offer(LE;JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="offerFirst(LE;)Z" />
-		<method name="offerFirst(LE;JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="offerLast(LE;)Z" />
-		<method name="offerLast(LE;JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="peek()LE;" />
-		<method name="peekFirst()LE;" />
-		<method name="peekLast()LE;" />
-		<method name="poll()LE;" />
-		<method name="poll(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="pollFirst()LE;" />
-		<method name="pollFirst(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="pollLast()LE;" />
-		<method name="pollLast(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="pop()LE;" />
-		<method name="push(LE;)V" />
-		<method name="put(LE;)V" />
-		<method name="putFirst(LE;)V" />
-		<method name="putLast(LE;)V" />
-		<method name="remainingCapacity()I" />
-		<method name="removeFirst()LE;" />
-		<method name="removeFirstOccurrence(Ljava/lang/Object;)Z" />
-		<method name="removeLast()LE;" />
-		<method name="removeLastOccurrence(Ljava/lang/Object;)Z" />
-		<method name="size()I" />
-		<method name="take()LE;" />
-		<method name="takeFirst()LE;" />
-		<method name="takeLast()LE;" />
 	</class>
 	<class name="java/util/concurrent/LinkedBlockingQueue" since="1">
 		<extends name="java/util/AbstractQueue" />
-		<implements name="java/util/concurrent/BlockingQueue" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/BlockingQueue" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<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;" />
-		<method name="poll()LE;" />
-		<method name="poll(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="put(LE;)V" />
-		<method name="remainingCapacity()I" />
-		<method name="size()I" />
-		<method name="take()LE;" />
 	</class>
 	<class name="java/util/concurrent/PriorityBlockingQueue" since="1">
 		<extends name="java/util/AbstractQueue" />
-		<implements name="java/util/concurrent/BlockingQueue" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/BlockingQueue" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<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;" />
-		<method name="poll()LE;" />
-		<method name="poll(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="put(LE;)V" />
-		<method name="remainingCapacity()I" />
-		<method name="size()I" />
-		<method name="take()LE;" />
 	</class>
 	<class name="java/util/concurrent/RejectedExecutionException" since="1">
 		<extends name="java/lang/RuntimeException" />
@@ -38382,19 +37258,22 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="java/util/concurrent/RejectedExecutionHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="rejectedExecution(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V" />
 	</class>
 	<class name="java/util/concurrent/RunnableFuture" since="9">
-		<implements name="java/util/concurrent/Future" />
+		<extends name="java/lang/Object" />
 		<implements name="java/lang/Runnable" />
-		<method name="run()V" />
+		<implements name="java/util/concurrent/Future" />
 	</class>
 	<class name="java/util/concurrent/RunnableScheduledFuture" since="9">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/RunnableFuture" />
 		<implements name="java/util/concurrent/ScheduledFuture" />
 		<method name="isPeriodic()Z" />
 	</class>
 	<class name="java/util/concurrent/ScheduledExecutorService" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/ExecutorService" />
 		<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;" />
@@ -38402,6 +37281,7 @@
 		<method name="scheduleWithFixedDelay(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;" />
 	</class>
 	<class name="java/util/concurrent/ScheduledFuture" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/Delayed" />
 		<implements name="java/util/concurrent/Future" />
 	</class>
@@ -38416,10 +37296,6 @@
 		<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;" />
-		<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>
@@ -38448,24 +37324,13 @@
 	</class>
 	<class name="java/util/concurrent/SynchronousQueue" since="1">
 		<extends name="java/util/AbstractQueue" />
-		<implements name="java/util/concurrent/BlockingQueue" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/BlockingQueue" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Z)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;" />
-		<method name="poll()LE;" />
-		<method name="poll(JLjava/util/concurrent/TimeUnit;)LE;" />
-		<method name="put(LE;)V" />
-		<method name="remainingCapacity()I" />
-		<method name="size()I" />
-		<method name="take()LE;" />
 	</class>
 	<class name="java/util/concurrent/ThreadFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;" />
 	</class>
 	<class name="java/util/concurrent/ThreadPoolExecutor" since="1">
@@ -38477,9 +37342,7 @@
 		<method name="afterExecute(Ljava/lang/Runnable;Ljava/lang/Throwable;)V" />
 		<method name="allowCoreThreadTimeOut(Z)V" since="9" />
 		<method name="allowsCoreThreadTimeOut()Z" since="9" />
-		<method name="awaitTermination(JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="beforeExecute(Ljava/lang/Thread;Ljava/lang/Runnable;)V" />
-		<method name="execute(Ljava/lang/Runnable;)V" />
 		<method name="getActiveCount()I" />
 		<method name="getCompletedTaskCount()J" />
 		<method name="getCorePoolSize()I" />
@@ -38491,8 +37354,6 @@
 		<method name="getRejectedExecutionHandler()Ljava/util/concurrent/RejectedExecutionHandler;" />
 		<method name="getTaskCount()J" />
 		<method name="getThreadFactory()Ljava/util/concurrent/ThreadFactory;" />
-		<method name="isShutdown()Z" />
-		<method name="isTerminated()Z" />
 		<method name="isTerminating()Z" />
 		<method name="prestartAllCoreThreads()I" />
 		<method name="prestartCoreThread()Z" />
@@ -38503,33 +37364,27 @@
 		<method name="setMaximumPoolSize(I)V" />
 		<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;" />
 		<method name="terminated()V" />
 	</class>
 	<class name="java/util/concurrent/ThreadPoolExecutor$AbortPolicy" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/RejectedExecutionHandler" />
 		<method name="&lt;init>()V" />
-		<method name="rejectedExecution(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V" />
 	</class>
 	<class name="java/util/concurrent/ThreadPoolExecutor$CallerRunsPolicy" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/RejectedExecutionHandler" />
 		<method name="&lt;init>()V" />
-		<method name="rejectedExecution(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V" />
 	</class>
 	<class name="java/util/concurrent/ThreadPoolExecutor$DiscardOldestPolicy" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/RejectedExecutionHandler" />
 		<method name="&lt;init>()V" />
-		<method name="rejectedExecution(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V" />
 	</class>
 	<class name="java/util/concurrent/ThreadPoolExecutor$DiscardPolicy" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/concurrent/RejectedExecutionHandler" />
 		<method name="&lt;init>()V" />
-		<method name="rejectedExecution(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V" />
 	</class>
 	<class name="java/util/concurrent/TimeUnit" since="1">
 		<extends name="java/lang/Enum" />
@@ -38579,17 +37434,13 @@
 		<method name="addAndGet(I)I" />
 		<method name="compareAndSet(II)Z" />
 		<method name="decrementAndGet()I" />
-		<method name="doubleValue()D" />
-		<method name="floatValue()F" />
 		<method name="get()I" />
 		<method name="getAndAdd(I)I" />
 		<method name="getAndDecrement()I" />
 		<method name="getAndIncrement()I" />
 		<method name="getAndSet(I)I" />
 		<method name="incrementAndGet()I" />
-		<method name="intValue()I" />
 		<method name="lazySet(I)V" since="9" />
-		<method name="longValue()J" />
 		<method name="set(I)V" />
 		<method name="weakCompareAndSet(II)Z" />
 	</class>
@@ -38615,19 +37466,19 @@
 	<class name="java/util/concurrent/atomic/AtomicIntegerFieldUpdater" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="addAndGet(LT;I)I" />
-		<method name="compareAndSet(LT;II)Z" />
-		<method name="decrementAndGet(LT;)I" />
-		<method name="get(LT;)I" />
-		<method name="getAndAdd(LT;I)I" />
-		<method name="getAndDecrement(LT;)I" />
-		<method name="getAndIncrement(LT;)I" />
-		<method name="getAndSet(LT;I)I" />
-		<method name="incrementAndGet(LT;)I" />
-		<method name="lazySet(LT;I)V" since="9" />
+		<method name="addAndGet(Ljava/lang/Object;I)I" />
+		<method name="compareAndSet(Ljava/lang/Object;II)Z" />
+		<method name="decrementAndGet(Ljava/lang/Object;)I" />
+		<method name="get(Ljava/lang/Object;)I" />
+		<method name="getAndAdd(Ljava/lang/Object;I)I" />
+		<method name="getAndDecrement(Ljava/lang/Object;)I" />
+		<method name="getAndIncrement(Ljava/lang/Object;)I" />
+		<method name="getAndSet(Ljava/lang/Object;I)I" />
+		<method name="incrementAndGet(Ljava/lang/Object;)I" />
+		<method name="lazySet(Ljava/lang/Object;I)V" since="9" />
 		<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" />
+		<method name="set(Ljava/lang/Object;I)V" />
+		<method name="weakCompareAndSet(Ljava/lang/Object;II)Z" />
 	</class>
 	<class name="java/util/concurrent/atomic/AtomicLong" since="1">
 		<extends name="java/lang/Number" />
@@ -38637,17 +37488,13 @@
 		<method name="addAndGet(J)J" />
 		<method name="compareAndSet(JJ)Z" />
 		<method name="decrementAndGet()J" />
-		<method name="doubleValue()D" />
-		<method name="floatValue()F" />
 		<method name="get()J" />
 		<method name="getAndAdd(J)J" />
 		<method name="getAndDecrement()J" />
 		<method name="getAndIncrement()J" />
 		<method name="getAndSet(J)J" />
 		<method name="incrementAndGet()J" />
-		<method name="intValue()I" />
 		<method name="lazySet(J)V" since="9" />
-		<method name="longValue()J" />
 		<method name="set(J)V" />
 		<method name="weakCompareAndSet(JJ)Z" />
 	</class>
@@ -38673,77 +37520,77 @@
 	<class name="java/util/concurrent/atomic/AtomicLongFieldUpdater" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="addAndGet(LT;J)J" />
-		<method name="compareAndSet(LT;JJ)Z" />
-		<method name="decrementAndGet(LT;)J" />
-		<method name="get(LT;)J" />
-		<method name="getAndAdd(LT;J)J" />
-		<method name="getAndDecrement(LT;)J" />
-		<method name="getAndIncrement(LT;)J" />
-		<method name="getAndSet(LT;J)J" />
-		<method name="incrementAndGet(LT;)J" />
-		<method name="lazySet(LT;J)V" since="9" />
+		<method name="addAndGet(Ljava/lang/Object;J)J" />
+		<method name="compareAndSet(Ljava/lang/Object;JJ)Z" />
+		<method name="decrementAndGet(Ljava/lang/Object;)J" />
+		<method name="get(Ljava/lang/Object;)J" />
+		<method name="getAndAdd(Ljava/lang/Object;J)J" />
+		<method name="getAndDecrement(Ljava/lang/Object;)J" />
+		<method name="getAndIncrement(Ljava/lang/Object;)J" />
+		<method name="getAndSet(Ljava/lang/Object;J)J" />
+		<method name="incrementAndGet(Ljava/lang/Object;)J" />
+		<method name="lazySet(Ljava/lang/Object;J)V" since="9" />
 		<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" />
+		<method name="set(Ljava/lang/Object;J)V" />
+		<method name="weakCompareAndSet(Ljava/lang/Object;JJ)Z" />
 	</class>
 	<class name="java/util/concurrent/atomic/AtomicMarkableReference" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(LV;Z)V" />
-		<method name="attemptMark(LV;Z)Z" />
-		<method name="compareAndSet(LV;LV;ZZ)Z" />
-		<method name="get([Z)LV;" />
-		<method name="getReference()LV;" />
+		<method name="&lt;init>(Ljava/lang/Object;Z)V" />
+		<method name="attemptMark(Ljava/lang/Object;Z)Z" />
+		<method name="compareAndSet(Ljava/lang/Object;Ljava/lang/Object;ZZ)Z" />
+		<method name="get([Z)Ljava/lang/Object;" />
+		<method name="getReference()Ljava/lang/Object;" />
 		<method name="isMarked()Z" />
-		<method name="set(LV;Z)V" />
-		<method name="weakCompareAndSet(LV;LV;ZZ)Z" />
+		<method name="set(Ljava/lang/Object;Z)V" />
+		<method name="weakCompareAndSet(Ljava/lang/Object;Ljava/lang/Object;ZZ)Z" />
 	</class>
 	<class name="java/util/concurrent/atomic/AtomicReference" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
-		<method name="&lt;init>(LV;)V" />
-		<method name="compareAndSet(LV;LV;)Z" />
-		<method name="get()LV;" />
-		<method name="getAndSet(LV;)LV;" />
-		<method name="lazySet(LV;)V" since="9" />
-		<method name="set(LV;)V" />
-		<method name="weakCompareAndSet(LV;LV;)Z" />
+		<method name="&lt;init>(Ljava/lang/Object;)V" />
+		<method name="compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z" />
+		<method name="get()Ljava/lang/Object;" />
+		<method name="getAndSet(Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="lazySet(Ljava/lang/Object;)V" since="9" />
+		<method name="set(Ljava/lang/Object;)V" />
+		<method name="weakCompareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z" />
 	</class>
 	<class name="java/util/concurrent/atomic/AtomicReferenceArray" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>(I)V" />
-		<method name="&lt;init>([LE;)V" />
-		<method name="compareAndSet(ILE;LE;)Z" />
-		<method name="get(I)LE;" />
-		<method name="getAndSet(ILE;)LE;" />
-		<method name="lazySet(ILE;)V" since="9" />
+		<method name="&lt;init>([Ljava/lang/Object;)V" />
+		<method name="compareAndSet(ILjava/lang/Object;Ljava/lang/Object;)Z" />
+		<method name="get(I)Ljava/lang/Object;" />
+		<method name="getAndSet(ILjava/lang/Object;)Ljava/lang/Object;" />
+		<method name="lazySet(ILjava/lang/Object;)V" since="9" />
 		<method name="length()I" />
-		<method name="set(ILE;)V" />
-		<method name="weakCompareAndSet(ILE;LE;)Z" />
+		<method name="set(ILjava/lang/Object;)V" />
+		<method name="weakCompareAndSet(ILjava/lang/Object;Ljava/lang/Object;)Z" />
 	</class>
 	<class name="java/util/concurrent/atomic/AtomicReferenceFieldUpdater" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="compareAndSet(LT;LV;LV;)Z" />
-		<method name="get(LT;)LV;" />
-		<method name="getAndSet(LT;LV;)LV;" />
-		<method name="lazySet(LT;LV;)V" since="9" />
+		<method name="compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z" />
+		<method name="get(Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="getAndSet(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
+		<method name="lazySet(Ljava/lang/Object;Ljava/lang/Object;)V" since="9" />
 		<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" />
+		<method name="set(Ljava/lang/Object;Ljava/lang/Object;)V" />
+		<method name="weakCompareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z" />
 	</class>
 	<class name="java/util/concurrent/atomic/AtomicStampedReference" since="1">
 		<extends name="java/lang/Object" />
-		<method name="&lt;init>(LV;I)V" />
-		<method name="attemptStamp(LV;I)Z" />
-		<method name="compareAndSet(LV;LV;II)Z" />
-		<method name="get([I)LV;" />
-		<method name="getReference()LV;" />
+		<method name="&lt;init>(Ljava/lang/Object;I)V" />
+		<method name="attemptStamp(Ljava/lang/Object;I)Z" />
+		<method name="compareAndSet(Ljava/lang/Object;Ljava/lang/Object;II)Z" />
+		<method name="get([I)Ljava/lang/Object;" />
+		<method name="getReference()Ljava/lang/Object;" />
 		<method name="getStamp()I" />
-		<method name="set(LV;I)V" />
-		<method name="weakCompareAndSet(LV;LV;II)Z" />
+		<method name="set(Ljava/lang/Object;I)V" />
+		<method name="weakCompareAndSet(Ljava/lang/Object;Ljava/lang/Object;II)Z" />
 	</class>
 	<class name="java/util/concurrent/locks/AbstractOwnableSynchronizer" since="5">
 		<extends name="java/lang/Object" />
@@ -38787,23 +37634,16 @@
 	</class>
 	<class name="java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject" since="9">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/concurrent/locks/Condition" />
 		<implements name="java/io/Serializable" />
-		<method name="&lt;init>()V" />
-		<method name="await()V" />
-		<method name="await(JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="awaitNanos(J)J" />
-		<method name="awaitUninterruptibly()V" />
-		<method name="awaitUntil(Ljava/util/Date;)Z" />
+		<implements name="java/util/concurrent/locks/Condition" />
+		<method name="&lt;init>(Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer;)V" />
 		<method name="getWaitQueueLength()I" />
 		<method name="getWaitingThreads()Ljava/util/Collection;" />
 		<method name="hasWaiters()Z" />
-		<method name="signal()V" />
-		<method name="signalAll()V" />
 	</class>
 	<class name="java/util/concurrent/locks/AbstractQueuedSynchronizer" since="1">
 		<extends name="java/lang/Object" />
-		<extends name="java/util/concurrent/locks/AbstractOwnableSynchronizer" since="4" />
+		<extends name="java/util/concurrent/locks/AbstractOwnableSynchronizer" since="5" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()V" />
 		<method name="acquire(I)V" />
@@ -38837,21 +37677,15 @@
 	</class>
 	<class name="java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/concurrent/locks/Condition" />
 		<implements name="java/io/Serializable" />
-		<method name="&lt;init>()V" />
-		<method name="await()V" />
-		<method name="await(JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="awaitNanos(J)J" />
-		<method name="awaitUninterruptibly()V" />
-		<method name="awaitUntil(Ljava/util/Date;)Z" />
+		<implements name="java/util/concurrent/locks/Condition" />
+		<method name="&lt;init>(Ljava/util/concurrent/locks/AbstractQueuedSynchronizer;)V" />
 		<method name="getWaitQueueLength()I" />
 		<method name="getWaitingThreads()Ljava/util/Collection;" />
 		<method name="hasWaiters()Z" />
-		<method name="signal()V" />
-		<method name="signalAll()V" />
 	</class>
 	<class name="java/util/concurrent/locks/Condition" since="1">
+		<extends name="java/lang/Object" />
 		<method name="await()V" />
 		<method name="await(JLjava/util/concurrent/TimeUnit;)Z" />
 		<method name="awaitNanos(J)J" />
@@ -38861,6 +37695,7 @@
 		<method name="signalAll()V" />
 	</class>
 	<class name="java/util/concurrent/locks/Lock" since="1">
+		<extends name="java/lang/Object" />
 		<method name="lock()V" />
 		<method name="lockInterruptibly()V" />
 		<method name="newCondition()Ljava/util/concurrent/locks/Condition;" />
@@ -38870,6 +37705,7 @@
 	</class>
 	<class name="java/util/concurrent/locks/LockSupport" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getBlocker(Ljava/lang/Thread;)Ljava/lang/Object;" since="9" />
 		<method name="park()V" />
 		<method name="park(Ljava/lang/Object;)V" since="9" />
@@ -38880,13 +37716,14 @@
 		<method name="unpark(Ljava/lang/Thread;)V" />
 	</class>
 	<class name="java/util/concurrent/locks/ReadWriteLock" since="1">
+		<extends name="java/lang/Object" />
 		<method name="readLock()Ljava/util/concurrent/locks/Lock;" />
 		<method name="writeLock()Ljava/util/concurrent/locks/Lock;" />
 	</class>
 	<class name="java/util/concurrent/locks/ReentrantLock" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/concurrent/locks/Lock" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/locks/Lock" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Z)V" />
 		<method name="getHoldCount()I" />
@@ -38901,17 +37738,11 @@
 		<method name="isFair()Z" />
 		<method name="isHeldByCurrentThread()Z" />
 		<method name="isLocked()Z" />
-		<method name="lock()V" />
-		<method name="lockInterruptibly()V" />
-		<method name="newCondition()Ljava/util/concurrent/locks/Condition;" />
-		<method name="tryLock()Z" />
-		<method name="tryLock(JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="unlock()V" />
 	</class>
 	<class name="java/util/concurrent/locks/ReentrantReadWriteLock" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/concurrent/locks/ReadWriteLock" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/locks/ReadWriteLock" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Z)V" />
 		<method name="getOwner()Ljava/lang/Thread;" />
@@ -38935,29 +37766,17 @@
 	</class>
 	<class name="java/util/concurrent/locks/ReentrantReadWriteLock$ReadLock" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/concurrent/locks/Lock" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/locks/Lock" />
 		<method name="&lt;init>(Ljava/util/concurrent/locks/ReentrantReadWriteLock;)V" />
-		<method name="lock()V" />
-		<method name="lockInterruptibly()V" />
-		<method name="newCondition()Ljava/util/concurrent/locks/Condition;" />
-		<method name="tryLock()Z" />
-		<method name="tryLock(JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="unlock()V" />
 	</class>
 	<class name="java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/concurrent/locks/Lock" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/concurrent/locks/Lock" />
 		<method name="&lt;init>(Ljava/util/concurrent/locks/ReentrantReadWriteLock;)V" />
 		<method name="getHoldCount()I" since="9" />
 		<method name="isHeldByCurrentThread()Z" since="9" />
-		<method name="lock()V" />
-		<method name="lockInterruptibly()V" />
-		<method name="newCondition()Ljava/util/concurrent/locks/Condition;" />
-		<method name="tryLock()Z" />
-		<method name="tryLock(JLjava/util/concurrent/TimeUnit;)Z" />
-		<method name="unlock()V" />
 	</class>
 	<class name="java/util/jar/Attributes" since="1">
 		<extends name="java/lang/Object" />
@@ -38966,22 +37785,9 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="&lt;init>(Ljava/util/jar/Attributes;)V" />
-		<method name="clear()V" />
-		<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;" />
-		<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;" />
-		<method name="put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" />
-		<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;" />
 		<field name="map" />
 	</class>
 	<class name="java/util/jar/Attributes$Name" since="1">
@@ -39049,7 +37855,6 @@
 		<method name="&lt;init>(Ljava/io/InputStream;)V" />
 		<method name="&lt;init>(Ljava/util/jar/Manifest;)V" />
 		<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;" />
 		<method name="getMainAttributes()Ljava/util/jar/Attributes;" />
@@ -39058,10 +37863,12 @@
 	</class>
 	<class name="java/util/jar/Pack200" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="newPacker()Ljava/util/jar/Pack200$Packer;" />
 		<method name="newUnpacker()Ljava/util/jar/Pack200$Unpacker;" />
 	</class>
 	<class name="java/util/jar/Pack200$Packer" since="1">
+		<extends name="java/lang/Object" />
 		<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" />
@@ -39088,6 +37895,7 @@
 		<field name="UNKNOWN_ATTRIBUTE" />
 	</class>
 	<class name="java/util/jar/Pack200$Unpacker" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addPropertyChangeListener(Ljava/beans/PropertyChangeListener;)V" since="3" />
 		<method name="properties()Ljava/util/SortedMap;" />
 		<method name="removePropertyChangeListener(Ljava/beans/PropertyChangeListener;)V" since="3" />
@@ -39123,6 +37931,7 @@
 		<method name="&lt;init>(Ljava/lang/String;Z)V" />
 	</class>
 	<class name="java/util/logging/Filter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="isLoggable(Ljava/util/logging/LogRecord;)Z" />
 	</class>
 	<class name="java/util/logging/Formatter" since="1">
@@ -39162,7 +37971,6 @@
 		<method name="getResourceBundleName()Ljava/lang/String;" />
 		<method name="intValue()I" />
 		<method name="parse(Ljava/lang/String;)Ljava/util/logging/Level;" />
-		<method name="toString()Ljava/lang/String;" />
 		<field name="ALL" />
 		<field name="CONFIG" />
 		<field name="FINE" />
@@ -39271,6 +38079,7 @@
 		<field name="global" />
 	</class>
 	<class name="java/util/logging/LoggingMXBean" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getLoggerLevel(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getLoggerNames()Ljava/util/List;" />
 		<method name="getParentLoggerName(Ljava/lang/String;)Ljava/lang/String;" />
@@ -39278,25 +38087,21 @@
 	</class>
 	<class name="java/util/logging/LoggingPermission" since="1">
 		<extends name="java/security/BasicPermission" />
-		<implements name="java/security/Guard" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/security/Guard" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
 	<class name="java/util/logging/MemoryHandler" since="1">
 		<extends name="java/util/logging/Handler" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/util/logging/Handler;ILjava/util/logging/Level;)V" />
-		<method name="close()V" />
-		<method name="flush()V" />
 		<method name="getPushLevel()Ljava/util/logging/Level;" />
-		<method name="publish(Ljava/util/logging/LogRecord;)V" />
 		<method name="push()V" />
 		<method name="setPushLevel(Ljava/util/logging/Level;)V" />
 	</class>
 	<class name="java/util/logging/SimpleFormatter" since="1">
 		<extends name="java/util/logging/Formatter" />
 		<method name="&lt;init>()V" />
-		<method name="format(Ljava/util/logging/LogRecord;)Ljava/lang/String;" />
 	</class>
 	<class name="java/util/logging/SocketHandler" since="1">
 		<extends name="java/util/logging/StreamHandler" />
@@ -39307,65 +38112,27 @@
 		<extends name="java/util/logging/Handler" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/io/OutputStream;Ljava/util/logging/Formatter;)V" />
-		<method name="close()V" />
-		<method name="flush()V" />
-		<method name="publish(Ljava/util/logging/LogRecord;)V" />
 		<method name="setOutputStream(Ljava/io/OutputStream;)V" />
 	</class>
 	<class name="java/util/logging/XMLFormatter" since="1">
 		<extends name="java/util/logging/Formatter" />
 		<method name="&lt;init>()V" />
-		<method name="format(Ljava/util/logging/LogRecord;)Ljava/lang/String;" />
 	</class>
 	<class name="java/util/prefs/AbstractPreferences" since="1">
 		<extends name="java/util/prefs/Preferences" />
 		<method name="&lt;init>(Ljava/util/prefs/AbstractPreferences;Ljava/lang/String;)V" />
-		<method name="absolutePath()Ljava/lang/String;" />
-		<method name="addNodeChangeListener(Ljava/util/prefs/NodeChangeListener;)V" />
-		<method name="addPreferenceChangeListener(Ljava/util/prefs/PreferenceChangeListener;)V" />
 		<method name="cachedChildren()[Ljava/util/prefs/AbstractPreferences;" />
 		<method name="childSpi(Ljava/lang/String;)Ljava/util/prefs/AbstractPreferences;" />
-		<method name="childrenNames()[Ljava/lang/String;" />
 		<method name="childrenNamesSpi()[Ljava/lang/String;" />
-		<method name="clear()V" />
-		<method name="exportNode(Ljava/io/OutputStream;)V" />
-		<method name="exportSubtree(Ljava/io/OutputStream;)V" />
-		<method name="flush()V" />
 		<method name="flushSpi()V" />
-		<method name="get(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getBoolean(Ljava/lang/String;Z)Z" />
-		<method name="getByteArray(Ljava/lang/String;[B)[B" />
 		<method name="getChild(Ljava/lang/String;)Ljava/util/prefs/AbstractPreferences;" />
-		<method name="getDouble(Ljava/lang/String;D)D" />
-		<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="getSpi(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="isRemoved()Z" />
-		<method name="isUserNode()Z" />
-		<method name="keys()[Ljava/lang/String;" />
 		<method name="keysSpi()[Ljava/lang/String;" />
-		<method name="name()Ljava/lang/String;" />
-		<method name="node(Ljava/lang/String;)Ljava/util/prefs/Preferences;" />
-		<method name="nodeExists(Ljava/lang/String;)Z" />
-		<method name="parent()Ljava/util/prefs/Preferences;" />
-		<method name="put(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="putBoolean(Ljava/lang/String;Z)V" />
-		<method name="putByteArray(Ljava/lang/String;[B)V" />
-		<method name="putDouble(Ljava/lang/String;D)V" />
-		<method name="putFloat(Ljava/lang/String;F)V" />
-		<method name="putInt(Ljava/lang/String;I)V" />
-		<method name="putLong(Ljava/lang/String;J)V" />
 		<method name="putSpi(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="remove(Ljava/lang/String;)V" />
-		<method name="removeNode()V" />
-		<method name="removeNodeChangeListener(Ljava/util/prefs/NodeChangeListener;)V" />
 		<method name="removeNodeSpi()V" />
-		<method name="removePreferenceChangeListener(Ljava/util/prefs/PreferenceChangeListener;)V" />
 		<method name="removeSpi(Ljava/lang/String;)V" />
-		<method name="sync()V" />
 		<method name="syncSpi()V" />
-		<method name="toString()Ljava/lang/String;" />
 		<field name="lock" />
 		<field name="newNode" />
 	</class>
@@ -39388,6 +38155,7 @@
 		<method name="getParent()Ljava/util/prefs/Preferences;" />
 	</class>
 	<class name="java/util/prefs/NodeChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/EventListener" />
 		<method name="childAdded(Ljava/util/prefs/NodeChangeEvent;)V" />
 		<method name="childRemoved(Ljava/util/prefs/NodeChangeEvent;)V" />
@@ -39401,6 +38169,7 @@
 		<method name="getNode()Ljava/util/prefs/Preferences;" />
 	</class>
 	<class name="java/util/prefs/PreferenceChangeListener" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/EventListener" />
 		<method name="preferenceChange(Ljava/util/prefs/PreferenceChangeEvent;)V" />
 	</class>
@@ -39443,7 +38212,6 @@
 		<method name="sync()V" />
 		<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;)Ljava/util/prefs/Preferences;" />
 		<method name="userRoot()Ljava/util/prefs/Preferences;" />
 		<field name="MAX_KEY_LENGTH" />
@@ -39451,10 +38219,12 @@
 		<field name="MAX_VALUE_LENGTH" />
 	</class>
 	<class name="java/util/prefs/PreferencesFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="systemRoot()Ljava/util/prefs/Preferences;" />
 		<method name="userRoot()Ljava/util/prefs/Preferences;" />
 	</class>
 	<class name="java/util/regex/MatchResult" since="1">
+		<extends name="java/lang/Object" />
 		<method name="end()I" />
 		<method name="end(I)I" />
 		<method name="group()Ljava/lang/String;" />
@@ -39466,15 +38236,11 @@
 	<class name="java/util/regex/Matcher" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/regex/MatchResult" />
+		<method name="&lt;init>()V" />
 		<method name="appendReplacement(Ljava/lang/StringBuffer;Ljava/lang/String;)Ljava/util/regex/Matcher;" />
 		<method name="appendTail(Ljava/lang/StringBuffer;)Ljava/lang/StringBuffer;" />
-		<method name="end()I" />
-		<method name="end(I)I" />
 		<method name="find()Z" />
 		<method name="find(I)Z" />
-		<method name="group()Ljava/lang/String;" />
-		<method name="group(I)Ljava/lang/String;" />
-		<method name="groupCount()I" />
 		<method name="hasAnchoringBounds()Z" />
 		<method name="hasTransparentBounds()Z" />
 		<method name="hitEnd()Z" />
@@ -39490,8 +38256,6 @@
 		<method name="requireEnd()Z" />
 		<method name="reset()Ljava/util/regex/Matcher;" />
 		<method name="reset(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;" />
-		<method name="start()I" />
-		<method name="start(I)I" />
 		<method name="toMatchResult()Ljava/util/regex/MatchResult;" />
 		<method name="useAnchoringBounds(Z)Ljava/util/regex/Matcher;" />
 		<method name="usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;" />
@@ -39500,6 +38264,7 @@
 	<class name="java/util/regex/Pattern" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
+		<method name="&lt;init>()V" />
 		<method name="compile(Ljava/lang/String;)Ljava/util/regex/Pattern;" />
 		<method name="compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;" />
 		<method name="flags()I" />
@@ -39529,21 +38294,13 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/util/zip/Checksum" />
 		<method name="&lt;init>()V" />
-		<method name="getValue()J" />
-		<method name="reset()V" />
-		<method name="update(I)V" />
 		<method name="update([B)V" />
-		<method name="update([BII)V" />
 	</class>
 	<class name="java/util/zip/CRC32" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/util/zip/Checksum" />
 		<method name="&lt;init>()V" />
-		<method name="getValue()J" />
-		<method name="reset()V" />
-		<method name="update(I)V" />
 		<method name="update([B)V" />
-		<method name="update([BII)V" />
 	</class>
 	<class name="java/util/zip/CheckedInputStream" since="1">
 		<extends name="java/io/FilterInputStream" />
@@ -39556,6 +38313,7 @@
 		<method name="getChecksum()Ljava/util/zip/Checksum;" />
 	</class>
 	<class name="java/util/zip/Checksum" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getValue()J" />
 		<method name="reset()V" />
 		<method name="update(I)V" />
@@ -39676,7 +38434,6 @@
 		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/util/zip/ZipEntry;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getComment()Ljava/lang/String;" />
 		<method name="getCompressedSize()J" />
 		<method name="getCrc()J" />
@@ -39924,7 +38681,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>(Ljavax/crypto/MacSpi;Ljava/security/Provider;Ljava/lang/String;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="doFinal()[B" />
 		<method name="doFinal([B)[B" />
 		<method name="doFinal([BI)V" />
@@ -39945,7 +38701,6 @@
 	<class name="javax/crypto/MacSpi" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="engineDoFinal()[B" />
 		<method name="engineGetMacLength()I" />
 		<method name="engineInit(Ljava/security/Key;Ljava/security/spec/AlgorithmParameterSpec;)V" />
@@ -39975,6 +38730,7 @@
 		<field name="encodedParams" />
 	</class>
 	<class name="javax/crypto/SecretKey" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/security/Key" />
 		<field name="serialVersionUID" />
 	</class>
@@ -40003,21 +38759,25 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="javax/crypto/interfaces/DHKey" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getParams()Ljavax/crypto/spec/DHParameterSpec;" />
 	</class>
 	<class name="javax/crypto/interfaces/DHPrivateKey" since="1">
-		<implements name="javax/crypto/interfaces/DHKey" />
+		<extends name="java/lang/Object" />
 		<implements name="java/security/PrivateKey" />
+		<implements name="javax/crypto/interfaces/DHKey" />
 		<method name="getX()Ljava/math/BigInteger;" />
 		<field name="serialVersionUID" />
 	</class>
 	<class name="javax/crypto/interfaces/DHPublicKey" since="1">
-		<implements name="javax/crypto/interfaces/DHKey" />
+		<extends name="java/lang/Object" />
 		<implements name="java/security/PublicKey" />
+		<implements name="javax/crypto/interfaces/DHKey" />
 		<method name="getY()Ljava/math/BigInteger;" />
 		<field name="serialVersionUID" />
 	</class>
 	<class name="javax/crypto/interfaces/PBEKey" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/crypto/SecretKey" />
 		<method name="getIterationCount()I" />
 		<method name="getPassword()[C" />
@@ -40144,18 +38904,17 @@
 	</class>
 	<class name="javax/crypto/spec/SecretKeySpec" since="1">
 		<extends name="java/lang/Object" />
+		<implements name="java/io/Serializable" />
 		<implements name="java/security/spec/KeySpec" />
 		<implements name="javax/crypto/SecretKey" />
-		<implements name="java/io/Serializable" />
 		<method name="&lt;init>([BIILjava/lang/String;)V" />
 		<method name="&lt;init>([BLjava/lang/String;)V" />
-		<method name="getAlgorithm()Ljava/lang/String;" />
-		<method name="getEncoded()[B" />
-		<method name="getFormat()Ljava/lang/String;" />
 	</class>
 	<class name="javax/microedition/khronos/egl/EGL" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="javax/microedition/khronos/egl/EGL10" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/microedition/khronos/egl/EGL" />
 		<method name="eglChooseConfig(Ljavax/microedition/khronos/egl/EGLDisplay;[I[Ljavax/microedition/khronos/egl/EGLConfig;I[I)Z" />
 		<method name="eglCopyBuffers(Ljavax/microedition/khronos/egl/EGLDisplay;Ljavax/microedition/khronos/egl/EGLSurface;Ljava/lang/Object;)Z" />
@@ -40254,6 +39013,7 @@
 		<field name="EGL_WINDOW_BIT" />
 	</class>
 	<class name="javax/microedition/khronos/egl/EGL11" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/microedition/khronos/egl/EGL10" />
 		<field name="EGL_CONTEXT_LOST" />
 	</class>
@@ -40276,8 +39036,10 @@
 		<method name="&lt;init>()V" />
 	</class>
 	<class name="javax/microedition/khronos/opengles/GL" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="javax/microedition/khronos/opengles/GL10" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/microedition/khronos/opengles/GL" />
 		<method name="glActiveTexture(I)V" />
 		<method name="glAlphaFunc(IF)V" />
@@ -40641,11 +39403,13 @@
 		<field name="GL_ZERO" />
 	</class>
 	<class name="javax/microedition/khronos/opengles/GL10Ext" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/microedition/khronos/opengles/GL" />
 		<method name="glQueryMatrixxOES(Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)I" />
 		<method name="glQueryMatrixxOES([II[II)I" />
 	</class>
 	<class name="javax/microedition/khronos/opengles/GL11" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/microedition/khronos/opengles/GL10" />
 		<method name="glBindBuffer(II)V" />
 		<method name="glBufferData(IILjava/nio/Buffer;I)V" />
@@ -40839,6 +39603,7 @@
 		<field name="GL_WRITE_ONLY" />
 	</class>
 	<class name="javax/microedition/khronos/opengles/GL11Ext" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/microedition/khronos/opengles/GL" />
 		<method name="glCurrentPaletteMatrixOES(I)V" />
 		<method name="glDrawTexfOES(FFFFF)V" />
@@ -40879,6 +39644,7 @@
 		<field name="GL_WEIGHT_ARRAY_TYPE_OES" />
 	</class>
 	<class name="javax/microedition/khronos/opengles/GL11ExtensionPack" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/microedition/khronos/opengles/GL" />
 		<method name="glBindFramebufferOES(II)V" />
 		<method name="glBindRenderbufferOES(II)V" />
@@ -41059,10 +39825,12 @@
 		<method name="getSocket()Ljavax/net/ssl/SSLSocket;" />
 	</class>
 	<class name="javax/net/ssl/HandshakeCompletedListener" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/EventListener" />
 		<method name="handshakeCompleted(Ljavax/net/ssl/HandshakeCompletedEvent;)V" />
 	</class>
 	<class name="javax/net/ssl/HostnameVerifier" since="1">
+		<extends name="java/lang/Object" />
 		<method name="verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z" />
 	</class>
 	<class name="javax/net/ssl/HttpsURLConnection" since="1">
@@ -41084,6 +39852,7 @@
 		<field name="hostnameVerifier" />
 	</class>
 	<class name="javax/net/ssl/KeyManager" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="javax/net/ssl/KeyManagerFactory" since="1">
 		<extends name="java/lang/Object" />
@@ -41113,6 +39882,7 @@
 		<method name="getParameters()Ljava/util/List;" />
 	</class>
 	<class name="javax/net/ssl/ManagerFactoryParameters" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="javax/net/ssl/SSLContext" since="1">
 		<extends name="java/lang/Object" />
@@ -41276,11 +40046,11 @@
 	<class name="javax/net/ssl/SSLServerSocketFactory" since="1">
 		<extends name="javax/net/ServerSocketFactory" />
 		<method name="&lt;init>()V" />
-		<method name="getDefault()Ljavax/net/ServerSocketFactory;" />
 		<method name="getDefaultCipherSuites()[Ljava/lang/String;" />
 		<method name="getSupportedCipherSuites()[Ljava/lang/String;" />
 	</class>
 	<class name="javax/net/ssl/SSLSession" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getApplicationBufferSize()I" />
 		<method name="getCipherSuite()Ljava/lang/String;" />
 		<method name="getCreationTime()J" />
@@ -41311,11 +40081,13 @@
 		<method name="getSession()Ljavax/net/ssl/SSLSession;" />
 	</class>
 	<class name="javax/net/ssl/SSLSessionBindingListener" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/EventListener" />
 		<method name="valueBound(Ljavax/net/ssl/SSLSessionBindingEvent;)V" />
 		<method name="valueUnbound(Ljavax/net/ssl/SSLSessionBindingEvent;)V" />
 	</class>
 	<class name="javax/net/ssl/SSLSessionContext" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getIds()Ljava/util/Enumeration;" />
 		<method name="getSession([B)Ljavax/net/ssl/SSLSession;" />
 		<method name="getSessionCacheSize()I" />
@@ -41355,11 +40127,11 @@
 		<extends name="javax/net/SocketFactory" />
 		<method name="&lt;init>()V" />
 		<method name="createSocket(Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;" />
-		<method name="getDefault()Ljavax/net/SocketFactory;" />
 		<method name="getDefaultCipherSuites()[Ljava/lang/String;" />
 		<method name="getSupportedCipherSuites()[Ljava/lang/String;" />
 	</class>
 	<class name="javax/net/ssl/TrustManager" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="javax/net/ssl/TrustManagerFactory" since="1">
 		<extends name="java/lang/Object" />
@@ -41389,6 +40161,7 @@
 		<method name="chooseEngineServerAlias(Ljava/lang/String;[Ljava/security/Principal;Ljavax/net/ssl/SSLEngine;)Ljava/lang/String;" />
 	</class>
 	<class name="javax/net/ssl/X509KeyManager" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/net/ssl/KeyManager" />
 		<method name="chooseClientAlias([Ljava/lang/String;[Ljava/security/Principal;Ljava/net/Socket;)Ljava/lang/String;" />
 		<method name="chooseServerAlias(Ljava/lang/String;[Ljava/security/Principal;Ljava/net/Socket;)Ljava/lang/String;" />
@@ -41398,6 +40171,7 @@
 		<method name="getServerAliases(Ljava/lang/String;[Ljava/security/Principal;)[Ljava/lang/String;" />
 	</class>
 	<class name="javax/net/ssl/X509TrustManager" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/net/ssl/TrustManager" />
 		<method name="checkClientTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;)V" />
 		<method name="checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;)V" />
@@ -41414,31 +40188,24 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="javax/security/auth/Destroyable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="destroy()V" />
 		<method name="isDestroyed()Z" />
 	</class>
 	<class name="javax/security/auth/PrivateCredentialPermission" since="1">
 		<extends name="java/security/Permission" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="getActions()Ljava/lang/String;" />
 		<method name="getCredentialClass()Ljava/lang/String;" />
 		<method name="getPrincipals()[[Ljava/lang/String;" />
-		<method name="hashCode()I" />
-		<method name="implies(Ljava/security/Permission;)Z" />
 	</class>
 	<class name="javax/security/auth/Subject" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/io/Serializable" />
 		<method name="&lt;init>()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/PrivilegedExceptionAction;)LT;" since="9" />
 		<method name="doAs(Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;" />
-		<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/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="getPrincipals()Ljava/util/Set;" />
 		<method name="getPrincipals(Ljava/lang/Class;)Ljava/util/Set;" />
@@ -41454,18 +40221,19 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/security/DomainCombiner" />
 		<method name="&lt;init>(Ljavax/security/auth/Subject;)V" />
-		<method name="combine([Ljava/security/ProtectionDomain;[Ljava/security/ProtectionDomain;)[Ljava/security/ProtectionDomain;" />
 		<method name="getSubject()Ljavax/security/auth/Subject;" />
 	</class>
 	<class name="javax/security/auth/callback/Callback" since="1">
+		<extends name="java/lang/Object" />
 	</class>
 	<class name="javax/security/auth/callback/CallbackHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="handle([Ljavax/security/auth/callback/Callback;)V" />
 	</class>
 	<class name="javax/security/auth/callback/PasswordCallback" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="javax/security/auth/callback/Callback" />
 		<implements name="java/io/Serializable" />
+		<implements name="javax/security/auth/callback/Callback" />
 		<method name="&lt;init>(Ljava/lang/String;Z)V" />
 		<method name="clearPassword()V" />
 		<method name="getPassword()[C" />
@@ -41486,14 +40254,13 @@
 	</class>
 	<class name="javax/security/auth/x500/X500Principal" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/security/Principal" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/security/Principal" />
 		<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;)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;)Ljava/lang/String;" since="9" />
 		<field name="CANONICAL" />
@@ -41505,7 +40272,6 @@
 		<method name="&lt;init>()V" />
 		<method name="getEncoded()[B" />
 		<method name="getPublicKey()Ljava/security/PublicKey;" />
-		<method name="toString()Ljava/lang/String;" />
 		<method name="verify(Ljava/security/PublicKey;)V" />
 		<method name="verify(Ljava/security/PublicKey;Ljava/lang/String;)V" />
 	</class>
@@ -41552,6 +40318,7 @@
 		<method name="getVersion()I" />
 	</class>
 	<class name="javax/sql/CommonDataSource" since="9">
+		<extends name="java/lang/Object" />
 		<method name="getLogWriter()Ljava/io/PrintWriter;" />
 		<method name="getLoginTimeout()I" />
 		<method name="setLogWriter(Ljava/io/PrintWriter;)V" />
@@ -41565,11 +40332,13 @@
 		<method name="getSQLException()Ljava/sql/SQLException;" />
 	</class>
 	<class name="javax/sql/ConnectionEventListener" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/EventListener" />
 		<method name="connectionClosed(Ljavax/sql/ConnectionEvent;)V" />
 		<method name="connectionErrorOccurred(Ljavax/sql/ConnectionEvent;)V" />
 	</class>
 	<class name="javax/sql/ConnectionPoolDataSource" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/sql/CommonDataSource" since="9" />
 		<method name="getLogWriter()Ljava/io/PrintWriter;" />
 		<method name="getLoginTimeout()I" />
@@ -41579,8 +40348,9 @@
 		<method name="setLoginTimeout(I)V" />
 	</class>
 	<class name="javax/sql/DataSource" since="1">
-		<implements name="javax/sql/CommonDataSource" since="9" />
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/Wrapper" since="9" />
+		<implements name="javax/sql/CommonDataSource" since="9" />
 		<method name="getConnection()Ljava/sql/Connection;" />
 		<method name="getConnection(Ljava/lang/String;Ljava/lang/String;)Ljava/sql/Connection;" />
 		<method name="getLogWriter()Ljava/io/PrintWriter;" />
@@ -41589,6 +40359,7 @@
 		<method name="setLoginTimeout(I)V" />
 	</class>
 	<class name="javax/sql/PooledConnection" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addConnectionEventListener(Ljavax/sql/ConnectionEventListener;)V" />
 		<method name="addStatementEventListener(Ljavax/sql/StatementEventListener;)V" since="9" />
 		<method name="close()V" />
@@ -41597,6 +40368,7 @@
 		<method name="removeStatementEventListener(Ljavax/sql/StatementEventListener;)V" since="9" />
 	</class>
 	<class name="javax/sql/RowSet" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/ResultSet" />
 		<method name="addRowSetListener(Ljavax/sql/RowSetListener;)V" />
 		<method name="clearParameters()V" />
@@ -41720,6 +40492,7 @@
 		<method name="&lt;init>(Ljavax/sql/RowSet;)V" />
 	</class>
 	<class name="javax/sql/RowSetInternal" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getConnection()Ljava/sql/Connection;" />
 		<method name="getOriginal()Ljava/sql/ResultSet;" />
 		<method name="getOriginalRow()Ljava/sql/ResultSet;" />
@@ -41727,12 +40500,14 @@
 		<method name="setMetaData(Ljavax/sql/RowSetMetaData;)V" />
 	</class>
 	<class name="javax/sql/RowSetListener" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/EventListener" />
 		<method name="cursorMoved(Ljavax/sql/RowSetEvent;)V" />
 		<method name="rowChanged(Ljavax/sql/RowSetEvent;)V" />
 		<method name="rowSetChanged(Ljavax/sql/RowSetEvent;)V" />
 	</class>
 	<class name="javax/sql/RowSetMetaData" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/sql/ResultSetMetaData" />
 		<method name="setAutoIncrement(IZ)V" />
 		<method name="setCaseSensitive(IZ)V" />
@@ -41753,9 +40528,11 @@
 		<method name="setTableName(ILjava/lang/String;)V" />
 	</class>
 	<class name="javax/sql/RowSetReader" since="1">
+		<extends name="java/lang/Object" />
 		<method name="readData(Ljavax/sql/RowSetInternal;)V" />
 	</class>
 	<class name="javax/sql/RowSetWriter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="writeData(Ljavax/sql/RowSetInternal;)Z" />
 	</class>
 	<class name="javax/sql/StatementEvent" since="9">
@@ -41766,6 +40543,7 @@
 		<method name="getStatement()Ljava/sql/PreparedStatement;" />
 	</class>
 	<class name="javax/sql/StatementEventListener" since="9">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/EventListener" />
 		<method name="statementClosed(Ljavax/sql/StatementEvent;)V" />
 		<method name="statementErrorOccurred(Ljavax/sql/StatementEvent;)V" />
@@ -41795,6 +40573,7 @@
 	</class>
 	<class name="javax/xml/datatype/DatatypeConstants" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="APRIL" />
 		<field name="AUGUST" />
 		<field name="DATE" />
@@ -41834,6 +40613,7 @@
 	</class>
 	<class name="javax/xml/datatype/DatatypeConstants$Field" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getId()I" />
 	</class>
 	<class name="javax/xml/datatype/DatatypeFactory" since="8">
@@ -41883,7 +40663,6 @@
 		<method name="getTimeInMillis(Ljava/util/Date;)J" />
 		<method name="getXMLSchemaType()Ljavax/xml/namespace/QName;" />
 		<method name="getYears()I" />
-		<method name="hashCode()I" />
 		<method name="isLongerThan(Ljavax/xml/datatype/Duration;)Z" />
 		<method name="isSet(Ljavax/xml/datatype/DatatypeConstants$Field;)Z" />
 		<method name="isShorterThan(Ljavax/xml/datatype/Duration;)Z" />
@@ -41899,7 +40678,6 @@
 		<method name="&lt;init>()V" />
 		<method name="add(Ljavax/xml/datatype/Duration;)V" />
 		<method name="clear()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="compare(Ljavax/xml/datatype/XMLGregorianCalendar;)I" />
 		<method name="getDay()I" />
 		<method name="getEon()Ljava/math/BigInteger;" />
@@ -41935,6 +40713,7 @@
 		<method name="toXMLFormat()Ljava/lang/String;" />
 	</class>
 	<class name="javax/xml/namespace/NamespaceContext" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getNamespaceURI(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getPrefix(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getPrefixes(Ljava/lang/String;)Ljava/util/Iterator;" />
@@ -41945,11 +40724,9 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="getLocalPart()Ljava/lang/String;" />
 		<method name="getNamespaceURI()Ljava/lang/String;" />
 		<method name="getPrefix()Ljava/lang/String;" />
-		<method name="hashCode()I" />
 		<method name="valueOf(Ljava/lang/String;)Ljavax/xml/namespace/QName;" />
 	</class>
 	<class name="javax/xml/parsers/DocumentBuilder" since="1">
@@ -42051,12 +40828,14 @@
 		<method name="setXIncludeAware(Z)V" />
 	</class>
 	<class name="javax/xml/transform/ErrorListener" since="8">
+		<extends name="java/lang/Object" />
 		<method name="error(Ljavax/xml/transform/TransformerException;)V" />
 		<method name="fatalError(Ljavax/xml/transform/TransformerException;)V" />
 		<method name="warning(Ljavax/xml/transform/TransformerException;)V" />
 	</class>
 	<class name="javax/xml/transform/OutputKeys" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="CDATA_SECTION_ELEMENTS" />
 		<field name="DOCTYPE_PUBLIC" />
 		<field name="DOCTYPE_SYSTEM" />
@@ -42069,22 +40848,26 @@
 		<field name="VERSION" />
 	</class>
 	<class name="javax/xml/transform/Result" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="setSystemId(Ljava/lang/String;)V" />
 		<field name="PI_DISABLE_OUTPUT_ESCAPING" />
 		<field name="PI_ENABLE_OUTPUT_ESCAPING" />
 	</class>
 	<class name="javax/xml/transform/Source" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="setSystemId(Ljava/lang/String;)V" />
 	</class>
 	<class name="javax/xml/transform/SourceLocator" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getColumnNumber()I" />
 		<method name="getLineNumber()I" />
 		<method name="getPublicId()Ljava/lang/String;" />
 		<method name="getSystemId()Ljava/lang/String;" />
 	</class>
 	<class name="javax/xml/transform/Templates" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getOutputProperties()Ljava/util/Properties;" />
 		<method name="newTransformer()Ljavax/xml/transform/Transformer;" />
 	</class>
@@ -42154,9 +40937,11 @@
 		<method name="getException()Ljava/lang/Exception;" />
 	</class>
 	<class name="javax/xml/transform/URIResolver" since="8">
+		<extends name="java/lang/Object" />
 		<method name="resolve(Ljava/lang/String;Ljava/lang/String;)Ljavax/xml/transform/Source;" />
 	</class>
 	<class name="javax/xml/transform/dom/DOMLocator" since="8">
+		<extends name="java/lang/Object" />
 		<implements name="javax/xml/transform/SourceLocator" />
 		<method name="getOriginatingNode()Lorg/w3c/dom/Node;" />
 	</class>
@@ -42170,10 +40955,8 @@
 		<method name="&lt;init>(Lorg/w3c/dom/Node;Lorg/w3c/dom/Node;Ljava/lang/String;)V" />
 		<method name="getNextSibling()Lorg/w3c/dom/Node;" />
 		<method name="getNode()Lorg/w3c/dom/Node;" />
-		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="setNextSibling(Lorg/w3c/dom/Node;)V" />
 		<method name="setNode(Lorg/w3c/dom/Node;)V" />
-		<method name="setSystemId(Ljava/lang/String;)V" />
 		<field name="FEATURE" />
 	</class>
 	<class name="javax/xml/transform/dom/DOMSource" since="8">
@@ -42183,9 +40966,7 @@
 		<method name="&lt;init>(Lorg/w3c/dom/Node;)V" />
 		<method name="&lt;init>(Lorg/w3c/dom/Node;Ljava/lang/String;)V" />
 		<method name="getNode()Lorg/w3c/dom/Node;" />
-		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="setNode(Lorg/w3c/dom/Node;)V" />
-		<method name="setSystemId(Ljava/lang/String;)V" />
 		<field name="FEATURE" />
 	</class>
 	<class name="javax/xml/transform/sax/SAXResult" since="8">
@@ -42195,10 +40976,8 @@
 		<method name="&lt;init>(Lorg/xml/sax/ContentHandler;)V" />
 		<method name="getHandler()Lorg/xml/sax/ContentHandler;" />
 		<method name="getLexicalHandler()Lorg/xml/sax/ext/LexicalHandler;" />
-		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="setHandler(Lorg/xml/sax/ContentHandler;)V" />
 		<method name="setLexicalHandler(Lorg/xml/sax/ext/LexicalHandler;)V" />
-		<method name="setSystemId(Ljava/lang/String;)V" />
 		<field name="FEATURE" />
 	</class>
 	<class name="javax/xml/transform/sax/SAXSource" since="8">
@@ -42208,10 +40987,8 @@
 		<method name="&lt;init>(Lorg/xml/sax/InputSource;)V" />
 		<method name="&lt;init>(Lorg/xml/sax/XMLReader;Lorg/xml/sax/InputSource;)V" />
 		<method name="getInputSource()Lorg/xml/sax/InputSource;" />
-		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="getXMLReader()Lorg/xml/sax/XMLReader;" />
 		<method name="setInputSource(Lorg/xml/sax/InputSource;)V" />
-		<method name="setSystemId(Ljava/lang/String;)V" />
 		<method name="setXMLReader(Lorg/xml/sax/XMLReader;)V" />
 		<method name="sourceToInputSource(Ljavax/xml/transform/Source;)Lorg/xml/sax/InputSource;" />
 		<field name="FEATURE" />
@@ -42229,12 +41006,14 @@
 		<field name="FEATURE_XMLFILTER" />
 	</class>
 	<class name="javax/xml/transform/sax/TemplatesHandler" since="8">
+		<extends name="java/lang/Object" />
 		<implements name="org/xml/sax/ContentHandler" />
 		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="getTemplates()Ljavax/xml/transform/Templates;" />
 		<method name="setSystemId(Ljava/lang/String;)V" />
 	</class>
 	<class name="javax/xml/transform/sax/TransformerHandler" since="8">
+		<extends name="java/lang/Object" />
 		<implements name="org/xml/sax/ContentHandler" />
 		<implements name="org/xml/sax/DTDHandler" />
 		<implements name="org/xml/sax/ext/LexicalHandler" />
@@ -42252,11 +41031,9 @@
 		<method name="&lt;init>(Ljava/io/Writer;)V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="getOutputStream()Ljava/io/OutputStream;" />
-		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="getWriter()Ljava/io/Writer;" />
 		<method name="setOutputStream(Ljava/io/OutputStream;)V" />
 		<method name="setSystemId(Ljava/io/File;)V" />
-		<method name="setSystemId(Ljava/lang/String;)V" />
 		<method name="setWriter(Ljava/io/Writer;)V" />
 		<field name="FEATURE" />
 	</class>
@@ -42273,12 +41050,10 @@
 		<method name="getInputStream()Ljava/io/InputStream;" />
 		<method name="getPublicId()Ljava/lang/String;" />
 		<method name="getReader()Ljava/io/Reader;" />
-		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="setInputStream(Ljava/io/InputStream;)V" />
 		<method name="setPublicId(Ljava/lang/String;)V" />
 		<method name="setReader(Ljava/io/Reader;)V" />
 		<method name="setSystemId(Ljava/io/File;)V" />
-		<method name="setSystemId(Ljava/lang/String;)V" />
 		<field name="FEATURE" />
 	</class>
 	<class name="javax/xml/validation/Schema" since="8">
@@ -42352,6 +41127,7 @@
 		<method name="setResourceResolver(Lorg/w3c/dom/ls/LSResourceResolver;)V" />
 	</class>
 	<class name="javax/xml/xpath/XPath" since="8">
+		<extends name="java/lang/Object" />
 		<method name="compile(Ljava/lang/String;)Ljavax/xml/xpath/XPathExpression;" />
 		<method name="evaluate(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;" />
 		<method name="evaluate(Ljava/lang/String;Ljava/lang/Object;Ljavax/xml/namespace/QName;)Ljava/lang/Object;" />
@@ -42367,6 +41143,7 @@
 	</class>
 	<class name="javax/xml/xpath/XPathConstants" since="8">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="BOOLEAN" />
 		<field name="DOM_OBJECT_MODEL" />
 		<field name="NODE" />
@@ -42380,6 +41157,7 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="javax/xml/xpath/XPathExpression" since="8">
+		<extends name="java/lang/Object" />
 		<method name="evaluate(Ljava/lang/Object;)Ljava/lang/String;" />
 		<method name="evaluate(Ljava/lang/Object;Ljavax/xml/namespace/QName;)Ljava/lang/Object;" />
 		<method name="evaluate(Lorg/xml/sax/InputSource;)Ljava/lang/String;" />
@@ -42411,6 +41189,7 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="javax/xml/xpath/XPathFunction" since="8">
+		<extends name="java/lang/Object" />
 		<method name="evaluate(Ljava/util/List;)Ljava/lang/Object;" />
 	</class>
 	<class name="javax/xml/xpath/XPathFunctionException" since="8">
@@ -42419,9 +41198,11 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="javax/xml/xpath/XPathFunctionResolver" since="8">
+		<extends name="java/lang/Object" />
 		<method name="resolveFunction(Ljavax/xml/namespace/QName;I)Ljavax/xml/xpath/XPathFunction;" />
 	</class>
 	<class name="javax/xml/xpath/XPathVariableResolver" since="8">
+		<extends name="java/lang/Object" />
 		<method name="resolveVariable(Ljavax/xml/namespace/QName;)Ljava/lang/Object;" />
 	</class>
 	<class name="junit/framework/Assert" since="1">
@@ -42472,9 +41253,11 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
 	<class name="junit/framework/Protectable" since="1">
+		<extends name="java/lang/Object" />
 		<method name="protect()V" />
 	</class>
 	<class name="junit/framework/Test" since="1">
+		<extends name="java/lang/Object" />
 		<method name="countTestCases()I" />
 		<method name="run(Ljunit/framework/TestResult;)V" />
 	</class>
@@ -42483,11 +41266,9 @@
 		<implements name="junit/framework/Test" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="countTestCases()I" />
 		<method name="createResult()Ljunit/framework/TestResult;" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="run()Ljunit/framework/TestResult;" />
-		<method name="run(Ljunit/framework/TestResult;)V" />
 		<method name="runBare()V" />
 		<method name="runTest()V" />
 		<method name="setName(Ljava/lang/String;)V" />
@@ -42506,6 +41287,7 @@
 		<field name="fThrownException" />
 	</class>
 	<class name="junit/framework/TestListener" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addError(Ljunit/framework/Test;Ljava/lang/Throwable;)V" />
 		<method name="addFailure(Ljunit/framework/Test;Ljunit/framework/AssertionFailedError;)V" />
 		<method name="endTest(Ljunit/framework/Test;)V" />
@@ -42544,11 +41326,9 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="addTest(Ljunit/framework/Test;)V" />
 		<method name="addTestSuite(Ljava/lang/Class;)V" />
-		<method name="countTestCases()I" />
 		<method name="createTest(Ljava/lang/Class;Ljava/lang/String;)Ljunit/framework/Test;" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getTestConstructor(Ljava/lang/Class;)Ljava/lang/reflect/Constructor;" />
-		<method name="run(Ljunit/framework/TestResult;)V" />
 		<method name="runTest(Ljunit/framework/Test;Ljunit/framework/TestResult;)V" />
 		<method name="setName(Ljava/lang/String;)V" />
 		<method name="testAt(I)Ljunit/framework/Test;" />
@@ -42559,11 +41339,8 @@
 		<extends name="java/lang/Object" />
 		<implements name="junit/framework/TestListener" />
 		<method name="&lt;init>()V" />
-		<method name="addError(Ljunit/framework/Test;Ljava/lang/Throwable;)V" />
-		<method name="addFailure(Ljunit/framework/Test;Ljunit/framework/AssertionFailedError;)V" />
 		<method name="clearStatus()V" />
 		<method name="elapsedTimeAsString(J)Ljava/lang/String;" />
-		<method name="endTest(Ljunit/framework/Test;)V" />
 		<method name="extractClassName(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getFilteredTrace(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getFilteredTrace(Ljava/lang/Throwable;)Ljava/lang/String;" />
@@ -42581,7 +41358,6 @@
 		<method name="setPreference(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="setPreferences(Ljava/util/Properties;)V" />
 		<method name="showStackRaw()Z" />
-		<method name="startTest(Ljunit/framework/Test;)V" />
 		<method name="testEnded(Ljava/lang/String;)V" />
 		<method name="testFailed(ILjunit/framework/Test;Ljava/lang/Throwable;)V" />
 		<method name="testStarted(Ljava/lang/String;)V" />
@@ -42590,14 +41366,17 @@
 		<field name="SUITE_METHODNAME" />
 	</class>
 	<class name="junit/runner/TestSuiteLoader" since="1">
+		<extends name="java/lang/Object" />
 		<method name="load(Ljava/lang/String;)Ljava/lang/Class;" />
 		<method name="reload(Ljava/lang/Class;)Ljava/lang/Class;" />
 	</class>
 	<class name="junit/runner/Version" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="id()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/commons/logging/Log" since="1">
+		<extends name="java/lang/Object" />
 		<method name="debug(Ljava/lang/Object;)V" />
 		<method name="debug(Ljava/lang/Object;Ljava/lang/Throwable;)V" />
 		<method name="error(Ljava/lang/Object;)V" />
@@ -42622,19 +41401,23 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/ConnectionReuseStrategy" since="1">
+		<extends name="java/lang/Object" />
 		<method name="keepAlive(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/FormattedHeader" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/Header" />
 		<method name="getBuffer()Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="getValuePos()I" />
 	</class>
 	<class name="org/apache/http/Header" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getElements()[Lorg/apache/http/HeaderElement;" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getValue()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/HeaderElement" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getParameter(I)Lorg/apache/http/NameValuePair;" />
 		<method name="getParameterByName(Ljava/lang/String;)Lorg/apache/http/NameValuePair;" />
@@ -42643,16 +41426,17 @@
 		<method name="getValue()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/HeaderElementIterator" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Iterator" />
-		<method name="hasNext()Z" />
 		<method name="nextElement()Lorg/apache/http/HeaderElement;" />
 	</class>
 	<class name="org/apache/http/HeaderIterator" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Iterator" />
-		<method name="hasNext()Z" />
 		<method name="nextHeader()Lorg/apache/http/Header;" />
 	</class>
 	<class name="org/apache/http/HttpClientConnection" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpConnection" />
 		<method name="flush()V" />
 		<method name="isResponseAvailable(I)Z" />
@@ -42662,6 +41446,7 @@
 		<method name="sendRequestHeader(Lorg/apache/http/HttpRequest;)V" />
 	</class>
 	<class name="org/apache/http/HttpConnection" since="1">
+		<extends name="java/lang/Object" />
 		<method name="close()V" />
 		<method name="getMetrics()Lorg/apache/http/HttpConnectionMetrics;" />
 		<method name="getSocketTimeout()I" />
@@ -42671,6 +41456,7 @@
 		<method name="shutdown()V" />
 	</class>
 	<class name="org/apache/http/HttpConnectionMetrics" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getMetric(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="getReceivedBytesCount()J" />
 		<method name="getRequestCount()J" />
@@ -42679,6 +41465,7 @@
 		<method name="reset()V" />
 	</class>
 	<class name="org/apache/http/HttpEntity" since="1">
+		<extends name="java/lang/Object" />
 		<method name="consumeContent()V" />
 		<method name="getContent()Ljava/io/InputStream;" />
 		<method name="getContentEncoding()Lorg/apache/http/Header;" />
@@ -42690,6 +41477,7 @@
 		<method name="writeTo(Ljava/io/OutputStream;)V" />
 	</class>
 	<class name="org/apache/http/HttpEntityEnclosingRequest" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequest" />
 		<method name="expectContinue()Z" />
 		<method name="getEntity()Lorg/apache/http/HttpEntity;" />
@@ -42708,7 +41496,6 @@
 		<method name="&lt;init>(Ljava/lang/String;I)V" />
 		<method name="&lt;init>(Ljava/lang/String;ILjava/lang/String;)V" />
 		<method name="&lt;init>(Lorg/apache/http/HttpHost;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="getHostName()Ljava/lang/String;" />
 		<method name="getPort()I" />
 		<method name="getSchemeName()Ljava/lang/String;" />
@@ -42721,6 +41508,7 @@
 		<field name="schemeName" />
 	</class>
 	<class name="org/apache/http/HttpInetConnection" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpConnection" />
 		<method name="getLocalAddress()Ljava/net/InetAddress;" />
 		<method name="getLocalPort()I" />
@@ -42728,6 +41516,7 @@
 		<method name="getRemotePort()I" />
 	</class>
 	<class name="org/apache/http/HttpMessage" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addHeader(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="addHeader(Lorg/apache/http/Header;)V" />
 		<method name="containsHeader(Ljava/lang/String;)Z" />
@@ -42747,17 +41536,21 @@
 		<method name="setParams(Lorg/apache/http/params/HttpParams;)V" />
 	</class>
 	<class name="org/apache/http/HttpRequest" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpMessage" />
 		<method name="getRequestLine()Lorg/apache/http/RequestLine;" />
 	</class>
 	<class name="org/apache/http/HttpRequestFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="newHttpRequest(Ljava/lang/String;Ljava/lang/String;)Lorg/apache/http/HttpRequest;" />
 		<method name="newHttpRequest(Lorg/apache/http/RequestLine;)Lorg/apache/http/HttpRequest;" />
 	</class>
 	<class name="org/apache/http/HttpRequestInterceptor" since="1">
+		<extends name="java/lang/Object" />
 		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/HttpResponse" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpMessage" />
 		<method name="getEntity()Lorg/apache/http/HttpEntity;" />
 		<method name="getLocale()Ljava/util/Locale;" />
@@ -42771,13 +41564,16 @@
 		<method name="setStatusLine(Lorg/apache/http/StatusLine;)V" />
 	</class>
 	<class name="org/apache/http/HttpResponseFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="newHttpResponse(Lorg/apache/http/ProtocolVersion;ILorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 		<method name="newHttpResponse(Lorg/apache/http/StatusLine;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 	</class>
 	<class name="org/apache/http/HttpResponseInterceptor" since="1">
+		<extends name="java/lang/Object" />
 		<method name="process(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/HttpServerConnection" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpConnection" />
 		<method name="flush()V" />
 		<method name="receiveRequestEntity(Lorg/apache/http/HttpEntityEnclosingRequest;)V" />
@@ -42786,6 +41582,7 @@
 		<method name="sendResponseHeader(Lorg/apache/http/HttpResponse;)V" />
 	</class>
 	<class name="org/apache/http/HttpStatus" since="1">
+		<extends name="java/lang/Object" />
 		<field name="SC_ACCEPTED" />
 		<field name="SC_BAD_GATEWAY" />
 		<field name="SC_BAD_REQUEST" />
@@ -42855,6 +41652,7 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="org/apache/http/NameValuePair" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getValue()Ljava/lang/String;" />
 	</class>
@@ -42875,18 +41673,15 @@
 	</class>
 	<class name="org/apache/http/ProtocolVersion" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>(Ljava/lang/String;II)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="compareToVersion(Lorg/apache/http/ProtocolVersion;)I" />
-		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="forVersion(II)Lorg/apache/http/ProtocolVersion;" />
 		<method name="getMajor()I" />
 		<method name="getMinor()I" />
 		<method name="getProtocol()Ljava/lang/String;" />
 		<method name="greaterEquals(Lorg/apache/http/ProtocolVersion;)Z" />
-		<method name="hashCode()I" />
 		<method name="isComparable(Lorg/apache/http/ProtocolVersion;)Z" />
 		<method name="lessEquals(Lorg/apache/http/ProtocolVersion;)Z" />
 		<field name="major" />
@@ -42894,21 +41689,24 @@
 		<field name="protocol" />
 	</class>
 	<class name="org/apache/http/ReasonPhraseCatalog" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getReason(ILjava/util/Locale;)Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/RequestLine" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getMethod()Ljava/lang/String;" />
 		<method name="getProtocolVersion()Lorg/apache/http/ProtocolVersion;" />
 		<method name="getUri()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/StatusLine" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getProtocolVersion()Lorg/apache/http/ProtocolVersion;" />
 		<method name="getReasonPhrase()Ljava/lang/String;" />
 		<method name="getStatusCode()I" />
 	</class>
 	<class name="org/apache/http/TokenIterator" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="java/util/Iterator" />
-		<method name="hasNext()Z" />
 		<method name="nextToken()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/UnsupportedHttpVersionException" since="1">
@@ -42918,12 +41716,14 @@
 	</class>
 	<class name="org/apache/http/auth/AUTH" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="PROXY_AUTH" />
 		<field name="PROXY_AUTH_RESP" />
 		<field name="WWW_AUTH" />
 		<field name="WWW_AUTH_RESP" />
 	</class>
 	<class name="org/apache/http/auth/AuthScheme" since="1">
+		<extends name="java/lang/Object" />
 		<method name="authenticate(Lorg/apache/http/auth/Credentials;Lorg/apache/http/HttpRequest;)Lorg/apache/http/Header;" />
 		<method name="getParameter(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getRealm()Ljava/lang/String;" />
@@ -42933,6 +41733,7 @@
 		<method name="processChallenge(Lorg/apache/http/Header;)V" />
 	</class>
 	<class name="org/apache/http/auth/AuthSchemeFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="newInstance(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/auth/AuthScheme;" />
 	</class>
 	<class name="org/apache/http/auth/AuthSchemeRegistry" since="1">
@@ -42983,9 +41784,9 @@
 		<extends name="java/lang/Object" />
 		<implements name="java/security/Principal" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
-		<method name="getName()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/auth/Credentials" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getPassword()Ljava/lang/String;" />
 		<method name="getUserPrincipal()Ljava/security/Principal;" />
 	</class>
@@ -43007,9 +41808,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="getDomain()Ljava/lang/String;" />
-		<method name="getPassword()Ljava/lang/String;" />
 		<method name="getUserName()Ljava/lang/String;" />
-		<method name="getUserPrincipal()Ljava/security/Principal;" />
 		<method name="getWorkstation()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/auth/NTUserPrincipal" since="1">
@@ -43017,7 +41816,6 @@
 		<implements name="java/security/Principal" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="getDomain()Ljava/lang/String;" />
-		<method name="getName()Ljava/lang/String;" />
 		<method name="getUsername()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/auth/UsernamePasswordCredentials" since="1">
@@ -43025,11 +41823,10 @@
 		<implements name="org/apache/http/auth/Credentials" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="getPassword()Ljava/lang/String;" />
 		<method name="getUserName()Ljava/lang/String;" />
-		<method name="getUserPrincipal()Ljava/security/Principal;" />
 	</class>
 	<class name="org/apache/http/auth/params/AuthPNames" since="1">
+		<extends name="java/lang/Object" />
 		<field name="CREDENTIAL_CHARSET" />
 	</class>
 	<class name="org/apache/http/auth/params/AuthParamBean" since="1">
@@ -43039,10 +41836,12 @@
 	</class>
 	<class name="org/apache/http/auth/params/AuthParams" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getCredentialCharset(Lorg/apache/http/params/HttpParams;)Ljava/lang/String;" />
 		<method name="setCredentialCharset(Lorg/apache/http/params/HttpParams;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/client/AuthenticationHandler" since="1">
+		<extends name="java/lang/Object" />
 		<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;Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/auth/AuthScheme;" />
@@ -43061,29 +41860,33 @@
 		<method name="&lt;init>(Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="org/apache/http/client/CookieStore" since="1">
+		<extends name="java/lang/Object" />
 		<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;" />
 	</class>
 	<class name="org/apache/http/client/CredentialsProvider" since="1">
+		<extends name="java/lang/Object" />
 		<method name="clear()V" />
 		<method name="getCredentials(Lorg/apache/http/auth/AuthScope;)Lorg/apache/http/auth/Credentials;" />
 		<method name="setCredentials(Lorg/apache/http/auth/AuthScope;Lorg/apache/http/auth/Credentials;)V" />
 	</class>
 	<class name="org/apache/http/client/HttpClient" since="1">
+		<extends name="java/lang/Object" />
 		<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;" />
-		<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/client/ResponseHandler;)Ljava/lang/Object;" />
+		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/client/ResponseHandler;Lorg/apache/http/protocol/HttpContext;)Ljava/lang/Object;" />
 		<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;" />
-		<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/client/ResponseHandler;)Ljava/lang/Object;" />
+		<method name="execute(Lorg/apache/http/client/methods/HttpUriRequest;Lorg/apache/http/client/ResponseHandler;Lorg/apache/http/protocol/HttpContext;)Ljava/lang/Object;" />
 		<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;" />
 	</class>
 	<class name="org/apache/http/client/HttpRequestRetryHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="retryRequest(Ljava/io/IOException;ILorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/client/HttpResponseException" since="1">
@@ -43103,16 +41906,20 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="org/apache/http/client/RedirectHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getLocationURI(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Ljava/net/URI;" />
 		<method name="isRedirectRequested(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/client/RequestDirector" since="1">
+		<extends name="java/lang/Object" />
 		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 	</class>
 	<class name="org/apache/http/client/ResponseHandler" since="1">
-		<method name="handleResponse(Lorg/apache/http/HttpResponse;)LT;" />
+		<extends name="java/lang/Object" />
+		<method name="handleResponse(Lorg/apache/http/HttpResponse;)Ljava/lang/Object;" />
 	</class>
 	<class name="org/apache/http/client/UserTokenHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getUserToken(Lorg/apache/http/protocol/HttpContext;)Ljava/lang/Object;" />
 	</class>
 	<class name="org/apache/http/client/entity/UrlEncodedFormEntity" since="1">
@@ -43121,6 +41928,7 @@
 		<method name="&lt;init>(Ljava/util/List;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/client/methods/AbortableHttpRequest" since="1">
+		<extends name="java/lang/Object" />
 		<method name="abort()V" />
 		<method name="setConnectionRequest(Lorg/apache/http/conn/ClientConnectionRequest;)V" />
 		<method name="setReleaseTrigger(Lorg/apache/http/conn/ConnectionReleaseTrigger;)V" />
@@ -43130,23 +41938,18 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/net/URI;)V" />
-		<method name="getMethod()Ljava/lang/String;" />
 		<field name="METHOD_NAME" />
 	</class>
 	<class name="org/apache/http/client/methods/HttpEntityEnclosingRequestBase" since="1">
 		<extends name="org/apache/http/client/methods/HttpRequestBase" />
 		<implements name="org/apache/http/HttpEntityEnclosingRequest" />
 		<method name="&lt;init>()V" />
-		<method name="expectContinue()Z" />
-		<method name="getEntity()Lorg/apache/http/HttpEntity;" />
-		<method name="setEntity(Lorg/apache/http/HttpEntity;)V" />
 	</class>
 	<class name="org/apache/http/client/methods/HttpGet" since="1">
 		<extends name="org/apache/http/client/methods/HttpRequestBase" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/net/URI;)V" />
-		<method name="getMethod()Ljava/lang/String;" />
 		<field name="METHOD_NAME" />
 	</class>
 	<class name="org/apache/http/client/methods/HttpHead" since="1">
@@ -43154,7 +41957,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/net/URI;)V" />
-		<method name="getMethod()Ljava/lang/String;" />
 		<field name="METHOD_NAME" />
 	</class>
 	<class name="org/apache/http/client/methods/HttpOptions" since="1">
@@ -43163,7 +41965,6 @@
 		<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;" />
-		<method name="getMethod()Ljava/lang/String;" />
 		<field name="METHOD_NAME" />
 	</class>
 	<class name="org/apache/http/client/methods/HttpPost" since="1">
@@ -43171,7 +41972,6 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/net/URI;)V" />
-		<method name="getMethod()Ljava/lang/String;" />
 		<field name="METHOD_NAME" />
 	</class>
 	<class name="org/apache/http/client/methods/HttpPut" since="1">
@@ -43179,24 +41979,14 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/net/URI;)V" />
-		<method name="getMethod()Ljava/lang/String;" />
 		<field name="METHOD_NAME" />
 	</class>
 	<class name="org/apache/http/client/methods/HttpRequestBase" since="1">
 		<extends name="org/apache/http/message/AbstractHttpMessage" />
-		<implements name="org/apache/http/client/methods/AbortableHttpRequest" />
 		<implements name="java/lang/Cloneable" />
+		<implements name="org/apache/http/client/methods/AbortableHttpRequest" />
 		<implements name="org/apache/http/client/methods/HttpUriRequest" />
 		<method name="&lt;init>()V" />
-		<method name="abort()V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getMethod()Ljava/lang/String;" />
-		<method name="getProtocolVersion()Lorg/apache/http/ProtocolVersion;" />
-		<method name="getRequestLine()Lorg/apache/http/RequestLine;" />
-		<method name="getURI()Ljava/net/URI;" />
-		<method name="isAborted()Z" />
-		<method name="setConnectionRequest(Lorg/apache/http/conn/ClientConnectionRequest;)V" />
-		<method name="setReleaseTrigger(Lorg/apache/http/conn/ConnectionReleaseTrigger;)V" />
 		<method name="setURI(Ljava/net/URI;)V" />
 	</class>
 	<class name="org/apache/http/client/methods/HttpTrace" since="1">
@@ -43204,10 +41994,10 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/net/URI;)V" />
-		<method name="getMethod()Ljava/lang/String;" />
 		<field name="METHOD_NAME" />
 	</class>
 	<class name="org/apache/http/client/methods/HttpUriRequest" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequest" />
 		<method name="abort()V" />
 		<method name="getMethod()Ljava/lang/String;" />
@@ -43215,6 +42005,7 @@
 		<method name="isAborted()Z" />
 	</class>
 	<class name="org/apache/http/client/params/AllClientPNames" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/auth/params/AuthPNames" />
 		<implements name="org/apache/http/client/params/ClientPNames" />
 		<implements name="org/apache/http/conn/params/ConnConnectionPNames" />
@@ -43226,11 +42017,13 @@
 	</class>
 	<class name="org/apache/http/client/params/AuthPolicy" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="BASIC" />
 		<field name="DIGEST" />
 		<field name="NTLM" />
 	</class>
 	<class name="org/apache/http/client/params/ClientPNames" since="1">
+		<extends name="java/lang/Object" />
 		<field name="ALLOW_CIRCULAR_REDIRECTS" />
 		<field name="CONNECTION_MANAGER_FACTORY" />
 		<field name="CONNECTION_MANAGER_FACTORY_CLASS_NAME" />
@@ -43260,6 +42053,7 @@
 	</class>
 	<class name="org/apache/http/client/params/CookiePolicy" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<field name="BEST_MATCH" />
 		<field name="BROWSER_COMPATIBILITY" />
 		<field name="NETSCAPE" />
@@ -43268,6 +42062,7 @@
 	</class>
 	<class name="org/apache/http/client/params/HttpClientParams" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getCookiePolicy(Lorg/apache/http/params/HttpParams;)Ljava/lang/String;" />
 		<method name="isAuthenticating(Lorg/apache/http/params/HttpParams;)Z" />
 		<method name="isRedirecting(Lorg/apache/http/params/HttpParams;)Z" />
@@ -43276,6 +42071,7 @@
 		<method name="setRedirecting(Lorg/apache/http/params/HttpParams;Z)V" />
 	</class>
 	<class name="org/apache/http/client/protocol/ClientContext" since="1">
+		<extends name="java/lang/Object" />
 		<field name="AUTHSCHEME_REGISTRY" />
 		<field name="AUTH_SCHEME_PREF" />
 		<field name="COOKIESPEC_REGISTRY" />
@@ -43301,38 +42097,35 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/client/protocol/RequestDefaultHeaders" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/client/protocol/RequestProxyAuthentication" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/client/protocol/RequestTargetAuthentication" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/client/protocol/ResponseProcessCookies" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpResponseInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/client/utils/CloneUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="clone(Ljava/lang/Object;)Ljava/lang/Object;" />
 	</class>
 	<class name="org/apache/http/client/utils/URIUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="createURI(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URI;" />
 		<method name="resolve(Ljava/net/URI;Ljava/lang/String;)Ljava/net/URI;" />
 		<method name="resolve(Ljava/net/URI;Ljava/net/URI;)Ljava/net/URI;" />
@@ -43353,9 +42146,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/EofSensorWatcher" />
 		<method name="&lt;init>(Lorg/apache/http/conn/ManagedClientConnection;Z)V" />
-		<method name="eofDetected(Ljava/io/InputStream;)Z" />
-		<method name="streamAbort(Ljava/io/InputStream;)Z" />
-		<method name="streamClosed(Ljava/io/InputStream;)Z" />
 		<field name="attemptReuse" />
 		<field name="managedConn" />
 	</class>
@@ -43364,16 +42154,12 @@
 		<implements name="org/apache/http/conn/ConnectionReleaseTrigger" />
 		<implements name="org/apache/http/conn/EofSensorWatcher" />
 		<method name="&lt;init>(Lorg/apache/http/HttpEntity;Lorg/apache/http/conn/ManagedClientConnection;Z)V" />
-		<method name="abortConnection()V" />
-		<method name="eofDetected(Ljava/io/InputStream;)Z" />
-		<method name="releaseConnection()V" />
 		<method name="releaseManagedConnection()V" />
-		<method name="streamAbort(Ljava/io/InputStream;)Z" />
-		<method name="streamClosed(Ljava/io/InputStream;)Z" />
 		<field name="attemptReuse" />
 		<field name="managedConn" />
 	</class>
 	<class name="org/apache/http/conn/ClientConnectionManager" since="1">
+		<extends name="java/lang/Object" />
 		<method name="closeExpiredConnections()V" />
 		<method name="closeIdleConnections(JLjava/util/concurrent/TimeUnit;)V" />
 		<method name="getSchemeRegistry()Lorg/apache/http/conn/scheme/SchemeRegistry;" />
@@ -43382,14 +42168,17 @@
 		<method name="shutdown()V" />
 	</class>
 	<class name="org/apache/http/conn/ClientConnectionManagerFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="newInstance(Lorg/apache/http/params/HttpParams;Lorg/apache/http/conn/scheme/SchemeRegistry;)Lorg/apache/http/conn/ClientConnectionManager;" />
 	</class>
 	<class name="org/apache/http/conn/ClientConnectionOperator" since="1">
+		<extends name="java/lang/Object" />
 		<method name="createConnection()Lorg/apache/http/conn/OperatedClientConnection;" />
 		<method name="openConnection(Lorg/apache/http/conn/OperatedClientConnection;Lorg/apache/http/HttpHost;Ljava/net/InetAddress;Lorg/apache/http/protocol/HttpContext;Lorg/apache/http/params/HttpParams;)V" />
 		<method name="updateSecureConnection(Lorg/apache/http/conn/OperatedClientConnection;Lorg/apache/http/HttpHost;Lorg/apache/http/protocol/HttpContext;Lorg/apache/http/params/HttpParams;)V" />
 	</class>
 	<class name="org/apache/http/conn/ClientConnectionRequest" since="1">
+		<extends name="java/lang/Object" />
 		<method name="abortRequest()V" />
 		<method name="getConnection(JLjava/util/concurrent/TimeUnit;)Lorg/apache/http/conn/ManagedClientConnection;" />
 	</class>
@@ -43399,6 +42188,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/conn/ConnectionKeepAliveStrategy" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getKeepAliveDuration(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)J" />
 	</class>
 	<class name="org/apache/http/conn/ConnectionPoolTimeoutException" since="1">
@@ -43407,6 +42197,7 @@
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/conn/ConnectionReleaseTrigger" since="1">
+		<extends name="java/lang/Object" />
 		<method name="abortConnection()V" />
 		<method name="releaseConnection()V" />
 	</class>
@@ -43414,16 +42205,14 @@
 		<extends name="java/io/InputStream" />
 		<implements name="org/apache/http/conn/ConnectionReleaseTrigger" />
 		<method name="&lt;init>(Ljava/io/InputStream;Lorg/apache/http/conn/EofSensorWatcher;)V" />
-		<method name="abortConnection()V" />
 		<method name="checkAbort()V" />
 		<method name="checkClose()V" />
 		<method name="checkEOF(I)V" />
 		<method name="isReadAllowed()Z" />
-		<method name="read()I" />
-		<method name="releaseConnection()V" />
 		<field name="wrappedStream" />
 	</class>
 	<class name="org/apache/http/conn/EofSensorWatcher" since="1">
+		<extends name="java/lang/Object" />
 		<method name="eofDetected(Ljava/io/InputStream;)Z" />
 		<method name="streamAbort(Ljava/io/InputStream;)Z" />
 		<method name="streamClosed(Ljava/io/InputStream;)Z" />
@@ -43434,9 +42223,10 @@
 		<method name="getHost()Lorg/apache/http/HttpHost;" />
 	</class>
 	<class name="org/apache/http/conn/ManagedClientConnection" since="1">
-		<implements name="org/apache/http/conn/ConnectionReleaseTrigger" />
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpClientConnection" />
 		<implements name="org/apache/http/HttpInetConnection" />
+		<implements name="org/apache/http/conn/ConnectionReleaseTrigger" />
 		<method name="getRoute()Lorg/apache/http/conn/routing/HttpRoute;" />
 		<method name="getSSLSession()Ljavax/net/ssl/SSLSession;" />
 		<method name="getState()Ljava/lang/Object;" />
@@ -43454,12 +42244,11 @@
 	<class name="org/apache/http/conn/MultihomePlainSocketFactory" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/scheme/SocketFactory" />
-		<method name="connectSocket(Ljava/net/Socket;Ljava/lang/String;ILjava/net/InetAddress;ILorg/apache/http/params/HttpParams;)Ljava/net/Socket;" />
-		<method name="createSocket()Ljava/net/Socket;" />
+		<method name="&lt;init>()V" />
 		<method name="getSocketFactory()Lorg/apache/http/conn/MultihomePlainSocketFactory;" />
-		<method name="isSecure(Ljava/net/Socket;)Z" />
 	</class>
 	<class name="org/apache/http/conn/OperatedClientConnection" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpClientConnection" />
 		<implements name="org/apache/http/HttpInetConnection" />
 		<method name="getSocket()Ljava/net/Socket;" />
@@ -43470,6 +42259,7 @@
 		<method name="update(Ljava/net/Socket;Lorg/apache/http/HttpHost;ZLorg/apache/http/params/HttpParams;)V" />
 	</class>
 	<class name="org/apache/http/conn/params/ConnConnectionPNames" since="1">
+		<extends name="java/lang/Object" />
 		<field name="MAX_STATUS_LINE_GARBAGE" />
 	</class>
 	<class name="org/apache/http/conn/params/ConnConnectionParamBean" since="1">
@@ -43478,6 +42268,7 @@
 		<method name="setMaxStatusLineGarbage(I)V" />
 	</class>
 	<class name="org/apache/http/conn/params/ConnManagerPNames" since="1">
+		<extends name="java/lang/Object" />
 		<field name="MAX_CONNECTIONS_PER_ROUTE" />
 		<field name="MAX_TOTAL_CONNECTIONS" />
 		<field name="TIMEOUT" />
@@ -43502,6 +42293,7 @@
 		<field name="DEFAULT_MAX_TOTAL_CONNECTIONS" />
 	</class>
 	<class name="org/apache/http/conn/params/ConnPerRoute" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getMaxForRoute(Lorg/apache/http/conn/routing/HttpRoute;)I" />
 	</class>
 	<class name="org/apache/http/conn/params/ConnPerRouteBean" since="1">
@@ -43510,13 +42302,13 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(I)V" />
 		<method name="getDefaultMax()I" />
-		<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;)V" />
 		<field name="DEFAULT_MAX_CONNECTIONS_PER_ROUTE" />
 	</class>
 	<class name="org/apache/http/conn/params/ConnRoutePNames" since="1">
+		<extends name="java/lang/Object" />
 		<field name="DEFAULT_PROXY" />
 		<field name="FORCED_ROUTE" />
 		<field name="LOCAL_ADDRESS" />
@@ -43531,6 +42323,7 @@
 	<class name="org/apache/http/conn/params/ConnRouteParams" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/params/ConnRoutePNames" />
+		<method name="&lt;init>()V" />
 		<method name="getDefaultProxy(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/HttpHost;" />
 		<method name="getForcedRoute(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/conn/routing/HttpRoute;" />
 		<method name="getLocalAddress(Lorg/apache/http/params/HttpParams;)Ljava/net/InetAddress;" />
@@ -43546,7 +42339,6 @@
 		<method name="&lt;init>()V" />
 		<method name="directStep(Lorg/apache/http/conn/routing/RouteInfo;Lorg/apache/http/conn/routing/RouteInfo;)I" />
 		<method name="firstStep(Lorg/apache/http/conn/routing/RouteInfo;)I" />
-		<method name="nextStep(Lorg/apache/http/conn/routing/RouteInfo;Lorg/apache/http/conn/routing/RouteInfo;)I" />
 		<method name="proxiedStep(Lorg/apache/http/conn/routing/RouteInfo;Lorg/apache/http/conn/routing/RouteInfo;)I" />
 	</class>
 	<class name="org/apache/http/conn/routing/HttpRoute" since="1">
@@ -43558,22 +42350,9 @@
 		<method name="&lt;init>(Lorg/apache/http/HttpHost;Ljava/net/InetAddress;Lorg/apache/http/HttpHost;ZLorg/apache/http/conn/routing/RouteInfo$TunnelType;Lorg/apache/http/conn/routing/RouteInfo$LayerType;)V" />
 		<method name="&lt;init>(Lorg/apache/http/HttpHost;Ljava/net/InetAddress;Z)V" />
 		<method name="&lt;init>(Lorg/apache/http/HttpHost;Ljava/net/InetAddress;[Lorg/apache/http/HttpHost;ZLorg/apache/http/conn/routing/RouteInfo$TunnelType;Lorg/apache/http/conn/routing/RouteInfo$LayerType;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="getHopCount()I" />
-		<method name="getHopTarget(I)Lorg/apache/http/HttpHost;" />
-		<method name="getLayerType()Lorg/apache/http/conn/routing/RouteInfo$LayerType;" />
-		<method name="getLocalAddress()Ljava/net/InetAddress;" />
-		<method name="getProxyHost()Lorg/apache/http/HttpHost;" />
-		<method name="getTargetHost()Lorg/apache/http/HttpHost;" />
-		<method name="getTunnelType()Lorg/apache/http/conn/routing/RouteInfo$TunnelType;" />
-		<method name="hashCode()I" />
-		<method name="isLayered()Z" />
-		<method name="isSecure()Z" />
-		<method name="isTunnelled()Z" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/conn/routing/HttpRouteDirector" since="1">
+		<extends name="java/lang/Object" />
 		<method name="nextStep(Lorg/apache/http/conn/routing/RouteInfo;Lorg/apache/http/conn/routing/RouteInfo;)I" />
 		<field name="COMPLETE" />
 		<field name="CONNECT_PROXY" />
@@ -43584,9 +42363,11 @@
 		<field name="UNREACHABLE" />
 	</class>
 	<class name="org/apache/http/conn/routing/HttpRoutePlanner" since="1">
+		<extends name="java/lang/Object" />
 		<method name="determineRoute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/conn/routing/HttpRoute;" />
 	</class>
 	<class name="org/apache/http/conn/routing/RouteInfo" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getHopCount()I" />
 		<method name="getHopTarget(I)Lorg/apache/http/HttpHost;" />
 		<method name="getLayerType()Lorg/apache/http/conn/routing/RouteInfo$LayerType;" />
@@ -43618,32 +42399,20 @@
 		<implements name="org/apache/http/conn/routing/RouteInfo" />
 		<method name="&lt;init>(Lorg/apache/http/HttpHost;Ljava/net/InetAddress;)V" />
 		<method name="&lt;init>(Lorg/apache/http/conn/routing/HttpRoute;)V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="connectProxy(Lorg/apache/http/HttpHost;Z)V" />
 		<method name="connectTarget(Z)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
-		<method name="getHopCount()I" />
-		<method name="getHopTarget(I)Lorg/apache/http/HttpHost;" />
-		<method name="getLayerType()Lorg/apache/http/conn/routing/RouteInfo$LayerType;" />
-		<method name="getLocalAddress()Ljava/net/InetAddress;" />
-		<method name="getProxyHost()Lorg/apache/http/HttpHost;" />
-		<method name="getTargetHost()Lorg/apache/http/HttpHost;" />
-		<method name="getTunnelType()Lorg/apache/http/conn/routing/RouteInfo$TunnelType;" />
-		<method name="hashCode()I" />
 		<method name="isConnected()Z" />
-		<method name="isLayered()Z" />
-		<method name="isSecure()Z" />
-		<method name="isTunnelled()Z" />
 		<method name="layerProtocol(Z)V" />
 		<method name="toRoute()Lorg/apache/http/conn/routing/HttpRoute;" />
-		<method name="toString()Ljava/lang/String;" />
 		<method name="tunnelProxy(Lorg/apache/http/HttpHost;Z)V" />
 		<method name="tunnelTarget(Z)V" />
 	</class>
 	<class name="org/apache/http/conn/scheme/HostNameResolver" since="1">
+		<extends name="java/lang/Object" />
 		<method name="resolve(Ljava/lang/String;)Ljava/net/InetAddress;" />
 	</class>
 	<class name="org/apache/http/conn/scheme/LayeredSocketFactory" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/scheme/SocketFactory" />
 		<method name="createSocket(Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;" />
 	</class>
@@ -43652,21 +42421,16 @@
 		<implements name="org/apache/http/conn/scheme/SocketFactory" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/apache/http/conn/scheme/HostNameResolver;)V" />
-		<method name="connectSocket(Ljava/net/Socket;Ljava/lang/String;ILjava/net/InetAddress;ILorg/apache/http/params/HttpParams;)Ljava/net/Socket;" />
-		<method name="createSocket()Ljava/net/Socket;" />
 		<method name="getSocketFactory()Lorg/apache/http/conn/scheme/PlainSocketFactory;" />
-		<method name="isSecure(Ljava/net/Socket;)Z" />
 	</class>
 	<class name="org/apache/http/conn/scheme/Scheme" since="1">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>(Ljava/lang/String;Lorg/apache/http/conn/scheme/SocketFactory;I)V" />
-		<method name="equals(Ljava/lang/Object;)Z" />
 		<method name="getDefaultPort()I" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getSocketFactory()Lorg/apache/http/conn/scheme/SocketFactory;" />
 		<method name="isLayered()Z" />
 		<method name="resolvePort(I)I" />
-		<method name="toString()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/conn/scheme/SchemeRegistry" since="1">
 		<extends name="java/lang/Object" />
@@ -43680,6 +42444,7 @@
 		<method name="unregister(Ljava/lang/String;)Lorg/apache/http/conn/scheme/Scheme;" />
 	</class>
 	<class name="org/apache/http/conn/scheme/SocketFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="connectSocket(Ljava/net/Socket;Ljava/lang/String;ILjava/net/InetAddress;ILorg/apache/http/params/HttpParams;)Ljava/net/Socket;" />
 		<method name="createSocket()Ljava/net/Socket;" />
 		<method name="isSecure(Ljava/net/Socket;)Z" />
@@ -43692,22 +42457,15 @@
 		<method name="countDots(Ljava/lang/String;)I" />
 		<method name="getCNs(Ljava/security/cert/X509Certificate;)[Ljava/lang/String;" />
 		<method name="getDNSSubjectAlts(Ljava/security/cert/X509Certificate;)[Ljava/lang/String;" />
-		<method name="verify(Ljava/lang/String;Ljava/security/cert/X509Certificate;)V" />
-		<method name="verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z" />
-		<method name="verify(Ljava/lang/String;Ljavax/net/ssl/SSLSocket;)V" />
 		<method name="verify(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Z)V" />
 	</class>
 	<class name="org/apache/http/conn/ssl/AllowAllHostnameVerifier" since="1">
 		<extends name="org/apache/http/conn/ssl/AbstractVerifier" />
 		<method name="&lt;init>()V" />
-		<method name="toString()Ljava/lang/String;" />
-		<method name="verify(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/conn/ssl/BrowserCompatHostnameVerifier" since="1">
 		<extends name="org/apache/http/conn/ssl/AbstractVerifier" />
 		<method name="&lt;init>()V" />
-		<method name="toString()Ljava/lang/String;" />
-		<method name="verify(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/conn/ssl/SSLSocketFactory" since="1">
 		<extends name="java/lang/Object" />
@@ -43716,12 +42474,8 @@
 		<method name="&lt;init>(Ljava/security/KeyStore;)V" />
 		<method name="&lt;init>(Ljava/security/KeyStore;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/security/KeyStore;Ljava/lang/String;Ljava/security/KeyStore;)V" />
-		<method name="connectSocket(Ljava/net/Socket;Ljava/lang/String;ILjava/net/InetAddress;ILorg/apache/http/params/HttpParams;)Ljava/net/Socket;" />
-		<method name="createSocket()Ljava/net/Socket;" />
-		<method name="createSocket(Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;" />
 		<method name="getHostnameVerifier()Lorg/apache/http/conn/ssl/X509HostnameVerifier;" />
 		<method name="getSocketFactory()Lorg/apache/http/conn/ssl/SSLSocketFactory;" />
-		<method name="isSecure(Ljava/net/Socket;)Z" />
 		<method name="setHostnameVerifier(Lorg/apache/http/conn/ssl/X509HostnameVerifier;)V" />
 		<field name="ALLOW_ALL_HOSTNAME_VERIFIER" />
 		<field name="BROWSER_COMPATIBLE_HOSTNAME_VERIFIER" />
@@ -43733,24 +42487,24 @@
 	<class name="org/apache/http/conn/ssl/StrictHostnameVerifier" since="1">
 		<extends name="org/apache/http/conn/ssl/AbstractVerifier" />
 		<method name="&lt;init>()V" />
-		<method name="toString()Ljava/lang/String;" />
-		<method name="verify(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/conn/ssl/X509HostnameVerifier" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="javax/net/ssl/HostnameVerifier" />
 		<method name="verify(Ljava/lang/String;Ljava/security/cert/X509Certificate;)V" />
-		<method name="verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z" />
 		<method name="verify(Ljava/lang/String;Ljavax/net/ssl/SSLSocket;)V" />
 		<method name="verify(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/conn/util/InetAddressUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="isIPv4Address(Ljava/lang/String;)Z" />
 		<method name="isIPv6Address(Ljava/lang/String;)Z" />
 		<method name="isIPv6HexCompressedAddress(Ljava/lang/String;)Z" />
 		<method name="isIPv6StdAddress(Ljava/lang/String;)Z" />
 	</class>
 	<class name="org/apache/http/cookie/ClientCookie" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/Cookie" />
 		<method name="containsAttribute(Ljava/lang/String;)Z" />
 		<method name="getAttribute(Ljava/lang/String;)Ljava/lang/String;" />
@@ -43766,6 +42520,7 @@
 		<field name="VERSION_ATTR" />
 	</class>
 	<class name="org/apache/http/cookie/Cookie" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getComment()Ljava/lang/String;" />
 		<method name="getCommentURL()Ljava/lang/String;" />
 		<method name="getDomain()Ljava/lang/String;" />
@@ -43780,14 +42535,15 @@
 		<method name="isSecure()Z" />
 	</class>
 	<class name="org/apache/http/cookie/CookieAttributeHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
 		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
 		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/cookie/CookieIdentityComparator" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/Comparator" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/Comparator" />
 		<method name="&lt;init>()V" />
 		<method name="compare(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/Cookie;)I" />
 	</class>
@@ -43801,12 +42557,13 @@
 	</class>
 	<class name="org/apache/http/cookie/CookiePathComparator" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="java/util/Comparator" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/util/Comparator" />
 		<method name="&lt;init>()V" />
 		<method name="compare(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/Cookie;)I" />
 	</class>
 	<class name="org/apache/http/cookie/CookieSpec" since="1">
+		<extends name="java/lang/Object" />
 		<method name="formatCookies(Ljava/util/List;)Ljava/util/List;" />
 		<method name="getVersion()I" />
 		<method name="getVersionHeader()Lorg/apache/http/Header;" />
@@ -43815,6 +42572,7 @@
 		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/cookie/CookieSpecFactory" since="1">
+		<extends name="java/lang/Object" />
 		<method name="newInstance(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/cookie/CookieSpec;" />
 	</class>
 	<class name="org/apache/http/cookie/CookieSpecRegistry" since="1">
@@ -43834,12 +42592,14 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="org/apache/http/cookie/SM" since="1">
+		<extends name="java/lang/Object" />
 		<field name="COOKIE" />
 		<field name="COOKIE2" />
 		<field name="SET_COOKIE" />
 		<field name="SET_COOKIE2" />
 	</class>
 	<class name="org/apache/http/cookie/SetCookie" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/Cookie" />
 		<method name="setComment(Ljava/lang/String;)V" />
 		<method name="setDomain(Ljava/lang/String;)V" />
@@ -43850,12 +42610,14 @@
 		<method name="setVersion(I)V" />
 	</class>
 	<class name="org/apache/http/cookie/SetCookie2" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/SetCookie" />
 		<method name="setCommentURL(Ljava/lang/String;)V" />
 		<method name="setDiscard(Z)V" />
 		<method name="setPorts([I)V" />
 	</class>
 	<class name="org/apache/http/cookie/params/CookieSpecPNames" since="1">
+		<extends name="java/lang/Object" />
 		<field name="DATE_PATTERNS" />
 		<field name="SINGLE_COOKIE_HEADER" />
 	</class>
@@ -43869,10 +42631,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpEntity" />
 		<method name="&lt;init>()V" />
-		<method name="consumeContent()V" />
-		<method name="getContentEncoding()Lorg/apache/http/Header;" />
-		<method name="getContentType()Lorg/apache/http/Header;" />
-		<method name="isChunked()Z" />
 		<method name="setChunked(Z)V" />
 		<method name="setContentEncoding(Ljava/lang/String;)V" />
 		<method name="setContentEncoding(Lorg/apache/http/Header;)V" />
@@ -43885,13 +42643,8 @@
 	<class name="org/apache/http/entity/BasicHttpEntity" since="1">
 		<extends name="org/apache/http/entity/AbstractHttpEntity" />
 		<method name="&lt;init>()V" />
-		<method name="getContent()Ljava/io/InputStream;" />
-		<method name="getContentLength()J" />
-		<method name="isRepeatable()Z" />
-		<method name="isStreaming()Z" />
 		<method name="setContent(Ljava/io/InputStream;)V" />
 		<method name="setContentLength(J)V" />
-		<method name="writeTo(Ljava/io/OutputStream;)V" />
 	</class>
 	<class name="org/apache/http/entity/BufferedHttpEntity" since="1">
 		<extends name="org/apache/http/entity/HttpEntityWrapper" />
@@ -43901,87 +42654,47 @@
 		<extends name="org/apache/http/entity/AbstractHttpEntity" />
 		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>([B)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getContent()Ljava/io/InputStream;" />
-		<method name="getContentLength()J" />
-		<method name="isRepeatable()Z" />
-		<method name="isStreaming()Z" />
-		<method name="writeTo(Ljava/io/OutputStream;)V" />
 		<field name="content" />
 	</class>
 	<class name="org/apache/http/entity/ContentLengthStrategy" since="1">
+		<extends name="java/lang/Object" />
 		<method name="determineLength(Lorg/apache/http/HttpMessage;)J" />
 		<field name="CHUNKED" />
 		<field name="IDENTITY" />
 	</class>
 	<class name="org/apache/http/entity/ContentProducer" since="1">
+		<extends name="java/lang/Object" />
 		<method name="writeTo(Ljava/io/OutputStream;)V" />
 	</class>
 	<class name="org/apache/http/entity/EntityTemplate" since="1">
 		<extends name="org/apache/http/entity/AbstractHttpEntity" />
 		<method name="&lt;init>(Lorg/apache/http/entity/ContentProducer;)V" />
-		<method name="getContent()Ljava/io/InputStream;" />
-		<method name="getContentLength()J" />
-		<method name="isRepeatable()Z" />
-		<method name="isStreaming()Z" />
-		<method name="writeTo(Ljava/io/OutputStream;)V" />
 	</class>
 	<class name="org/apache/http/entity/FileEntity" since="1">
 		<extends name="org/apache/http/entity/AbstractHttpEntity" />
 		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>(Ljava/io/File;Ljava/lang/String;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getContent()Ljava/io/InputStream;" />
-		<method name="getContentLength()J" />
-		<method name="isRepeatable()Z" />
-		<method name="isStreaming()Z" />
-		<method name="writeTo(Ljava/io/OutputStream;)V" />
 		<field name="file" />
 	</class>
 	<class name="org/apache/http/entity/HttpEntityWrapper" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpEntity" />
 		<method name="&lt;init>(Lorg/apache/http/HttpEntity;)V" />
-		<method name="consumeContent()V" />
-		<method name="getContent()Ljava/io/InputStream;" />
-		<method name="getContentEncoding()Lorg/apache/http/Header;" />
-		<method name="getContentLength()J" />
-		<method name="getContentType()Lorg/apache/http/Header;" />
-		<method name="isChunked()Z" />
-		<method name="isRepeatable()Z" />
-		<method name="isStreaming()Z" />
-		<method name="writeTo(Ljava/io/OutputStream;)V" />
 		<field name="wrappedEntity" />
 	</class>
 	<class name="org/apache/http/entity/InputStreamEntity" since="1">
 		<extends name="org/apache/http/entity/AbstractHttpEntity" />
 		<method name="&lt;init>(Ljava/io/InputStream;J)V" />
-		<method name="getContent()Ljava/io/InputStream;" />
-		<method name="getContentLength()J" />
-		<method name="isRepeatable()Z" />
-		<method name="isStreaming()Z" />
-		<method name="writeTo(Ljava/io/OutputStream;)V" />
 	</class>
 	<class name="org/apache/http/entity/SerializableEntity" since="1">
 		<extends name="org/apache/http/entity/AbstractHttpEntity" />
 		<method name="&lt;init>(Ljava/io/Serializable;Z)V" />
-		<method name="getContent()Ljava/io/InputStream;" />
-		<method name="getContentLength()J" />
-		<method name="isRepeatable()Z" />
-		<method name="isStreaming()Z" />
-		<method name="writeTo(Ljava/io/OutputStream;)V" />
 	</class>
 	<class name="org/apache/http/entity/StringEntity" since="1">
 		<extends name="org/apache/http/entity/AbstractHttpEntity" />
 		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>(Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getContent()Ljava/io/InputStream;" />
-		<method name="getContentLength()J" />
-		<method name="isRepeatable()Z" />
-		<method name="isStreaming()Z" />
-		<method name="writeTo(Ljava/io/OutputStream;)V" />
 		<field name="content" />
 	</class>
 	<class name="org/apache/http/impl/AbstractHttpClientConnection" since="1">
@@ -43995,15 +42708,7 @@
 		<method name="createRequestWriter(Lorg/apache/http/io/SessionOutputBuffer;Lorg/apache/http/params/HttpParams;)Lorg/apache/http/io/HttpMessageWriter;" />
 		<method name="createResponseParser(Lorg/apache/http/io/SessionInputBuffer;Lorg/apache/http/HttpResponseFactory;Lorg/apache/http/params/HttpParams;)Lorg/apache/http/io/HttpMessageParser;" />
 		<method name="doFlush()V" />
-		<method name="flush()V" />
-		<method name="getMetrics()Lorg/apache/http/HttpConnectionMetrics;" />
 		<method name="init(Lorg/apache/http/io/SessionInputBuffer;Lorg/apache/http/io/SessionOutputBuffer;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="isResponseAvailable(I)Z" />
-		<method name="isStale()Z" />
-		<method name="receiveResponseEntity(Lorg/apache/http/HttpResponse;)V" />
-		<method name="receiveResponseHeader()Lorg/apache/http/HttpResponse;" />
-		<method name="sendRequestEntity(Lorg/apache/http/HttpEntityEnclosingRequest;)V" />
-		<method name="sendRequestHeader(Lorg/apache/http/HttpRequest;)V" />
 	</class>
 	<class name="org/apache/http/impl/AbstractHttpServerConnection" since="1">
 		<extends name="java/lang/Object" />
@@ -44016,33 +42721,22 @@
 		<method name="createRequestParser(Lorg/apache/http/io/SessionInputBuffer;Lorg/apache/http/HttpRequestFactory;Lorg/apache/http/params/HttpParams;)Lorg/apache/http/io/HttpMessageParser;" />
 		<method name="createResponseWriter(Lorg/apache/http/io/SessionOutputBuffer;Lorg/apache/http/params/HttpParams;)Lorg/apache/http/io/HttpMessageWriter;" />
 		<method name="doFlush()V" />
-		<method name="flush()V" />
-		<method name="getMetrics()Lorg/apache/http/HttpConnectionMetrics;" />
 		<method name="init(Lorg/apache/http/io/SessionInputBuffer;Lorg/apache/http/io/SessionOutputBuffer;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="isStale()Z" />
-		<method name="receiveRequestEntity(Lorg/apache/http/HttpEntityEnclosingRequest;)V" />
-		<method name="receiveRequestHeader()Lorg/apache/http/HttpRequest;" />
-		<method name="sendResponseEntity(Lorg/apache/http/HttpResponse;)V" />
-		<method name="sendResponseHeader(Lorg/apache/http/HttpResponse;)V" />
 	</class>
 	<class name="org/apache/http/impl/DefaultConnectionReuseStrategy" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/ConnectionReuseStrategy" />
 		<method name="&lt;init>()V" />
 		<method name="createTokenIterator(Lorg/apache/http/HeaderIterator;)Lorg/apache/http/TokenIterator;" />
-		<method name="keepAlive(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/impl/DefaultHttpClientConnection" since="1">
 		<extends name="org/apache/http/impl/SocketHttpClientConnection" />
 		<method name="&lt;init>()V" />
-		<method name="bind(Ljava/net/Socket;Lorg/apache/http/params/HttpParams;)V" />
 	</class>
 	<class name="org/apache/http/impl/DefaultHttpRequestFactory" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestFactory" />
 		<method name="&lt;init>()V" />
-		<method name="newHttpRequest(Ljava/lang/String;Ljava/lang/String;)Lorg/apache/http/HttpRequest;" />
-		<method name="newHttpRequest(Lorg/apache/http/RequestLine;)Lorg/apache/http/HttpRequest;" />
 	</class>
 	<class name="org/apache/http/impl/DefaultHttpResponseFactory" since="1">
 		<extends name="java/lang/Object" />
@@ -44050,34 +42744,24 @@
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/apache/http/ReasonPhraseCatalog;)V" />
 		<method name="determineLocale(Lorg/apache/http/protocol/HttpContext;)Ljava/util/Locale;" />
-		<method name="newHttpResponse(Lorg/apache/http/ProtocolVersion;ILorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
-		<method name="newHttpResponse(Lorg/apache/http/StatusLine;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 		<field name="reasonCatalog" />
 	</class>
 	<class name="org/apache/http/impl/DefaultHttpServerConnection" since="1">
 		<extends name="org/apache/http/impl/SocketHttpServerConnection" />
 		<method name="&lt;init>()V" />
-		<method name="bind(Ljava/net/Socket;Lorg/apache/http/params/HttpParams;)V" />
 	</class>
 	<class name="org/apache/http/impl/EnglishReasonPhraseCatalog" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/ReasonPhraseCatalog" />
 		<method name="&lt;init>()V" />
-		<method name="getReason(ILjava/util/Locale;)Ljava/lang/String;" />
 		<field name="INSTANCE" />
 	</class>
 	<class name="org/apache/http/impl/HttpConnectionMetricsImpl" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpConnectionMetrics" />
 		<method name="&lt;init>(Lorg/apache/http/io/HttpTransportMetrics;Lorg/apache/http/io/HttpTransportMetrics;)V" />
-		<method name="getMetric(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="getReceivedBytesCount()J" />
-		<method name="getRequestCount()J" />
-		<method name="getResponseCount()J" />
-		<method name="getSentBytesCount()J" />
 		<method name="incrementRequestCount()V" />
 		<method name="incrementResponseCount()V" />
-		<method name="reset()V" />
 		<method name="setMetric(Ljava/lang/String;Ljava/lang/Object;)V" />
 		<field name="RECEIVED_BYTES_COUNT" />
 		<field name="REQUEST_COUNT" />
@@ -44088,47 +42772,26 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/ConnectionReuseStrategy" />
 		<method name="&lt;init>()V" />
-		<method name="keepAlive(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/impl/SocketHttpClientConnection" since="1">
 		<extends name="org/apache/http/impl/AbstractHttpClientConnection" />
 		<implements name="org/apache/http/HttpInetConnection" />
 		<method name="&lt;init>()V" />
 		<method name="assertNotOpen()V" />
-		<method name="assertOpen()V" />
 		<method name="bind(Ljava/net/Socket;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="close()V" />
 		<method name="createSessionInputBuffer(Ljava/net/Socket;ILorg/apache/http/params/HttpParams;)Lorg/apache/http/io/SessionInputBuffer;" />
 		<method name="createSessionOutputBuffer(Ljava/net/Socket;ILorg/apache/http/params/HttpParams;)Lorg/apache/http/io/SessionOutputBuffer;" />
-		<method name="getLocalAddress()Ljava/net/InetAddress;" />
-		<method name="getLocalPort()I" />
-		<method name="getRemoteAddress()Ljava/net/InetAddress;" />
-		<method name="getRemotePort()I" />
 		<method name="getSocket()Ljava/net/Socket;" />
-		<method name="getSocketTimeout()I" />
-		<method name="isOpen()Z" />
-		<method name="setSocketTimeout(I)V" />
-		<method name="shutdown()V" />
 	</class>
 	<class name="org/apache/http/impl/SocketHttpServerConnection" since="1">
 		<extends name="org/apache/http/impl/AbstractHttpServerConnection" />
 		<implements name="org/apache/http/HttpInetConnection" />
 		<method name="&lt;init>()V" />
 		<method name="assertNotOpen()V" />
-		<method name="assertOpen()V" />
 		<method name="bind(Ljava/net/Socket;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="close()V" />
 		<method name="createHttpDataReceiver(Ljava/net/Socket;ILorg/apache/http/params/HttpParams;)Lorg/apache/http/io/SessionInputBuffer;" />
 		<method name="createHttpDataTransmitter(Ljava/net/Socket;ILorg/apache/http/params/HttpParams;)Lorg/apache/http/io/SessionOutputBuffer;" />
-		<method name="getLocalAddress()Ljava/net/InetAddress;" />
-		<method name="getLocalPort()I" />
-		<method name="getRemoteAddress()Ljava/net/InetAddress;" />
-		<method name="getRemotePort()I" />
 		<method name="getSocket()Ljava/net/Socket;" />
-		<method name="getSocketTimeout()I" />
-		<method name="isOpen()Z" />
-		<method name="setSocketTimeout(I)V" />
-		<method name="shutdown()V" />
 	</class>
 	<class name="org/apache/http/impl/auth/AuthSchemeBase" since="1">
 		<extends name="java/lang/Object" />
@@ -44136,40 +42799,30 @@
 		<method name="&lt;init>()V" />
 		<method name="isProxy()Z" />
 		<method name="parseChallenge(Lorg/apache/http/util/CharArrayBuffer;II)V" />
-		<method name="processChallenge(Lorg/apache/http/Header;)V" />
 	</class>
 	<class name="org/apache/http/impl/auth/BasicScheme" since="1">
 		<extends name="org/apache/http/impl/auth/RFC2617Scheme" />
 		<method name="&lt;init>()V" />
 		<method name="authenticate(Lorg/apache/http/auth/Credentials;Ljava/lang/String;Z)Lorg/apache/http/Header;" />
-		<method name="authenticate(Lorg/apache/http/auth/Credentials;Lorg/apache/http/HttpRequest;)Lorg/apache/http/Header;" />
-		<method name="getSchemeName()Ljava/lang/String;" />
-		<method name="isComplete()Z" />
-		<method name="isConnectionBased()Z" />
 	</class>
 	<class name="org/apache/http/impl/auth/BasicSchemeFactory" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/auth/AuthSchemeFactory" />
 		<method name="&lt;init>()V" />
-		<method name="newInstance(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/auth/AuthScheme;" />
 	</class>
 	<class name="org/apache/http/impl/auth/DigestScheme" since="1">
 		<extends name="org/apache/http/impl/auth/RFC2617Scheme" />
 		<method name="&lt;init>()V" />
-		<method name="authenticate(Lorg/apache/http/auth/Credentials;Lorg/apache/http/HttpRequest;)Lorg/apache/http/Header;" />
 		<method name="createCnonce()Ljava/lang/String;" />
-		<method name="getSchemeName()Ljava/lang/String;" />
-		<method name="isComplete()Z" />
-		<method name="isConnectionBased()Z" />
 		<method name="overrideParamter(Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/impl/auth/DigestSchemeFactory" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/auth/AuthSchemeFactory" />
 		<method name="&lt;init>()V" />
-		<method name="newInstance(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/auth/AuthScheme;" />
 	</class>
 	<class name="org/apache/http/impl/auth/NTLMEngine" since="1">
+		<extends name="java/lang/Object" />
 		<method name="generateType1Msg(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="generateType3Msg(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
@@ -44182,21 +42835,11 @@
 	<class name="org/apache/http/impl/auth/NTLMScheme" since="1">
 		<extends name="org/apache/http/impl/auth/AuthSchemeBase" />
 		<method name="&lt;init>(Lorg/apache/http/impl/auth/NTLMEngine;)V" />
-		<method name="authenticate(Lorg/apache/http/auth/Credentials;Lorg/apache/http/HttpRequest;)Lorg/apache/http/Header;" />
-		<method name="getParameter(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getRealm()Ljava/lang/String;" />
-		<method name="getSchemeName()Ljava/lang/String;" />
-		<method name="isComplete()Z" />
-		<method name="isConnectionBased()Z" />
-		<method name="parseChallenge(Lorg/apache/http/util/CharArrayBuffer;II)V" />
 	</class>
 	<class name="org/apache/http/impl/auth/RFC2617Scheme" since="1">
 		<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;" />
-		<method name="getRealm()Ljava/lang/String;" />
-		<method name="parseChallenge(Lorg/apache/http/util/CharArrayBuffer;II)V" />
 	</class>
 	<class name="org/apache/http/impl/auth/UnsupportedDigestAlgorithmException" since="1">
 		<extends name="java/lang/RuntimeException" />
@@ -44210,7 +42853,6 @@
 		<method name="&lt;init>()V" />
 		<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" />
@@ -44241,24 +42883,14 @@
 		<method name="createTargetAuthenticationHandler()Lorg/apache/http/client/AuthenticationHandler;" />
 		<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;" />
-		<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;" />
-		<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;" />
-		<method name="getConnectionManager()Lorg/apache/http/conn/ClientConnectionManager;" />
 		<method name="getConnectionReuseStrategy()Lorg/apache/http/ConnectionReuseStrategy;" />
 		<method name="getCookieSpecs()Lorg/apache/http/cookie/CookieSpecRegistry;" />
 		<method name="getCookieStore()Lorg/apache/http/client/CookieStore;" />
 		<method name="getCredentialsProvider()Lorg/apache/http/client/CredentialsProvider;" />
 		<method name="getHttpProcessor()Lorg/apache/http/protocol/BasicHttpProcessor;" />
 		<method name="getHttpRequestRetryHandler()Lorg/apache/http/client/HttpRequestRetryHandler;" />
-		<method name="getParams()Lorg/apache/http/params/HttpParams;" />
 		<method name="getProxyAuthenticationHandler()Lorg/apache/http/client/AuthenticationHandler;" />
 		<method name="getRedirectHandler()Lorg/apache/http/client/RedirectHandler;" />
 		<method name="getRequestExecutor()Lorg/apache/http/protocol/HttpRequestExecutor;" />
@@ -44289,19 +42921,12 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/client/CookieStore" />
 		<method name="&lt;init>()V" />
-		<method name="addCookie(Lorg/apache/http/cookie/Cookie;)V" />
 		<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;" />
 	</class>
 	<class name="org/apache/http/impl/client/BasicCredentialsProvider" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/client/CredentialsProvider" />
 		<method name="&lt;init>()V" />
-		<method name="clear()V" />
-		<method name="getCredentials(Lorg/apache/http/auth/AuthScope;)Lorg/apache/http/auth/Credentials;" />
-		<method name="setCredentials(Lorg/apache/http/auth/AuthScope;Lorg/apache/http/auth/Credentials;)V" />
 	</class>
 	<class name="org/apache/http/impl/client/BasicResponseHandler" since="1">
 		<extends name="java/lang/Object" />
@@ -44314,14 +42939,10 @@
 		<method name="&lt;init>(Lorg/apache/http/impl/client/ClientParamsStack;)V" />
 		<method name="&lt;init>(Lorg/apache/http/impl/client/ClientParamsStack;Lorg/apache/http/params/HttpParams;Lorg/apache/http/params/HttpParams;Lorg/apache/http/params/HttpParams;Lorg/apache/http/params/HttpParams;)V" />
 		<method name="&lt;init>(Lorg/apache/http/params/HttpParams;Lorg/apache/http/params/HttpParams;Lorg/apache/http/params/HttpParams;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="copy()Lorg/apache/http/params/HttpParams;" />
 		<method name="getApplicationParams()Lorg/apache/http/params/HttpParams;" />
 		<method name="getClientParams()Lorg/apache/http/params/HttpParams;" />
 		<method name="getOverrideParams()Lorg/apache/http/params/HttpParams;" />
-		<method name="getParameter(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="getRequestParams()Lorg/apache/http/params/HttpParams;" />
-		<method name="removeParameter(Ljava/lang/String;)Z" />
-		<method name="setParameter(Ljava/lang/String;Ljava/lang/Object;)Lorg/apache/http/params/HttpParams;" />
 		<field name="applicationParams" />
 		<field name="clientParams" />
 		<field name="overrideParams" />
@@ -44331,30 +42952,12 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/ConnectionKeepAliveStrategy" />
 		<method name="&lt;init>()V" />
-		<method name="getKeepAliveDuration(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)J" />
 	</class>
 	<class name="org/apache/http/impl/client/DefaultHttpClient" since="1">
 		<extends name="org/apache/http/impl/client/AbstractHttpClient" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/apache/http/conn/ClientConnectionManager;Lorg/apache/http/params/HttpParams;)V" />
 		<method name="&lt;init>(Lorg/apache/http/params/HttpParams;)V" />
-		<method name="createAuthSchemeRegistry()Lorg/apache/http/auth/AuthSchemeRegistry;" />
-		<method name="createClientConnectionManager()Lorg/apache/http/conn/ClientConnectionManager;" />
-		<method name="createConnectionKeepAliveStrategy()Lorg/apache/http/conn/ConnectionKeepAliveStrategy;" />
-		<method name="createConnectionReuseStrategy()Lorg/apache/http/ConnectionReuseStrategy;" />
-		<method name="createCookieSpecRegistry()Lorg/apache/http/cookie/CookieSpecRegistry;" />
-		<method name="createCookieStore()Lorg/apache/http/client/CookieStore;" />
-		<method name="createCredentialsProvider()Lorg/apache/http/client/CredentialsProvider;" />
-		<method name="createHttpContext()Lorg/apache/http/protocol/HttpContext;" />
-		<method name="createHttpParams()Lorg/apache/http/params/HttpParams;" />
-		<method name="createHttpProcessor()Lorg/apache/http/protocol/BasicHttpProcessor;" />
-		<method name="createHttpRequestRetryHandler()Lorg/apache/http/client/HttpRequestRetryHandler;" />
-		<method name="createHttpRoutePlanner()Lorg/apache/http/conn/routing/HttpRoutePlanner;" />
-		<method name="createProxyAuthenticationHandler()Lorg/apache/http/client/AuthenticationHandler;" />
-		<method name="createRedirectHandler()Lorg/apache/http/client/RedirectHandler;" />
-		<method name="createRequestExecutor()Lorg/apache/http/protocol/HttpRequestExecutor;" />
-		<method name="createTargetAuthenticationHandler()Lorg/apache/http/client/AuthenticationHandler;" />
-		<method name="createUserTokenHandler()Lorg/apache/http/client/UserTokenHandler;" />
 	</class>
 	<class name="org/apache/http/impl/client/DefaultHttpRequestRetryHandler" since="1">
 		<extends name="java/lang/Object" />
@@ -44363,20 +42966,15 @@
 		<method name="&lt;init>(IZ)V" />
 		<method name="getRetryCount()I" />
 		<method name="isRequestSentRetryEnabled()Z" />
-		<method name="retryRequest(Ljava/io/IOException;ILorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<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;" />
-		<method name="isAuthenticationRequested(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/impl/client/DefaultRedirectHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/client/RedirectHandler" />
 		<method name="&lt;init>()V" />
-		<method name="getLocationURI(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Ljava/net/URI;" />
-		<method name="isRedirectRequested(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/impl/client/DefaultRequestDirector" since="1">
 		<extends name="java/lang/Object" />
@@ -44387,7 +42985,6 @@
 		<method name="createTunnelToTarget(Lorg/apache/http/conn/routing/HttpRoute;Lorg/apache/http/protocol/HttpContext;)Z" />
 		<method name="determineRoute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/conn/routing/HttpRoute;" />
 		<method name="establishRoute(Lorg/apache/http/conn/routing/HttpRoute;Lorg/apache/http/protocol/HttpContext;)V" />
-		<method name="execute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/HttpResponse;" />
 		<method name="handleResponse(Lorg/apache/http/impl/client/RoutedRequest;Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/impl/client/RoutedRequest;" />
 		<method name="releaseConnection()V" />
 		<method name="rewriteRequestURI(Lorg/apache/http/impl/client/RequestWrapper;Lorg/apache/http/conn/routing/HttpRoute;)V" />
@@ -44405,22 +43002,16 @@
 	<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;" />
-		<method name="isAuthenticationRequested(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)Z" />
 	</class>
 	<class name="org/apache/http/impl/client/DefaultUserTokenHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/client/UserTokenHandler" />
 		<method name="&lt;init>()V" />
-		<method name="getUserToken(Lorg/apache/http/protocol/HttpContext;)Ljava/lang/Object;" />
 	</class>
 	<class name="org/apache/http/impl/client/EntityEnclosingRequestWrapper" since="1">
 		<extends name="org/apache/http/impl/client/RequestWrapper" />
 		<implements name="org/apache/http/HttpEntityEnclosingRequest" />
 		<method name="&lt;init>(Lorg/apache/http/HttpEntityEnclosingRequest;)V" />
-		<method name="expectContinue()Z" />
-		<method name="getEntity()Lorg/apache/http/HttpEntity;" />
-		<method name="setEntity(Lorg/apache/http/HttpEntity;)V" />
 	</class>
 	<class name="org/apache/http/impl/client/RedirectLocations" since="1">
 		<extends name="java/lang/Object" />
@@ -44433,15 +43024,9 @@
 		<extends name="org/apache/http/message/AbstractHttpMessage" />
 		<implements name="org/apache/http/client/methods/HttpUriRequest" />
 		<method name="&lt;init>(Lorg/apache/http/HttpRequest;)V" />
-		<method name="abort()V" />
 		<method name="getExecCount()I" />
-		<method name="getMethod()Ljava/lang/String;" />
 		<method name="getOriginal()Lorg/apache/http/HttpRequest;" />
-		<method name="getProtocolVersion()Lorg/apache/http/ProtocolVersion;" />
-		<method name="getRequestLine()Lorg/apache/http/RequestLine;" />
-		<method name="getURI()Ljava/net/URI;" />
 		<method name="incrementExecCount()V" />
-		<method name="isAborted()Z" />
 		<method name="isRepeatable()Z" />
 		<method name="resetHeaders()V" />
 		<method name="setMethod(Ljava/lang/String;)V" />
@@ -44465,34 +43050,11 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/ManagedClientConnection" />
 		<method name="&lt;init>(Lorg/apache/http/conn/ClientConnectionManager;Lorg/apache/http/conn/OperatedClientConnection;)V" />
-		<method name="abortConnection()V" />
 		<method name="assertNotAborted()V" />
 		<method name="assertValid(Lorg/apache/http/conn/OperatedClientConnection;)V" />
 		<method name="detach()V" />
-		<method name="flush()V" />
-		<method name="getLocalAddress()Ljava/net/InetAddress;" />
-		<method name="getLocalPort()I" />
 		<method name="getManager()Lorg/apache/http/conn/ClientConnectionManager;" />
-		<method name="getMetrics()Lorg/apache/http/HttpConnectionMetrics;" />
-		<method name="getRemoteAddress()Ljava/net/InetAddress;" />
-		<method name="getRemotePort()I" />
-		<method name="getSSLSession()Ljavax/net/ssl/SSLSession;" />
-		<method name="getSocketTimeout()I" />
 		<method name="getWrappedConnection()Lorg/apache/http/conn/OperatedClientConnection;" />
-		<method name="isMarkedReusable()Z" />
-		<method name="isOpen()Z" />
-		<method name="isResponseAvailable(I)Z" />
-		<method name="isSecure()Z" />
-		<method name="isStale()Z" />
-		<method name="markReusable()V" />
-		<method name="receiveResponseEntity(Lorg/apache/http/HttpResponse;)V" />
-		<method name="receiveResponseHeader()Lorg/apache/http/HttpResponse;" />
-		<method name="releaseConnection()V" />
-		<method name="sendRequestEntity(Lorg/apache/http/HttpEntityEnclosingRequest;)V" />
-		<method name="sendRequestHeader(Lorg/apache/http/HttpRequest;)V" />
-		<method name="setIdleDuration(JLjava/util/concurrent/TimeUnit;)V" />
-		<method name="setSocketTimeout(I)V" />
-		<method name="unmarkReusable()V" />
 	</class>
 	<class name="org/apache/http/impl/conn/AbstractPoolEntry" since="1">
 		<extends name="java/lang/Object" />
@@ -44514,49 +43076,29 @@
 		<extends name="org/apache/http/impl/conn/AbstractClientConnAdapter" />
 		<method name="&lt;init>(Lorg/apache/http/conn/ClientConnectionManager;Lorg/apache/http/impl/conn/AbstractPoolEntry;)V" />
 		<method name="assertAttached()V" />
-		<method name="close()V" />
-		<method name="getRoute()Lorg/apache/http/conn/routing/HttpRoute;" />
-		<method name="getState()Ljava/lang/Object;" />
-		<method name="layerProtocol(Lorg/apache/http/protocol/HttpContext;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="open(Lorg/apache/http/conn/routing/HttpRoute;Lorg/apache/http/protocol/HttpContext;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="setState(Ljava/lang/Object;)V" />
-		<method name="shutdown()V" />
-		<method name="tunnelProxy(Lorg/apache/http/HttpHost;ZLorg/apache/http/params/HttpParams;)V" />
-		<method name="tunnelTarget(ZLorg/apache/http/params/HttpParams;)V" />
 		<field name="poolEntry" />
 	</class>
 	<class name="org/apache/http/impl/conn/DefaultClientConnection" since="1">
 		<extends name="org/apache/http/impl/SocketHttpClientConnection" />
 		<implements name="org/apache/http/conn/OperatedClientConnection" />
 		<method name="&lt;init>()V" />
-		<method name="getSocket()Ljava/net/Socket;" />
-		<method name="getTargetHost()Lorg/apache/http/HttpHost;" />
-		<method name="isSecure()Z" />
-		<method name="openCompleted(ZLorg/apache/http/params/HttpParams;)V" />
-		<method name="opening(Ljava/net/Socket;Lorg/apache/http/HttpHost;)V" />
-		<method name="update(Ljava/net/Socket;Lorg/apache/http/HttpHost;ZLorg/apache/http/params/HttpParams;)V" />
 	</class>
 	<class name="org/apache/http/impl/conn/DefaultClientConnectionOperator" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/ClientConnectionOperator" />
 		<method name="&lt;init>(Lorg/apache/http/conn/scheme/SchemeRegistry;)V" />
-		<method name="createConnection()Lorg/apache/http/conn/OperatedClientConnection;" />
-		<method name="openConnection(Lorg/apache/http/conn/OperatedClientConnection;Lorg/apache/http/HttpHost;Ljava/net/InetAddress;Lorg/apache/http/protocol/HttpContext;Lorg/apache/http/params/HttpParams;)V" />
 		<method name="prepareSocket(Ljava/net/Socket;Lorg/apache/http/protocol/HttpContext;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="updateSecureConnection(Lorg/apache/http/conn/OperatedClientConnection;Lorg/apache/http/HttpHost;Lorg/apache/http/protocol/HttpContext;Lorg/apache/http/params/HttpParams;)V" />
 		<field name="schemeRegistry" />
 	</class>
 	<class name="org/apache/http/impl/conn/DefaultHttpRoutePlanner" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/routing/HttpRoutePlanner" />
 		<method name="&lt;init>(Lorg/apache/http/conn/scheme/SchemeRegistry;)V" />
-		<method name="determineRoute(Lorg/apache/http/HttpHost;Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)Lorg/apache/http/conn/routing/HttpRoute;" />
 		<field name="schemeRegistry" />
 	</class>
 	<class name="org/apache/http/impl/conn/DefaultResponseParser" since="1">
 		<extends name="org/apache/http/impl/io/AbstractMessageParser" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionInputBuffer;Lorg/apache/http/message/LineParser;Lorg/apache/http/HttpResponseFactory;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="parseHead(Lorg/apache/http/io/SessionInputBuffer;)Lorg/apache/http/HttpMessage;" />
 	</class>
 	<class name="org/apache/http/impl/conn/IdleConnectionHandler" since="1">
 		<extends name="java/lang/Object" />
@@ -44571,25 +43113,11 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/io/SessionInputBuffer" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionInputBuffer;Lorg/apache/http/impl/conn/Wire;)V" />
-		<method name="getMetrics()Lorg/apache/http/io/HttpTransportMetrics;" />
-		<method name="isDataAvailable(I)Z" />
-		<method name="read()I" />
-		<method name="read([B)I" />
-		<method name="read([BII)I" />
-		<method name="readLine()Ljava/lang/String;" />
-		<method name="readLine(Lorg/apache/http/util/CharArrayBuffer;)I" />
 	</class>
 	<class name="org/apache/http/impl/conn/LoggingSessionOutputBuffer" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/io/SessionOutputBuffer" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionOutputBuffer;Lorg/apache/http/impl/conn/Wire;)V" />
-		<method name="flush()V" />
-		<method name="getMetrics()Lorg/apache/http/io/HttpTransportMetrics;" />
-		<method name="write(I)V" />
-		<method name="write([B)V" />
-		<method name="write([BII)V" />
-		<method name="writeLine(Ljava/lang/String;)V" />
-		<method name="writeLine(Lorg/apache/http/util/CharArrayBuffer;)V" />
 	</class>
 	<class name="org/apache/http/impl/conn/ProxySelectorRoutePlanner" since="1">
 		<extends name="java/lang/Object" />
@@ -44597,7 +43125,6 @@
 		<method name="&lt;init>(Lorg/apache/http/conn/scheme/SchemeRegistry;Ljava/net/ProxySelector;)V" />
 		<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;" />
 		<method name="getProxySelector()Ljava/net/ProxySelector;" />
 		<method name="setProxySelector(Ljava/net/ProxySelector;)V" />
@@ -44609,15 +43136,9 @@
 		<implements name="org/apache/http/conn/ClientConnectionManager" />
 		<method name="&lt;init>(Lorg/apache/http/params/HttpParams;Lorg/apache/http/conn/scheme/SchemeRegistry;)V" />
 		<method name="assertStillUp()V" />
-		<method name="closeExpiredConnections()V" />
-		<method name="closeIdleConnections(JLjava/util/concurrent/TimeUnit;)V" />
 		<method name="createConnectionOperator(Lorg/apache/http/conn/scheme/SchemeRegistry;)Lorg/apache/http/conn/ClientConnectionOperator;" />
 		<method name="getConnection(Lorg/apache/http/conn/routing/HttpRoute;Ljava/lang/Object;)Lorg/apache/http/conn/ManagedClientConnection;" />
-		<method name="getSchemeRegistry()Lorg/apache/http/conn/scheme/SchemeRegistry;" />
-		<method name="releaseConnection(Lorg/apache/http/conn/ManagedClientConnection;JLjava/util/concurrent/TimeUnit;)V" />
-		<method name="requestConnection(Lorg/apache/http/conn/routing/HttpRoute;Ljava/lang/Object;)Lorg/apache/http/conn/ClientConnectionRequest;" />
 		<method name="revokeConnection()V" />
-		<method name="shutdown()V" />
 		<field name="MISUSE_MESSAGE" />
 		<field name="alwaysShutDown" />
 		<field name="connOperator" />
@@ -44630,11 +43151,11 @@
 	</class>
 	<class name="org/apache/http/impl/conn/SingleClientConnManager$ConnAdapter" since="1">
 		<extends name="org/apache/http/impl/conn/AbstractPooledConnAdapter" />
-		<method name="&lt;init>(Lorg/apache/http/impl/conn/SingleClientConnManager$PoolEntry;Lorg/apache/http/conn/routing/HttpRoute;)V" />
+		<method name="&lt;init>(Lorg/apache/http/impl/conn/SingleClientConnManager;Lorg/apache/http/impl/conn/SingleClientConnManager$PoolEntry;Lorg/apache/http/conn/routing/HttpRoute;)V" />
 	</class>
 	<class name="org/apache/http/impl/conn/SingleClientConnManager$PoolEntry" since="1">
 		<extends name="org/apache/http/impl/conn/AbstractPoolEntry" />
-		<method name="&lt;init>()V" />
+		<method name="&lt;init>(Lorg/apache/http/impl/conn/SingleClientConnManager;)V" />
 		<method name="close()V" />
 		<method name="shutdown()V" />
 	</class>
@@ -44665,7 +43186,6 @@
 		<method name="freeEntry(Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;ZJLjava/util/concurrent/TimeUnit;)V" />
 		<method name="getEntry(Lorg/apache/http/conn/routing/HttpRoute;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;" />
 		<method name="handleLostEntry(Lorg/apache/http/conn/routing/HttpRoute;)V" />
-		<method name="handleReference(Ljava/lang/ref/Reference;)V" />
 		<method name="requestPoolEntry(Lorg/apache/http/conn/routing/HttpRoute;Ljava/lang/Object;)Lorg/apache/http/impl/conn/tsccm/PoolEntryRequest;" />
 		<method name="shutdown()V" />
 		<field name="idleConnHandler" />
@@ -44699,19 +43219,15 @@
 		<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" />
-		<method name="freeEntry(Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;ZJLjava/util/concurrent/TimeUnit;)V" />
 		<method name="getConnectionsInPool(Lorg/apache/http/conn/routing/HttpRoute;)I" />
 		<method name="getEntryBlocking(Lorg/apache/http/conn/routing/HttpRoute;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;Lorg/apache/http/impl/conn/tsccm/WaitingThreadAborter;)Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;" />
 		<method name="getFreeEntry(Lorg/apache/http/impl/conn/tsccm/RouteSpecificPool;Ljava/lang/Object;)Lorg/apache/http/impl/conn/tsccm/BasicPoolEntry;" />
 		<method name="getRoutePool(Lorg/apache/http/conn/routing/HttpRoute;Z)Lorg/apache/http/impl/conn/tsccm/RouteSpecificPool;" />
-		<method name="handleLostEntry(Lorg/apache/http/conn/routing/HttpRoute;)V" />
 		<method name="newRouteSpecificPool(Lorg/apache/http/conn/routing/HttpRoute;)Lorg/apache/http/impl/conn/tsccm/RouteSpecificPool;" />
 		<method name="newWaitingThread(Ljava/util/concurrent/locks/Condition;Lorg/apache/http/impl/conn/tsccm/RouteSpecificPool;)Lorg/apache/http/impl/conn/tsccm/WaitingThread;" />
 		<method name="notifyWaitingThread(Lorg/apache/http/impl/conn/tsccm/RouteSpecificPool;)V" />
-		<method name="requestPoolEntry(Lorg/apache/http/conn/routing/HttpRoute;Ljava/lang/Object;)Lorg/apache/http/impl/conn/tsccm/PoolEntryRequest;" />
 		<field name="freeConnections" />
 		<field name="maxTotalConnections" />
 		<field name="operator" />
@@ -44719,17 +43235,18 @@
 		<field name="waitingThreads" />
 	</class>
 	<class name="org/apache/http/impl/conn/tsccm/PoolEntryRequest" since="1">
+		<extends name="java/lang/Object" />
 		<method name="abortRequest()V" />
 		<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">
+		<extends name="java/lang/Object" />
 		<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;Lorg/apache/http/impl/conn/tsccm/RefQueueHandler;)V" />
-		<method name="run()V" />
 		<method name="shutdown()V" />
 		<field name="refHandler" />
 		<field name="refQueue" />
@@ -44762,16 +43279,10 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/conn/ClientConnectionManager" />
 		<method name="&lt;init>(Lorg/apache/http/params/HttpParams;Lorg/apache/http/conn/scheme/SchemeRegistry;)V" />
-		<method name="closeExpiredConnections()V" />
-		<method name="closeIdleConnections(JLjava/util/concurrent/TimeUnit;)V" />
 		<method name="createConnectionOperator(Lorg/apache/http/conn/scheme/SchemeRegistry;)Lorg/apache/http/conn/ClientConnectionOperator;" />
 		<method name="createConnectionPool(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/impl/conn/tsccm/AbstractConnPool;" />
 		<method name="getConnectionsInPool()I" />
 		<method name="getConnectionsInPool(Lorg/apache/http/conn/routing/HttpRoute;)I" />
-		<method name="getSchemeRegistry()Lorg/apache/http/conn/scheme/SchemeRegistry;" />
-		<method name="releaseConnection(Lorg/apache/http/conn/ManagedClientConnection;JLjava/util/concurrent/TimeUnit;)V" />
-		<method name="requestConnection(Lorg/apache/http/conn/routing/HttpRoute;Ljava/lang/Object;)Lorg/apache/http/conn/ClientConnectionRequest;" />
-		<method name="shutdown()V" />
 		<field name="connOperator" />
 		<field name="connectionPool" />
 		<field name="schemeRegistry" />
@@ -44796,8 +43307,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/AbstractCookieSpec" since="1">
 		<extends name="java/lang/Object" />
@@ -44810,120 +43319,71 @@
 	</class>
 	<class name="org/apache/http/impl/cookie/BasicClientCookie" since="1">
 		<extends name="java/lang/Object" />
-		<implements name="org/apache/http/cookie/ClientCookie" />
 		<implements name="java/lang/Cloneable" />
+		<implements name="org/apache/http/cookie/ClientCookie" />
 		<implements name="org/apache/http/cookie/SetCookie" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="containsAttribute(Ljava/lang/String;)Z" />
-		<method name="getAttribute(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getComment()Ljava/lang/String;" />
-		<method name="getCommentURL()Ljava/lang/String;" />
-		<method name="getDomain()Ljava/lang/String;" />
-		<method name="getExpiryDate()Ljava/util/Date;" />
-		<method name="getName()Ljava/lang/String;" />
-		<method name="getPath()Ljava/lang/String;" />
-		<method name="getPorts()[I" />
-		<method name="getValue()Ljava/lang/String;" />
-		<method name="getVersion()I" />
-		<method name="isExpired(Ljava/util/Date;)Z" />
-		<method name="isPersistent()Z" />
-		<method name="isSecure()Z" />
 		<method name="setAttribute(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="setComment(Ljava/lang/String;)V" />
-		<method name="setDomain(Ljava/lang/String;)V" />
-		<method name="setExpiryDate(Ljava/util/Date;)V" />
-		<method name="setPath(Ljava/lang/String;)V" />
-		<method name="setSecure(Z)V" />
-		<method name="setValue(Ljava/lang/String;)V" />
-		<method name="setVersion(I)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BasicClientCookie2" since="1">
 		<extends name="org/apache/http/impl/cookie/BasicClientCookie" />
 		<implements name="org/apache/http/cookie/SetCookie2" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="setCommentURL(Ljava/lang/String;)V" />
-		<method name="setDiscard(Z)V" />
-		<method name="setPorts([I)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BasicCommentHandler" since="1">
 		<extends name="org/apache/http/impl/cookie/AbstractCookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BasicDomainHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
-		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BasicExpiresHandler" since="1">
 		<extends name="org/apache/http/impl/cookie/AbstractCookieAttributeHandler" />
 		<method name="&lt;init>([Ljava/lang/String;)V" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BasicMaxAgeHandler" since="1">
 		<extends name="org/apache/http/impl/cookie/AbstractCookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BasicPathHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
-		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BasicSecureHandler" since="1">
 		<extends name="org/apache/http/impl/cookie/AbstractCookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BestMatchSpec" since="1">
 		<extends name="java/lang/Object" />
 		<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;)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;" />
-		<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">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieSpecFactory" />
 		<method name="&lt;init>()V" />
-		<method name="newInstance(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/cookie/CookieSpec;" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BrowserCompatSpec" since="1">
 		<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;)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;" />
 		<field name="DATE_PATTERNS" />
 	</class>
 	<class name="org/apache/http/impl/cookie/BrowserCompatSpecFactory" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieSpecFactory" />
 		<method name="&lt;init>()V" />
-		<method name="newInstance(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/cookie/CookieSpec;" />
 	</class>
 	<class name="org/apache/http/impl/cookie/CookieSpecBase" since="1">
 		<extends name="org/apache/http/impl/cookie/AbstractCookieSpec" />
 		<method name="&lt;init>()V" />
 		<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;" />
-		<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">
 		<extends name="java/lang/Exception" />
@@ -44932,6 +43392,7 @@
 	</class>
 	<class name="org/apache/http/impl/cookie/DateUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="formatDate(Ljava/util/Date;)Ljava/lang/String;" />
 		<method name="formatDate(Ljava/util/Date;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="parseDate(Ljava/lang/String;)Ljava/util/Date;" />
@@ -44956,80 +43417,54 @@
 		<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;)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;" />
 		<field name="EXPIRES_PATTERN" />
 	</class>
 	<class name="org/apache/http/impl/cookie/NetscapeDraftSpecFactory" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieSpecFactory" />
 		<method name="&lt;init>()V" />
-		<method name="newInstance(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/cookie/CookieSpec;" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2109DomainHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
-		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2109Spec" since="1">
 		<extends name="org/apache/http/impl/cookie/CookieSpecBase" />
 		<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;)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;" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2109SpecFactory" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieSpecFactory" />
 		<method name="&lt;init>()V" />
-		<method name="newInstance(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/cookie/CookieSpec;" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2109VersionHandler" since="1">
 		<extends name="org/apache/http/impl/cookie/AbstractCookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
-		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
-		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2965DomainAttributeHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieAttributeHandler" />
 		<method name="&lt;init>()V" />
 		<method name="domainMatch(Ljava/lang/String;Ljava/lang/String;)Z" />
-		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
-		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2965PortAttributeHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
-		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2965Spec" since="1">
 		<extends name="org/apache/http/impl/cookie/RFC2109Spec" />
@@ -45040,15 +43475,11 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieSpecFactory" />
 		<method name="&lt;init>()V" />
-		<method name="newInstance(Lorg/apache/http/params/HttpParams;)Lorg/apache/http/cookie/CookieSpec;" />
 	</class>
 	<class name="org/apache/http/impl/cookie/RFC2965VersionAttributeHandler" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/cookie/CookieAttributeHandler" />
 		<method name="&lt;init>()V" />
-		<method name="match(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)Z" />
-		<method name="parse(Lorg/apache/http/cookie/SetCookie;Ljava/lang/String;)V" />
-		<method name="validate(Lorg/apache/http/cookie/Cookie;Lorg/apache/http/cookie/CookieOrigin;)V" />
 	</class>
 	<class name="org/apache/http/impl/entity/EntityDeserializer" since="1">
 		<extends name="java/lang/Object" />
@@ -45066,19 +43497,16 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/entity/ContentLengthStrategy" />
 		<method name="&lt;init>()V" />
-		<method name="determineLength(Lorg/apache/http/HttpMessage;)J" />
 	</class>
 	<class name="org/apache/http/impl/entity/StrictContentLengthStrategy" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/entity/ContentLengthStrategy" />
 		<method name="&lt;init>()V" />
-		<method name="determineLength(Lorg/apache/http/HttpMessage;)J" />
 	</class>
 	<class name="org/apache/http/impl/io/AbstractMessageParser" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/io/HttpMessageParser" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionInputBuffer;Lorg/apache/http/message/LineParser;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="parse()Lorg/apache/http/HttpMessage;" />
 		<method name="parseHead(Lorg/apache/http/io/SessionInputBuffer;)Lorg/apache/http/HttpMessage;" />
 		<method name="parseHeaders(Lorg/apache/http/io/SessionInputBuffer;IILorg/apache/http/message/LineParser;)[Lorg/apache/http/Header;" />
 		<field name="lineParser" />
@@ -45087,7 +43515,6 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/io/HttpMessageWriter" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionOutputBuffer;Lorg/apache/http/message/LineFormatter;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="write(Lorg/apache/http/HttpMessage;)V" />
 		<method name="writeHeadLine(Lorg/apache/http/HttpMessage;)V" />
 		<field name="lineBuf" />
 		<field name="lineFormatter" />
@@ -45098,34 +43525,20 @@
 		<implements name="org/apache/http/io/SessionInputBuffer" />
 		<method name="&lt;init>()V" />
 		<method name="fillBuffer()I" />
-		<method name="getMetrics()Lorg/apache/http/io/HttpTransportMetrics;" />
 		<method name="hasBufferedData()Z" />
 		<method name="init(Ljava/io/InputStream;ILorg/apache/http/params/HttpParams;)V" />
-		<method name="read()I" />
-		<method name="read([B)I" />
-		<method name="read([BII)I" />
-		<method name="readLine()Ljava/lang/String;" />
-		<method name="readLine(Lorg/apache/http/util/CharArrayBuffer;)I" />
 	</class>
 	<class name="org/apache/http/impl/io/AbstractSessionOutputBuffer" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/io/SessionOutputBuffer" />
 		<method name="&lt;init>()V" />
-		<method name="flush()V" />
 		<method name="flushBuffer()V" />
-		<method name="getMetrics()Lorg/apache/http/io/HttpTransportMetrics;" />
 		<method name="init(Ljava/io/OutputStream;ILorg/apache/http/params/HttpParams;)V" />
-		<method name="write(I)V" />
-		<method name="write([B)V" />
-		<method name="write([BII)V" />
-		<method name="writeLine(Ljava/lang/String;)V" />
-		<method name="writeLine(Lorg/apache/http/util/CharArrayBuffer;)V" />
 	</class>
 	<class name="org/apache/http/impl/io/ChunkedInputStream" since="1">
 		<extends name="java/io/InputStream" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionInputBuffer;)V" />
 		<method name="getFooters()[Lorg/apache/http/Header;" />
-		<method name="read()I" />
 	</class>
 	<class name="org/apache/http/impl/io/ChunkedOutputStream" since="1">
 		<extends name="java/io/OutputStream" />
@@ -45134,78 +43547,70 @@
 		<method name="finish()V" />
 		<method name="flushCache()V" />
 		<method name="flushCacheWithAppend([BII)V" />
-		<method name="write(I)V" />
 		<method name="writeClosingChunk()V" />
 	</class>
 	<class name="org/apache/http/impl/io/ContentLengthInputStream" since="1">
 		<extends name="java/io/InputStream" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionInputBuffer;J)V" />
-		<method name="read()I" />
 	</class>
 	<class name="org/apache/http/impl/io/ContentLengthOutputStream" since="1">
 		<extends name="java/io/OutputStream" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionOutputBuffer;J)V" />
-		<method name="write(I)V" />
 	</class>
 	<class name="org/apache/http/impl/io/HttpRequestParser" since="1">
 		<extends name="org/apache/http/impl/io/AbstractMessageParser" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionInputBuffer;Lorg/apache/http/message/LineParser;Lorg/apache/http/HttpRequestFactory;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="parseHead(Lorg/apache/http/io/SessionInputBuffer;)Lorg/apache/http/HttpMessage;" />
 	</class>
 	<class name="org/apache/http/impl/io/HttpRequestWriter" since="1">
 		<extends name="org/apache/http/impl/io/AbstractMessageWriter" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionOutputBuffer;Lorg/apache/http/message/LineFormatter;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="writeHeadLine(Lorg/apache/http/HttpMessage;)V" />
 	</class>
 	<class name="org/apache/http/impl/io/HttpResponseParser" since="1">
 		<extends name="org/apache/http/impl/io/AbstractMessageParser" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionInputBuffer;Lorg/apache/http/message/LineParser;Lorg/apache/http/HttpResponseFactory;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="parseHead(Lorg/apache/http/io/SessionInputBuffer;)Lorg/apache/http/HttpMessage;" />
 	</class>
 	<class name="org/apache/http/impl/io/HttpResponseWriter" since="1">
 		<extends name="org/apache/http/impl/io/AbstractMessageWriter" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionOutputBuffer;Lorg/apache/http/message/LineFormatter;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="writeHeadLine(Lorg/apache/http/HttpMessage;)V" />
 	</class>
 	<class name="org/apache/http/impl/io/HttpTransportMetricsImpl" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/io/HttpTransportMetrics" />
 		<method name="&lt;init>()V" />
-		<method name="getBytesTransferred()J" />
 		<method name="incrementBytesTransferred(J)V" />
-		<method name="reset()V" />
 		<method name="setBytesTransferred(J)V" />
 	</class>
 	<class name="org/apache/http/impl/io/IdentityInputStream" since="1">
 		<extends name="java/io/InputStream" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionInputBuffer;)V" />
-		<method name="read()I" />
 	</class>
 	<class name="org/apache/http/impl/io/IdentityOutputStream" since="1">
 		<extends name="java/io/OutputStream" />
 		<method name="&lt;init>(Lorg/apache/http/io/SessionOutputBuffer;)V" />
-		<method name="write(I)V" />
 	</class>
 	<class name="org/apache/http/impl/io/SocketInputBuffer" since="1">
 		<extends name="org/apache/http/impl/io/AbstractSessionInputBuffer" />
 		<method name="&lt;init>(Ljava/net/Socket;ILorg/apache/http/params/HttpParams;)V" />
-		<method name="isDataAvailable(I)Z" />
 	</class>
 	<class name="org/apache/http/impl/io/SocketOutputBuffer" since="1">
 		<extends name="org/apache/http/impl/io/AbstractSessionOutputBuffer" />
 		<method name="&lt;init>(Ljava/net/Socket;ILorg/apache/http/params/HttpParams;)V" />
 	</class>
 	<class name="org/apache/http/io/HttpMessageParser" since="1">
+		<extends name="java/lang/Object" />
 		<method name="parse()Lorg/apache/http/HttpMessage;" />
 	</class>
 	<class name="org/apache/http/io/HttpMessageWriter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="write(Lorg/apache/http/HttpMessage;)V" />
 	</class>
 	<class name="org/apache/http/io/HttpTransportMetrics" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getBytesTransferred()J" />
 		<method name="reset()V" />
 	</class>
 	<class name="org/apache/http/io/SessionInputBuffer" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getMetrics()Lorg/apache/http/io/HttpTransportMetrics;" />
 		<method name="isDataAvailable(I)Z" />
 		<method name="read()I" />
@@ -45215,6 +43620,7 @@
 		<method name="readLine(Lorg/apache/http/util/CharArrayBuffer;)I" />
 	</class>
 	<class name="org/apache/http/io/SessionOutputBuffer" since="1">
+		<extends name="java/lang/Object" />
 		<method name="flush()V" />
 		<method name="getMetrics()Lorg/apache/http/io/HttpTransportMetrics;" />
 		<method name="write(I)V" />
@@ -45228,22 +43634,6 @@
 		<implements name="org/apache/http/HttpMessage" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/apache/http/params/HttpParams;)V" />
-		<method name="addHeader(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="addHeader(Lorg/apache/http/Header;)V" />
-		<method name="containsHeader(Ljava/lang/String;)Z" />
-		<method name="getAllHeaders()[Lorg/apache/http/Header;" />
-		<method name="getFirstHeader(Ljava/lang/String;)Lorg/apache/http/Header;" />
-		<method name="getHeaders(Ljava/lang/String;)[Lorg/apache/http/Header;" />
-		<method name="getLastHeader(Ljava/lang/String;)Lorg/apache/http/Header;" />
-		<method name="getParams()Lorg/apache/http/params/HttpParams;" />
-		<method name="headerIterator()Lorg/apache/http/HeaderIterator;" />
-		<method name="headerIterator(Ljava/lang/String;)Lorg/apache/http/HeaderIterator;" />
-		<method name="removeHeader(Lorg/apache/http/Header;)V" />
-		<method name="removeHeaders(Ljava/lang/String;)V" />
-		<method name="setHeader(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="setHeader(Lorg/apache/http/Header;)V" />
-		<method name="setHeaders([Lorg/apache/http/Header;)V" />
-		<method name="setParams(Lorg/apache/http/params/HttpParams;)V" />
 		<field name="headergroup" />
 		<field name="params" />
 	</class>
@@ -45252,10 +43642,6 @@
 		<implements name="java/lang/Cloneable" />
 		<implements name="org/apache/http/Header" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getElements()[Lorg/apache/http/HeaderElement;" />
-		<method name="getName()Ljava/lang/String;" />
-		<method name="getValue()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/message/BasicHeaderElement" since="1">
 		<extends name="java/lang/Object" />
@@ -45263,23 +43649,12 @@
 		<implements name="org/apache/http/HeaderElement" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;[Lorg/apache/http/NameValuePair;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getName()Ljava/lang/String;" />
-		<method name="getParameter(I)Lorg/apache/http/NameValuePair;" />
-		<method name="getParameterByName(Ljava/lang/String;)Lorg/apache/http/NameValuePair;" />
-		<method name="getParameterCount()I" />
-		<method name="getParameters()[Lorg/apache/http/NameValuePair;" />
-		<method name="getValue()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/message/BasicHeaderElementIterator" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HeaderElementIterator" />
 		<method name="&lt;init>(Lorg/apache/http/HeaderIterator;)V" />
 		<method name="&lt;init>(Lorg/apache/http/HeaderIterator;Lorg/apache/http/message/HeaderValueParser;)V" />
-		<method name="hasNext()Z" />
-		<method name="next()Ljava/lang/Object;" />
-		<method name="nextElement()Lorg/apache/http/HeaderElement;" />
-		<method name="remove()V" />
 	</class>
 	<class name="org/apache/http/message/BasicHeaderIterator" since="1">
 		<extends name="java/lang/Object" />
@@ -45287,10 +43662,6 @@
 		<method name="&lt;init>([Lorg/apache/http/Header;Ljava/lang/String;)V" />
 		<method name="filterHeader(I)Z" />
 		<method name="findNext(I)I" />
-		<method name="hasNext()Z" />
-		<method name="next()Ljava/lang/Object;" />
-		<method name="nextHeader()Lorg/apache/http/Header;" />
-		<method name="remove()V" />
 		<field name="allHeaders" />
 		<field name="currentIndex" />
 		<field name="headerName" />
@@ -45304,13 +43675,9 @@
 		<method name="estimateHeaderElementLen(Lorg/apache/http/HeaderElement;)I" />
 		<method name="estimateNameValuePairLen(Lorg/apache/http/NameValuePair;)I" />
 		<method name="estimateParametersLen([Lorg/apache/http/NameValuePair;)I" />
-		<method name="formatElements(Lorg/apache/http/util/CharArrayBuffer;[Lorg/apache/http/HeaderElement;Z)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatElements([Lorg/apache/http/HeaderElement;ZLorg/apache/http/message/HeaderValueFormatter;)Ljava/lang/String;" />
 		<method name="formatHeaderElement(Lorg/apache/http/HeaderElement;ZLorg/apache/http/message/HeaderValueFormatter;)Ljava/lang/String;" />
-		<method name="formatHeaderElement(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/HeaderElement;Z)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatNameValuePair(Lorg/apache/http/NameValuePair;ZLorg/apache/http/message/HeaderValueFormatter;)Ljava/lang/String;" />
-		<method name="formatNameValuePair(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/NameValuePair;Z)Lorg/apache/http/util/CharArrayBuffer;" />
-		<method name="formatParameters(Lorg/apache/http/util/CharArrayBuffer;[Lorg/apache/http/NameValuePair;Z)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatParameters([Lorg/apache/http/NameValuePair;ZLorg/apache/http/message/HeaderValueFormatter;)Ljava/lang/String;" />
 		<method name="isSeparator(C)Z" />
 		<method name="isUnsafe(C)Z" />
@@ -45325,14 +43692,10 @@
 		<method name="createHeaderElement(Ljava/lang/String;Ljava/lang/String;[Lorg/apache/http/NameValuePair;)Lorg/apache/http/HeaderElement;" />
 		<method name="createNameValuePair(Ljava/lang/String;Ljava/lang/String;)Lorg/apache/http/NameValuePair;" />
 		<method name="parseElements(Ljava/lang/String;Lorg/apache/http/message/HeaderValueParser;)[Lorg/apache/http/HeaderElement;" />
-		<method name="parseElements(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)[Lorg/apache/http/HeaderElement;" />
 		<method name="parseHeaderElement(Ljava/lang/String;Lorg/apache/http/message/HeaderValueParser;)Lorg/apache/http/HeaderElement;" />
-		<method name="parseHeaderElement(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Lorg/apache/http/HeaderElement;" />
 		<method name="parseNameValuePair(Ljava/lang/String;Lorg/apache/http/message/HeaderValueParser;)Lorg/apache/http/NameValuePair;" />
-		<method name="parseNameValuePair(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Lorg/apache/http/NameValuePair;" />
 		<method name="parseNameValuePair(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;[C)Lorg/apache/http/NameValuePair;" />
 		<method name="parseParameters(Ljava/lang/String;Lorg/apache/http/message/HeaderValueParser;)[Lorg/apache/http/NameValuePair;" />
-		<method name="parseParameters(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)[Lorg/apache/http/NameValuePair;" />
 		<field name="DEFAULT" />
 	</class>
 	<class name="org/apache/http/message/BasicHttpEntityEnclosingRequest" since="1">
@@ -45341,9 +43704,6 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Lorg/apache/http/ProtocolVersion;)V" />
 		<method name="&lt;init>(Lorg/apache/http/RequestLine;)V" />
-		<method name="expectContinue()Z" />
-		<method name="getEntity()Lorg/apache/http/HttpEntity;" />
-		<method name="setEntity(Lorg/apache/http/HttpEntity;)V" />
 	</class>
 	<class name="org/apache/http/message/BasicHttpRequest" since="1">
 		<extends name="org/apache/http/message/AbstractHttpMessage" />
@@ -45351,8 +43711,6 @@
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Lorg/apache/http/ProtocolVersion;)V" />
 		<method name="&lt;init>(Lorg/apache/http/RequestLine;)V" />
-		<method name="getProtocolVersion()Lorg/apache/http/ProtocolVersion;" />
-		<method name="getRequestLine()Lorg/apache/http/RequestLine;" />
 	</class>
 	<class name="org/apache/http/message/BasicHttpResponse" since="1">
 		<extends name="org/apache/http/message/AbstractHttpMessage" />
@@ -45360,35 +43718,20 @@
 		<method name="&lt;init>(Lorg/apache/http/ProtocolVersion;ILjava/lang/String;)V" />
 		<method name="&lt;init>(Lorg/apache/http/StatusLine;)V" />
 		<method name="&lt;init>(Lorg/apache/http/StatusLine;Lorg/apache/http/ReasonPhraseCatalog;Ljava/util/Locale;)V" />
-		<method name="getEntity()Lorg/apache/http/HttpEntity;" />
-		<method name="getLocale()Ljava/util/Locale;" />
-		<method name="getProtocolVersion()Lorg/apache/http/ProtocolVersion;" />
 		<method name="getReason(I)Ljava/lang/String;" />
-		<method name="getStatusLine()Lorg/apache/http/StatusLine;" />
-		<method name="setEntity(Lorg/apache/http/HttpEntity;)V" />
-		<method name="setLocale(Ljava/util/Locale;)V" />
-		<method name="setReasonPhrase(Ljava/lang/String;)V" />
-		<method name="setStatusCode(I)V" />
-		<method name="setStatusLine(Lorg/apache/http/ProtocolVersion;I)V" />
-		<method name="setStatusLine(Lorg/apache/http/ProtocolVersion;ILjava/lang/String;)V" />
-		<method name="setStatusLine(Lorg/apache/http/StatusLine;)V" />
 	</class>
 	<class name="org/apache/http/message/BasicLineFormatter" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/message/LineFormatter" />
 		<method name="&lt;init>()V" />
-		<method name="appendProtocolVersion(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/ProtocolVersion;)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="doFormatHeader(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/Header;)V" />
 		<method name="doFormatRequestLine(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/RequestLine;)V" />
 		<method name="doFormatStatusLine(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/StatusLine;)V" />
 		<method name="estimateProtocolVersionLen(Lorg/apache/http/ProtocolVersion;)I" />
 		<method name="formatHeader(Lorg/apache/http/Header;Lorg/apache/http/message/LineFormatter;)Ljava/lang/String;" />
-		<method name="formatHeader(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/Header;)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatProtocolVersion(Lorg/apache/http/ProtocolVersion;Lorg/apache/http/message/LineFormatter;)Ljava/lang/String;" />
 		<method name="formatRequestLine(Lorg/apache/http/RequestLine;Lorg/apache/http/message/LineFormatter;)Ljava/lang/String;" />
-		<method name="formatRequestLine(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/RequestLine;)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatStatusLine(Lorg/apache/http/StatusLine;Lorg/apache/http/message/LineFormatter;)Ljava/lang/String;" />
-		<method name="formatStatusLine(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/StatusLine;)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="initBuffer(Lorg/apache/http/util/CharArrayBuffer;)Lorg/apache/http/util/CharArrayBuffer;" />
 		<field name="DEFAULT" />
 	</class>
@@ -45400,15 +43743,10 @@
 		<method name="createProtocolVersion(II)Lorg/apache/http/ProtocolVersion;" />
 		<method name="createRequestLine(Ljava/lang/String;Ljava/lang/String;Lorg/apache/http/ProtocolVersion;)Lorg/apache/http/RequestLine;" />
 		<method name="createStatusLine(Lorg/apache/http/ProtocolVersion;ILjava/lang/String;)Lorg/apache/http/StatusLine;" />
-		<method name="hasProtocolVersion(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Z" />
 		<method name="parseHeader(Ljava/lang/String;Lorg/apache/http/message/LineParser;)Lorg/apache/http/Header;" />
-		<method name="parseHeader(Lorg/apache/http/util/CharArrayBuffer;)Lorg/apache/http/Header;" />
 		<method name="parseProtocolVersion(Ljava/lang/String;Lorg/apache/http/message/LineParser;)Lorg/apache/http/ProtocolVersion;" />
-		<method name="parseProtocolVersion(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Lorg/apache/http/ProtocolVersion;" />
 		<method name="parseRequestLine(Ljava/lang/String;Lorg/apache/http/message/LineParser;)Lorg/apache/http/RequestLine;" />
-		<method name="parseRequestLine(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Lorg/apache/http/RequestLine;" />
 		<method name="parseStatusLine(Ljava/lang/String;Lorg/apache/http/message/LineParser;)Lorg/apache/http/StatusLine;" />
-		<method name="parseStatusLine(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Lorg/apache/http/StatusLine;" />
 		<method name="skipWhitespace(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)V" />
 		<field name="DEFAULT" />
 		<field name="protocol" />
@@ -45419,10 +43757,6 @@
 		<method name="&lt;init>(Ljava/util/List;Ljava/lang/String;)V" />
 		<method name="filterHeader(I)Z" />
 		<method name="findNext(I)I" />
-		<method name="hasNext()Z" />
-		<method name="next()Ljava/lang/Object;" />
-		<method name="nextHeader()Lorg/apache/http/Header;" />
-		<method name="remove()V" />
 		<field name="allHeaders" />
 		<field name="currentIndex" />
 		<field name="headerName" />
@@ -45433,29 +43767,18 @@
 		<implements name="java/lang/Cloneable" />
 		<implements name="org/apache/http/NameValuePair" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getName()Ljava/lang/String;" />
-		<method name="getValue()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/message/BasicRequestLine" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="org/apache/http/RequestLine" />
 		<method name="&lt;init>(Ljava/lang/String;Ljava/lang/String;Lorg/apache/http/ProtocolVersion;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getMethod()Ljava/lang/String;" />
-		<method name="getProtocolVersion()Lorg/apache/http/ProtocolVersion;" />
-		<method name="getUri()Ljava/lang/String;" />
 	</class>
 	<class name="org/apache/http/message/BasicStatusLine" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="java/lang/Cloneable" />
 		<implements name="org/apache/http/StatusLine" />
 		<method name="&lt;init>(Lorg/apache/http/ProtocolVersion;ILjava/lang/String;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getProtocolVersion()Lorg/apache/http/ProtocolVersion;" />
-		<method name="getReasonPhrase()Ljava/lang/String;" />
-		<method name="getStatusCode()I" />
 	</class>
 	<class name="org/apache/http/message/BasicTokenIterator" since="1">
 		<extends name="java/lang/Object" />
@@ -45466,14 +43789,10 @@
 		<method name="findTokenEnd(I)I" />
 		<method name="findTokenSeparator(I)I" />
 		<method name="findTokenStart(I)I" />
-		<method name="hasNext()Z" />
 		<method name="isHttpSeparator(C)Z" />
 		<method name="isTokenChar(C)Z" />
 		<method name="isTokenSeparator(C)Z" />
 		<method name="isWhitespace(C)Z" />
-		<method name="next()Ljava/lang/Object;" />
-		<method name="nextToken()Ljava/lang/String;" />
-		<method name="remove()V" />
 		<field name="HTTP_SEPARATORS" />
 		<field name="currentHeader" />
 		<field name="currentToken" />
@@ -45485,12 +43804,6 @@
 		<implements name="java/lang/Cloneable" />
 		<implements name="org/apache/http/FormattedHeader" />
 		<method name="&lt;init>(Lorg/apache/http/util/CharArrayBuffer;)V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="getBuffer()Lorg/apache/http/util/CharArrayBuffer;" />
-		<method name="getElements()[Lorg/apache/http/HeaderElement;" />
-		<method name="getName()Ljava/lang/String;" />
-		<method name="getValue()Ljava/lang/String;" />
-		<method name="getValuePos()I" />
 	</class>
 	<class name="org/apache/http/message/HeaderGroup" since="1">
 		<extends name="java/lang/Object" />
@@ -45498,7 +43811,6 @@
 		<method name="&lt;init>()V" />
 		<method name="addHeader(Lorg/apache/http/Header;)V" />
 		<method name="clear()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="containsHeader(Ljava/lang/String;)Z" />
 		<method name="copy()Lorg/apache/http/message/HeaderGroup;" />
 		<method name="getAllHeaders()[Lorg/apache/http/Header;" />
@@ -45513,24 +43825,28 @@
 		<method name="updateHeader(Lorg/apache/http/Header;)V" />
 	</class>
 	<class name="org/apache/http/message/HeaderValueFormatter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="formatElements(Lorg/apache/http/util/CharArrayBuffer;[Lorg/apache/http/HeaderElement;Z)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatHeaderElement(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/HeaderElement;Z)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatNameValuePair(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/NameValuePair;Z)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatParameters(Lorg/apache/http/util/CharArrayBuffer;[Lorg/apache/http/NameValuePair;Z)Lorg/apache/http/util/CharArrayBuffer;" />
 	</class>
 	<class name="org/apache/http/message/HeaderValueParser" since="1">
+		<extends name="java/lang/Object" />
 		<method name="parseElements(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)[Lorg/apache/http/HeaderElement;" />
 		<method name="parseHeaderElement(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Lorg/apache/http/HeaderElement;" />
 		<method name="parseNameValuePair(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Lorg/apache/http/NameValuePair;" />
 		<method name="parseParameters(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)[Lorg/apache/http/NameValuePair;" />
 	</class>
 	<class name="org/apache/http/message/LineFormatter" since="1">
+		<extends name="java/lang/Object" />
 		<method name="appendProtocolVersion(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/ProtocolVersion;)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatHeader(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/Header;)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatRequestLine(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/RequestLine;)Lorg/apache/http/util/CharArrayBuffer;" />
 		<method name="formatStatusLine(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/StatusLine;)Lorg/apache/http/util/CharArrayBuffer;" />
 	</class>
 	<class name="org/apache/http/message/LineParser" since="1">
+		<extends name="java/lang/Object" />
 		<method name="hasProtocolVersion(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Z" />
 		<method name="parseHeader(Lorg/apache/http/util/CharArrayBuffer;)Lorg/apache/http/Header;" />
 		<method name="parseProtocolVersion(Lorg/apache/http/util/CharArrayBuffer;Lorg/apache/http/message/ParserCursor;)Lorg/apache/http/ProtocolVersion;" />
@@ -45550,34 +43866,20 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/params/HttpParams" />
 		<method name="&lt;init>()V" />
-		<method name="getBooleanParameter(Ljava/lang/String;Z)Z" />
-		<method name="getDoubleParameter(Ljava/lang/String;D)D" />
-		<method name="getIntParameter(Ljava/lang/String;I)I" />
-		<method name="getLongParameter(Ljava/lang/String;J)J" />
-		<method name="isParameterFalse(Ljava/lang/String;)Z" />
-		<method name="isParameterTrue(Ljava/lang/String;)Z" />
-		<method name="setBooleanParameter(Ljava/lang/String;Z)Lorg/apache/http/params/HttpParams;" />
-		<method name="setDoubleParameter(Ljava/lang/String;D)Lorg/apache/http/params/HttpParams;" />
-		<method name="setIntParameter(Ljava/lang/String;I)Lorg/apache/http/params/HttpParams;" />
-		<method name="setLongParameter(Ljava/lang/String;J)Lorg/apache/http/params/HttpParams;" />
 	</class>
 	<class name="org/apache/http/params/BasicHttpParams" since="1">
 		<extends name="org/apache/http/params/AbstractHttpParams" />
-		<implements name="java/lang/Cloneable" />
 		<implements name="java/io/Serializable" />
+		<implements name="java/lang/Cloneable" />
 		<method name="&lt;init>()V" />
 		<method name="clear()V" />
-		<method name="clone()Ljava/lang/Object;" />
-		<method name="copy()Lorg/apache/http/params/HttpParams;" />
 		<method name="copyParams(Lorg/apache/http/params/HttpParams;)V" />
-		<method name="getParameter(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="isParameterSet(Ljava/lang/String;)Z" />
 		<method name="isParameterSetLocally(Ljava/lang/String;)Z" />
-		<method name="removeParameter(Ljava/lang/String;)Z" />
-		<method name="setParameter(Ljava/lang/String;Ljava/lang/Object;)Lorg/apache/http/params/HttpParams;" />
 		<method name="setParameters([Ljava/lang/String;Ljava/lang/Object;)V" />
 	</class>
 	<class name="org/apache/http/params/CoreConnectionPNames" since="1">
+		<extends name="java/lang/Object" />
 		<field name="CONNECTION_TIMEOUT" />
 		<field name="MAX_HEADER_COUNT" />
 		<field name="MAX_LINE_LENGTH" />
@@ -45588,6 +43890,7 @@
 		<field name="TCP_NODELAY" />
 	</class>
 	<class name="org/apache/http/params/CoreProtocolPNames" since="1">
+		<extends name="java/lang/Object" />
 		<field name="HTTP_CONTENT_CHARSET" />
 		<field name="HTTP_ELEMENT_CHARSET" />
 		<field name="ORIGIN_SERVER" />
@@ -45600,11 +43903,7 @@
 	<class name="org/apache/http/params/DefaultedHttpParams" since="1">
 		<extends name="org/apache/http/params/AbstractHttpParams" />
 		<method name="&lt;init>(Lorg/apache/http/params/HttpParams;Lorg/apache/http/params/HttpParams;)V" />
-		<method name="copy()Lorg/apache/http/params/HttpParams;" />
 		<method name="getDefaults()Lorg/apache/http/params/HttpParams;" />
-		<method name="getParameter(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="removeParameter(Ljava/lang/String;)Z" />
-		<method name="setParameter(Ljava/lang/String;Ljava/lang/Object;)Lorg/apache/http/params/HttpParams;" />
 	</class>
 	<class name="org/apache/http/params/HttpAbstractParamBean" since="1">
 		<extends name="java/lang/Object" />
@@ -45624,6 +43923,7 @@
 	<class name="org/apache/http/params/HttpConnectionParams" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/params/CoreConnectionPNames" />
+		<method name="&lt;init>()V" />
 		<method name="getConnectionTimeout(Lorg/apache/http/params/HttpParams;)I" />
 		<method name="getLinger(Lorg/apache/http/params/HttpParams;)I" />
 		<method name="getSoTimeout(Lorg/apache/http/params/HttpParams;)I" />
@@ -45638,6 +43938,7 @@
 		<method name="setTcpNoDelay(Lorg/apache/http/params/HttpParams;Z)V" />
 	</class>
 	<class name="org/apache/http/params/HttpParams" since="1">
+		<extends name="java/lang/Object" />
 		<method name="copy()Lorg/apache/http/params/HttpParams;" />
 		<method name="getBooleanParameter(Ljava/lang/String;Z)Z" />
 		<method name="getDoubleParameter(Ljava/lang/String;D)D" />
@@ -45665,6 +43966,7 @@
 	<class name="org/apache/http/params/HttpProtocolParams" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/params/CoreProtocolPNames" />
+		<method name="&lt;init>()V" />
 		<method name="getContentCharset(Lorg/apache/http/params/HttpParams;)Ljava/lang/String;" />
 		<method name="getHttpElementCharset(Lorg/apache/http/params/HttpParams;)Ljava/lang/String;" />
 		<method name="getUserAgent(Lorg/apache/http/params/HttpParams;)Ljava/lang/String;" />
@@ -45681,9 +43983,6 @@
 		<implements name="org/apache/http/protocol/HttpContext" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/apache/http/protocol/HttpContext;)V" />
-		<method name="getAttribute(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="removeAttribute(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="setAttribute(Ljava/lang/String;Ljava/lang/Object;)V" />
 	</class>
 	<class name="org/apache/http/protocol/BasicHttpProcessor" since="1">
 		<extends name="java/lang/Object" />
@@ -45696,25 +43995,9 @@
 		<method name="addInterceptor(Lorg/apache/http/HttpRequestInterceptor;I)V" />
 		<method name="addInterceptor(Lorg/apache/http/HttpResponseInterceptor;)V" />
 		<method name="addInterceptor(Lorg/apache/http/HttpResponseInterceptor;I)V" />
-		<method name="addRequestInterceptor(Lorg/apache/http/HttpRequestInterceptor;)V" />
-		<method name="addRequestInterceptor(Lorg/apache/http/HttpRequestInterceptor;I)V" />
-		<method name="addResponseInterceptor(Lorg/apache/http/HttpResponseInterceptor;)V" />
-		<method name="addResponseInterceptor(Lorg/apache/http/HttpResponseInterceptor;I)V" />
 		<method name="clearInterceptors()V" />
-		<method name="clearRequestInterceptors()V" />
-		<method name="clearResponseInterceptors()V" />
-		<method name="clone()Ljava/lang/Object;" />
 		<method name="copy()Lorg/apache/http/protocol/BasicHttpProcessor;" />
 		<method name="copyInterceptors(Lorg/apache/http/protocol/BasicHttpProcessor;)V" />
-		<method name="getRequestInterceptor(I)Lorg/apache/http/HttpRequestInterceptor;" />
-		<method name="getRequestInterceptorCount()I" />
-		<method name="getResponseInterceptor(I)Lorg/apache/http/HttpResponseInterceptor;" />
-		<method name="getResponseInterceptorCount()I" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
-		<method name="process(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)V" />
-		<method name="removeRequestInterceptorByClass(Ljava/lang/Class;)V" />
-		<method name="removeResponseInterceptorByClass(Ljava/lang/Class;)V" />
-		<method name="setInterceptors(Ljava/util/List;)V" />
 		<field name="requestInterceptors" />
 		<field name="responseInterceptors" />
 	</class>
@@ -45722,12 +44005,10 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/protocol/HttpContext" />
 		<method name="&lt;init>(Lorg/apache/http/protocol/HttpContext;Lorg/apache/http/protocol/HttpContext;)V" />
-		<method name="getAttribute(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="getDefaults()Lorg/apache/http/protocol/HttpContext;" />
-		<method name="removeAttribute(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="setAttribute(Ljava/lang/String;Ljava/lang/Object;)V" />
 	</class>
 	<class name="org/apache/http/protocol/ExecutionContext" since="1">
+		<extends name="java/lang/Object" />
 		<field name="HTTP_CONNECTION" />
 		<field name="HTTP_PROXY_HOST" />
 		<field name="HTTP_REQUEST" />
@@ -45737,6 +44018,7 @@
 	</class>
 	<class name="org/apache/http/protocol/HTTP" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="isWhitespace(C)Z" />
 		<field name="ASCII" />
 		<field name="CHARSET_PARAM" />
@@ -45770,6 +44052,7 @@
 		<field name="UTF_8" />
 	</class>
 	<class name="org/apache/http/protocol/HttpContext" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getAttribute(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="removeAttribute(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="setAttribute(Ljava/lang/String;Ljava/lang/Object;)V" />
@@ -45783,9 +44066,11 @@
 		<field name="PATTERN_RFC1123" />
 	</class>
 	<class name="org/apache/http/protocol/HttpExpectationVerifier" since="1">
+		<extends name="java/lang/Object" />
 		<method name="verify(Lorg/apache/http/HttpRequest;Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/HttpProcessor" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<implements name="org/apache/http/HttpResponseInterceptor" />
 	</class>
@@ -45800,22 +44085,24 @@
 		<method name="preProcess(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpProcessor;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/HttpRequestHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="handle(Lorg/apache/http/HttpRequest;Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/HttpRequestHandlerRegistry" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/protocol/HttpRequestHandlerResolver" />
 		<method name="&lt;init>()V" />
-		<method name="lookup(Ljava/lang/String;)Lorg/apache/http/protocol/HttpRequestHandler;" />
 		<method name="matchUriRequestPattern(Ljava/lang/String;Ljava/lang/String;)Z" />
 		<method name="register(Ljava/lang/String;Lorg/apache/http/protocol/HttpRequestHandler;)V" />
 		<method name="setHandlers(Ljava/util/Map;)V" />
 		<method name="unregister(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/apache/http/protocol/HttpRequestHandlerResolver" since="1">
+		<extends name="java/lang/Object" />
 		<method name="lookup(Ljava/lang/String;)Lorg/apache/http/protocol/HttpRequestHandler;" />
 	</class>
 	<class name="org/apache/http/protocol/HttpRequestInterceptorList" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addRequestInterceptor(Lorg/apache/http/HttpRequestInterceptor;)V" />
 		<method name="addRequestInterceptor(Lorg/apache/http/HttpRequestInterceptor;I)V" />
 		<method name="clearRequestInterceptors()V" />
@@ -45825,6 +44112,7 @@
 		<method name="setInterceptors(Ljava/util/List;)V" />
 	</class>
 	<class name="org/apache/http/protocol/HttpResponseInterceptorList" since="1">
+		<extends name="java/lang/Object" />
 		<method name="addResponseInterceptor(Lorg/apache/http/HttpResponseInterceptor;)V" />
 		<method name="addResponseInterceptor(Lorg/apache/http/HttpResponseInterceptor;I)V" />
 		<method name="clearResponseInterceptors()V" />
@@ -45851,61 +44139,51 @@
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/RequestContent" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/RequestDate" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/RequestExpectContinue" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/RequestTargetHost" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/RequestUserAgent" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpRequestInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpRequest;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/ResponseConnControl" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpResponseInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/ResponseContent" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpResponseInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/ResponseDate" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpResponseInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/ResponseServer" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/apache/http/HttpResponseInterceptor" />
 		<method name="&lt;init>()V" />
-		<method name="process(Lorg/apache/http/HttpResponse;Lorg/apache/http/protocol/HttpContext;)V" />
 	</class>
 	<class name="org/apache/http/protocol/SyncBasicHttpContext" since="1">
 		<extends name="org/apache/http/protocol/BasicHttpContext" />
@@ -45965,6 +44243,7 @@
 	</class>
 	<class name="org/apache/http/util/EncodingUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getAsciiBytes(Ljava/lang/String;)[B" />
 		<method name="getAsciiString([B)Ljava/lang/String;" />
 		<method name="getAsciiString([BII)Ljava/lang/String;" />
@@ -45974,6 +44253,7 @@
 	</class>
 	<class name="org/apache/http/util/EntityUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="getContentCharSet(Lorg/apache/http/HttpEntity;)Ljava/lang/String;" />
 		<method name="toByteArray(Lorg/apache/http/HttpEntity;)[B" />
 		<method name="toString(Lorg/apache/http/HttpEntity;)Ljava/lang/String;" />
@@ -45981,10 +44261,12 @@
 	</class>
 	<class name="org/apache/http/util/ExceptionUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="initCause(Ljava/lang/Throwable;Ljava/lang/Throwable;)V" />
 	</class>
 	<class name="org/apache/http/util/LangUtils" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="equals(Ljava/lang/Object;Ljava/lang/Object;)Z" />
 		<method name="equals([Ljava/lang/Object;[Ljava/lang/Object;)Z" />
 		<method name="hashCode(II)I" />
@@ -46136,6 +44418,7 @@
 		<method name="syntaxError(Ljava/lang/String;)Lorg/json/JSONException;" />
 	</class>
 	<class name="org/w3c/dom/Attr" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 		<method name="getName()Ljava/lang/String;" />
 		<method name="getOwnerElement()Lorg/w3c/dom/Element;" />
@@ -46146,9 +44429,11 @@
 		<method name="setValue(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/w3c/dom/CDATASection" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Text" />
 	</class>
 	<class name="org/w3c/dom/CharacterData" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 		<method name="appendData(Ljava/lang/String;)V" />
 		<method name="deleteData(II)V" />
@@ -46160,15 +44445,18 @@
 		<method name="substringData(II)Ljava/lang/String;" />
 	</class>
 	<class name="org/w3c/dom/Comment" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/CharacterData" />
 	</class>
 	<class name="org/w3c/dom/DOMConfiguration" since="8">
+		<extends name="java/lang/Object" />
 		<method name="canSetParameter(Ljava/lang/String;Ljava/lang/Object;)Z" />
 		<method name="getParameter(Ljava/lang/String;)Ljava/lang/Object;" />
 		<method name="getParameterNames()Lorg/w3c/dom/DOMStringList;" />
 		<method name="setParameter(Ljava/lang/String;Ljava/lang/Object;)V" />
 	</class>
 	<class name="org/w3c/dom/DOMError" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getLocation()Lorg/w3c/dom/DOMLocator;" />
 		<method name="getMessage()Ljava/lang/String;" />
 		<method name="getRelatedData()Ljava/lang/Object;" />
@@ -46180,6 +44468,7 @@
 		<field name="SEVERITY_WARNING" />
 	</class>
 	<class name="org/w3c/dom/DOMErrorHandler" since="8">
+		<extends name="java/lang/Object" />
 		<method name="handleError(Lorg/w3c/dom/DOMError;)Z" />
 	</class>
 	<class name="org/w3c/dom/DOMException" since="1">
@@ -46205,20 +44494,24 @@
 		<field name="code" />
 	</class>
 	<class name="org/w3c/dom/DOMImplementation" since="1">
+		<extends name="java/lang/Object" />
 		<method name="createDocument(Ljava/lang/String;Ljava/lang/String;Lorg/w3c/dom/DocumentType;)Lorg/w3c/dom/Document;" />
 		<method name="createDocumentType(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/DocumentType;" />
 		<method name="getFeature(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;" since="8" />
 		<method name="hasFeature(Ljava/lang/String;Ljava/lang/String;)Z" />
 	</class>
 	<class name="org/w3c/dom/DOMImplementationList" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getLength()I" />
 		<method name="item(I)Lorg/w3c/dom/DOMImplementation;" />
 	</class>
 	<class name="org/w3c/dom/DOMImplementationSource" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getDOMImplementation(Ljava/lang/String;)Lorg/w3c/dom/DOMImplementation;" />
 		<method name="getDOMImplementationList(Ljava/lang/String;)Lorg/w3c/dom/DOMImplementationList;" />
 	</class>
 	<class name="org/w3c/dom/DOMLocator" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getByteOffset()I" />
 		<method name="getColumnNumber()I" />
 		<method name="getLineNumber()I" />
@@ -46227,11 +44520,13 @@
 		<method name="getUtf16Offset()I" />
 	</class>
 	<class name="org/w3c/dom/DOMStringList" since="8">
+		<extends name="java/lang/Object" />
 		<method name="contains(Ljava/lang/String;)Z" />
 		<method name="getLength()I" />
 		<method name="item(I)Ljava/lang/String;" />
 	</class>
 	<class name="org/w3c/dom/Document" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 		<method name="adoptNode(Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;" since="8" />
 		<method name="createAttribute(Ljava/lang/String;)Lorg/w3c/dom/Attr;" />
@@ -46266,9 +44561,11 @@
 		<method name="setXmlVersion(Ljava/lang/String;)V" since="8" />
 	</class>
 	<class name="org/w3c/dom/DocumentFragment" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 	</class>
 	<class name="org/w3c/dom/DocumentType" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 		<method name="getEntities()Lorg/w3c/dom/NamedNodeMap;" />
 		<method name="getInternalSubset()Ljava/lang/String;" />
@@ -46278,6 +44575,7 @@
 		<method name="getSystemId()Ljava/lang/String;" />
 	</class>
 	<class name="org/w3c/dom/Element" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 		<method name="getAttribute(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getAttributeNS(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
@@ -46301,6 +44599,7 @@
 		<method name="setIdAttributeNode(Lorg/w3c/dom/Attr;Z)V" since="8" />
 	</class>
 	<class name="org/w3c/dom/Entity" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 		<method name="getInputEncoding()Ljava/lang/String;" since="8" />
 		<method name="getNotationName()Ljava/lang/String;" />
@@ -46310,9 +44609,11 @@
 		<method name="getXmlVersion()Ljava/lang/String;" since="8" />
 	</class>
 	<class name="org/w3c/dom/EntityReference" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 	</class>
 	<class name="org/w3c/dom/NameList" since="8">
+		<extends name="java/lang/Object" />
 		<method name="contains(Ljava/lang/String;)Z" />
 		<method name="containsNS(Ljava/lang/String;Ljava/lang/String;)Z" />
 		<method name="getLength()I" />
@@ -46320,6 +44621,7 @@
 		<method name="getNamespaceURI(I)Ljava/lang/String;" />
 	</class>
 	<class name="org/w3c/dom/NamedNodeMap" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getLength()I" />
 		<method name="getNamedItem(Ljava/lang/String;)Lorg/w3c/dom/Node;" />
 		<method name="getNamedItemNS(Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Node;" />
@@ -46330,6 +44632,7 @@
 		<method name="setNamedItemNS(Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;" />
 	</class>
 	<class name="org/w3c/dom/Node" since="1">
+		<extends name="java/lang/Object" />
 		<method name="appendChild(Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;" />
 		<method name="cloneNode(Z)Lorg/w3c/dom/Node;" />
 		<method name="compareDocumentPosition(Lorg/w3c/dom/Node;)S" since="8" />
@@ -46387,21 +44690,25 @@
 		<field name="TEXT_NODE" />
 	</class>
 	<class name="org/w3c/dom/NodeList" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getLength()I" />
 		<method name="item(I)Lorg/w3c/dom/Node;" />
 	</class>
 	<class name="org/w3c/dom/Notation" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 		<method name="getPublicId()Ljava/lang/String;" />
 		<method name="getSystemId()Ljava/lang/String;" />
 	</class>
 	<class name="org/w3c/dom/ProcessingInstruction" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/Node" />
 		<method name="getData()Ljava/lang/String;" />
 		<method name="getTarget()Ljava/lang/String;" />
 		<method name="setData(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/w3c/dom/Text" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/w3c/dom/CharacterData" />
 		<method name="getWholeText()Ljava/lang/String;" since="8" />
 		<method name="isElementContentWhitespace()Z" since="8" />
@@ -46409,6 +44716,7 @@
 		<method name="splitText(I)Lorg/w3c/dom/Text;" />
 	</class>
 	<class name="org/w3c/dom/TypeInfo" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getTypeName()Ljava/lang/String;" />
 		<method name="getTypeNamespace()Ljava/lang/String;" />
 		<method name="isDerivedFrom(Ljava/lang/String;Ljava/lang/String;I)Z" />
@@ -46418,6 +44726,7 @@
 		<field name="DERIVATION_UNION" />
 	</class>
 	<class name="org/w3c/dom/UserDataHandler" since="8">
+		<extends name="java/lang/Object" />
 		<method name="handle(SLjava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/Node;Lorg/w3c/dom/Node;)V" />
 		<field name="NODE_ADOPTED" />
 		<field name="NODE_CLONED" />
@@ -46426,6 +44735,7 @@
 		<field name="NODE_RENAMED" />
 	</class>
 	<class name="org/w3c/dom/ls/DOMImplementationLS" since="8">
+		<extends name="java/lang/Object" />
 		<method name="createLSInput()Lorg/w3c/dom/ls/LSInput;" />
 		<method name="createLSOutput()Lorg/w3c/dom/ls/LSOutput;" />
 		<method name="createLSParser(SLjava/lang/String;)Lorg/w3c/dom/ls/LSParser;" />
@@ -46441,6 +44751,7 @@
 		<field name="code" />
 	</class>
 	<class name="org/w3c/dom/ls/LSInput" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getBaseURI()Ljava/lang/String;" />
 		<method name="getByteStream()Ljava/io/InputStream;" />
 		<method name="getCertifiedText()Z" />
@@ -46459,6 +44770,7 @@
 		<method name="setSystemId(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/w3c/dom/ls/LSOutput" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getByteStream()Ljava/io/OutputStream;" />
 		<method name="getCharacterStream()Ljava/io/Writer;" />
 		<method name="getEncoding()Ljava/lang/String;" />
@@ -46469,6 +44781,7 @@
 		<method name="setSystemId(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/w3c/dom/ls/LSParser" since="8">
+		<extends name="java/lang/Object" />
 		<method name="abort()V" />
 		<method name="getAsync()Z" />
 		<method name="getBusy()Z" />
@@ -46485,6 +44798,7 @@
 		<field name="ACTION_REPLACE_CHILDREN" />
 	</class>
 	<class name="org/w3c/dom/ls/LSParserFilter" since="8">
+		<extends name="java/lang/Object" />
 		<method name="acceptNode(Lorg/w3c/dom/Node;)S" />
 		<method name="getWhatToShow()I" />
 		<method name="startElement(Lorg/w3c/dom/Element;)S" />
@@ -46494,9 +44808,11 @@
 		<field name="FILTER_SKIP" />
 	</class>
 	<class name="org/w3c/dom/ls/LSResourceResolver" since="8">
+		<extends name="java/lang/Object" />
 		<method name="resolveResource(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/ls/LSInput;" />
 	</class>
 	<class name="org/w3c/dom/ls/LSSerializer" since="8">
+		<extends name="java/lang/Object" />
 		<method name="getDomConfig()Lorg/w3c/dom/DOMConfiguration;" />
 		<method name="getNewLine()Ljava/lang/String;" />
 		<method name="setNewLine(Ljava/lang/String;)V" />
@@ -46505,6 +44821,7 @@
 		<method name="writeToURI(Lorg/w3c/dom/Node;Ljava/lang/String;)Z" />
 	</class>
 	<class name="org/xml/sax/AttributeList" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getLength()I" />
 		<method name="getName(I)Ljava/lang/String;" />
 		<method name="getType(I)Ljava/lang/String;" />
@@ -46513,6 +44830,7 @@
 		<method name="getValue(Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="org/xml/sax/Attributes" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getIndex(Ljava/lang/String;)I" />
 		<method name="getIndex(Ljava/lang/String;Ljava/lang/String;)I" />
 		<method name="getLength()I" />
@@ -46527,6 +44845,7 @@
 		<method name="getValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 	</class>
 	<class name="org/xml/sax/ContentHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="characters([CII)V" />
 		<method name="endDocument()V" />
 		<method name="endElement(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
@@ -46540,10 +44859,12 @@
 		<method name="startPrefixMapping(Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/xml/sax/DTDHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="notationDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="unparsedEntityDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/xml/sax/DocumentHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="characters([CII)V" />
 		<method name="endDocument()V" />
 		<method name="endElement(Ljava/lang/String;)V" />
@@ -46554,9 +44875,11 @@
 		<method name="startElement(Ljava/lang/String;Lorg/xml/sax/AttributeList;)V" />
 	</class>
 	<class name="org/xml/sax/EntityResolver" since="1">
+		<extends name="java/lang/Object" />
 		<method name="resolveEntity(Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;" />
 	</class>
 	<class name="org/xml/sax/ErrorHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="error(Lorg/xml/sax/SAXParseException;)V" />
 		<method name="fatalError(Lorg/xml/sax/SAXParseException;)V" />
 		<method name="warning(Lorg/xml/sax/SAXParseException;)V" />
@@ -46568,20 +44891,6 @@
 		<implements name="org/xml/sax/EntityResolver" />
 		<implements name="org/xml/sax/ErrorHandler" />
 		<method name="&lt;init>()V" />
-		<method name="characters([CII)V" />
-		<method name="endDocument()V" />
-		<method name="endElement(Ljava/lang/String;)V" />
-		<method name="error(Lorg/xml/sax/SAXParseException;)V" />
-		<method name="fatalError(Lorg/xml/sax/SAXParseException;)V" />
-		<method name="ignorableWhitespace([CII)V" />
-		<method name="notationDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="processingInstruction(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="resolveEntity(Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;" />
-		<method name="setDocumentLocator(Lorg/xml/sax/Locator;)V" />
-		<method name="startDocument()V" />
-		<method name="startElement(Ljava/lang/String;Lorg/xml/sax/AttributeList;)V" />
-		<method name="unparsedEntityDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="warning(Lorg/xml/sax/SAXParseException;)V" />
 	</class>
 	<class name="org/xml/sax/InputSource" since="1">
 		<extends name="java/lang/Object" />
@@ -46601,12 +44910,14 @@
 		<method name="setSystemId(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/xml/sax/Locator" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getColumnNumber()I" />
 		<method name="getLineNumber()I" />
 		<method name="getPublicId()Ljava/lang/String;" />
 		<method name="getSystemId()Ljava/lang/String;" />
 	</class>
 	<class name="org/xml/sax/Parser" since="1">
+		<extends name="java/lang/Object" />
 		<method name="parse(Ljava/lang/String;)V" />
 		<method name="parse(Lorg/xml/sax/InputSource;)V" />
 		<method name="setDTDHandler(Lorg/xml/sax/DTDHandler;)V" />
@@ -46645,11 +44956,13 @@
 		<method name="getSystemId()Ljava/lang/String;" />
 	</class>
 	<class name="org/xml/sax/XMLFilter" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/xml/sax/XMLReader" />
 		<method name="getParent()Lorg/xml/sax/XMLReader;" />
 		<method name="setParent(Lorg/xml/sax/XMLReader;)V" />
 	</class>
 	<class name="org/xml/sax/XMLReader" since="1">
+		<extends name="java/lang/Object" />
 		<method name="getContentHandler()Lorg/xml/sax/ContentHandler;" />
 		<method name="getDTDHandler()Lorg/xml/sax/DTDHandler;" />
 		<method name="getEntityResolver()Lorg/xml/sax/EntityResolver;" />
@@ -46666,6 +44979,7 @@
 		<method name="setProperty(Ljava/lang/String;Ljava/lang/Object;)V" />
 	</class>
 	<class name="org/xml/sax/ext/Attributes2" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/xml/sax/Attributes" />
 		<method name="isDeclared(I)Z" />
 		<method name="isDeclared(Ljava/lang/String;)Z" />
@@ -46679,16 +44993,11 @@
 		<implements name="org/xml/sax/ext/Attributes2" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/xml/sax/Attributes;)V" />
-		<method name="isDeclared(I)Z" />
-		<method name="isDeclared(Ljava/lang/String;)Z" />
-		<method name="isDeclared(Ljava/lang/String;Ljava/lang/String;)Z" />
-		<method name="isSpecified(I)Z" />
-		<method name="isSpecified(Ljava/lang/String;)Z" />
-		<method name="isSpecified(Ljava/lang/String;Ljava/lang/String;)Z" />
 		<method name="setDeclared(IZ)V" />
 		<method name="setSpecified(IZ)V" />
 	</class>
 	<class name="org/xml/sax/ext/DeclHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="attributeDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="elementDecl(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="externalEntityDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
@@ -46700,26 +45009,15 @@
 		<implements name="org/xml/sax/ext/EntityResolver2" />
 		<implements name="org/xml/sax/ext/LexicalHandler" />
 		<method name="&lt;init>()V" />
-		<method name="attributeDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="comment([CII)V" />
-		<method name="elementDecl(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="endCDATA()V" />
-		<method name="endDTD()V" />
-		<method name="endEntity(Ljava/lang/String;)V" />
-		<method name="externalEntityDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="getExternalSubset(Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;" />
-		<method name="internalEntityDecl(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="resolveEntity(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;" />
-		<method name="startCDATA()V" />
-		<method name="startDTD(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="startEntity(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/xml/sax/ext/EntityResolver2" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/xml/sax/EntityResolver" />
 		<method name="getExternalSubset(Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;" />
 		<method name="resolveEntity(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;" />
 	</class>
 	<class name="org/xml/sax/ext/LexicalHandler" since="1">
+		<extends name="java/lang/Object" />
 		<method name="comment([CII)V" />
 		<method name="endCDATA()V" />
 		<method name="endDTD()V" />
@@ -46729,6 +45027,7 @@
 		<method name="startEntity(Ljava/lang/String;)V" />
 	</class>
 	<class name="org/xml/sax/ext/Locator2" since="1">
+		<extends name="java/lang/Object" />
 		<implements name="org/xml/sax/Locator" />
 		<method name="getEncoding()Ljava/lang/String;" />
 		<method name="getXMLVersion()Ljava/lang/String;" />
@@ -46738,8 +45037,6 @@
 		<implements name="org/xml/sax/ext/Locator2" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/xml/sax/Locator;)V" />
-		<method name="getEncoding()Ljava/lang/String;" />
-		<method name="getXMLVersion()Ljava/lang/String;" />
 		<method name="setEncoding(Ljava/lang/String;)V" />
 		<method name="setXMLVersion(Ljava/lang/String;)V" />
 	</class>
@@ -46750,12 +45047,6 @@
 		<method name="&lt;init>(Lorg/xml/sax/AttributeList;)V" />
 		<method name="addAttribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="clear()V" />
-		<method name="getLength()I" />
-		<method name="getName(I)Ljava/lang/String;" />
-		<method name="getType(I)Ljava/lang/String;" />
-		<method name="getType(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getValue(I)Ljava/lang/String;" />
-		<method name="getValue(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="removeAttribute(Ljava/lang/String;)V" />
 		<method name="setAttributeList(Lorg/xml/sax/AttributeList;)V" />
 	</class>
@@ -46766,18 +45057,6 @@
 		<method name="&lt;init>(Lorg/xml/sax/Attributes;)V" />
 		<method name="addAttribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="clear()V" />
-		<method name="getIndex(Ljava/lang/String;)I" />
-		<method name="getIndex(Ljava/lang/String;Ljava/lang/String;)I" />
-		<method name="getLength()I" />
-		<method name="getLocalName(I)Ljava/lang/String;" />
-		<method name="getQName(I)Ljava/lang/String;" />
-		<method name="getType(I)Ljava/lang/String;" />
-		<method name="getType(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getType(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getURI(I)Ljava/lang/String;" />
-		<method name="getValue(I)Ljava/lang/String;" />
-		<method name="getValue(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="removeAttribute(I)V" />
 		<method name="setAttribute(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="setAttributes(Lorg/xml/sax/Attributes;)V" />
@@ -46794,33 +45073,12 @@
 		<implements name="org/xml/sax/EntityResolver" />
 		<implements name="org/xml/sax/ErrorHandler" />
 		<method name="&lt;init>()V" />
-		<method name="characters([CII)V" />
-		<method name="endDocument()V" />
-		<method name="endElement(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="endPrefixMapping(Ljava/lang/String;)V" />
-		<method name="error(Lorg/xml/sax/SAXParseException;)V" />
-		<method name="fatalError(Lorg/xml/sax/SAXParseException;)V" />
-		<method name="ignorableWhitespace([CII)V" />
-		<method name="notationDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="processingInstruction(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="resolveEntity(Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;" />
-		<method name="setDocumentLocator(Lorg/xml/sax/Locator;)V" />
-		<method name="skippedEntity(Ljava/lang/String;)V" />
-		<method name="startDocument()V" />
-		<method name="startElement(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/xml/sax/Attributes;)V" />
-		<method name="startPrefixMapping(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="unparsedEntityDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="warning(Lorg/xml/sax/SAXParseException;)V" />
 	</class>
 	<class name="org/xml/sax/helpers/LocatorImpl" since="1">
 		<extends name="java/lang/Object" />
 		<implements name="org/xml/sax/Locator" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/xml/sax/Locator;)V" />
-		<method name="getColumnNumber()I" />
-		<method name="getLineNumber()I" />
-		<method name="getPublicId()Ljava/lang/String;" />
-		<method name="getSystemId()Ljava/lang/String;" />
 		<method name="setColumnNumber(I)V" />
 		<method name="setLineNumber(I)V" />
 		<method name="setPublicId(Ljava/lang/String;)V" />
@@ -46850,31 +45108,10 @@
 		<implements name="org/xml/sax/XMLReader" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/xml/sax/Parser;)V" />
-		<method name="characters([CII)V" />
-		<method name="endDocument()V" />
-		<method name="endElement(Ljava/lang/String;)V" />
-		<method name="getContentHandler()Lorg/xml/sax/ContentHandler;" />
-		<method name="getDTDHandler()Lorg/xml/sax/DTDHandler;" />
-		<method name="getEntityResolver()Lorg/xml/sax/EntityResolver;" />
-		<method name="getErrorHandler()Lorg/xml/sax/ErrorHandler;" />
-		<method name="getFeature(Ljava/lang/String;)Z" />
-		<method name="getProperty(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="ignorableWhitespace([CII)V" />
-		<method name="parse(Ljava/lang/String;)V" />
-		<method name="parse(Lorg/xml/sax/InputSource;)V" />
-		<method name="processingInstruction(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="setContentHandler(Lorg/xml/sax/ContentHandler;)V" />
-		<method name="setDTDHandler(Lorg/xml/sax/DTDHandler;)V" />
-		<method name="setDocumentLocator(Lorg/xml/sax/Locator;)V" />
-		<method name="setEntityResolver(Lorg/xml/sax/EntityResolver;)V" />
-		<method name="setErrorHandler(Lorg/xml/sax/ErrorHandler;)V" />
-		<method name="setFeature(Ljava/lang/String;Z)V" />
-		<method name="setProperty(Ljava/lang/String;Ljava/lang/Object;)V" />
-		<method name="startDocument()V" />
-		<method name="startElement(Ljava/lang/String;Lorg/xml/sax/AttributeList;)V" />
 	</class>
 	<class name="org/xml/sax/helpers/ParserFactory" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="makeParser()Lorg/xml/sax/Parser;" />
 		<method name="makeParser(Ljava/lang/String;)Lorg/xml/sax/Parser;" />
 	</class>
@@ -46887,39 +45124,6 @@
 		<implements name="org/xml/sax/XMLFilter" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/xml/sax/XMLReader;)V" />
-		<method name="characters([CII)V" />
-		<method name="endDocument()V" />
-		<method name="endElement(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="endPrefixMapping(Ljava/lang/String;)V" />
-		<method name="error(Lorg/xml/sax/SAXParseException;)V" />
-		<method name="fatalError(Lorg/xml/sax/SAXParseException;)V" />
-		<method name="getContentHandler()Lorg/xml/sax/ContentHandler;" />
-		<method name="getDTDHandler()Lorg/xml/sax/DTDHandler;" />
-		<method name="getEntityResolver()Lorg/xml/sax/EntityResolver;" />
-		<method name="getErrorHandler()Lorg/xml/sax/ErrorHandler;" />
-		<method name="getFeature(Ljava/lang/String;)Z" />
-		<method name="getParent()Lorg/xml/sax/XMLReader;" />
-		<method name="getProperty(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="ignorableWhitespace([CII)V" />
-		<method name="notationDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="parse(Ljava/lang/String;)V" />
-		<method name="parse(Lorg/xml/sax/InputSource;)V" />
-		<method name="processingInstruction(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="resolveEntity(Ljava/lang/String;Ljava/lang/String;)Lorg/xml/sax/InputSource;" />
-		<method name="setContentHandler(Lorg/xml/sax/ContentHandler;)V" />
-		<method name="setDTDHandler(Lorg/xml/sax/DTDHandler;)V" />
-		<method name="setDocumentLocator(Lorg/xml/sax/Locator;)V" />
-		<method name="setEntityResolver(Lorg/xml/sax/EntityResolver;)V" />
-		<method name="setErrorHandler(Lorg/xml/sax/ErrorHandler;)V" />
-		<method name="setFeature(Ljava/lang/String;Z)V" />
-		<method name="setParent(Lorg/xml/sax/XMLReader;)V" />
-		<method name="setProperty(Ljava/lang/String;Ljava/lang/Object;)V" />
-		<method name="skippedEntity(Ljava/lang/String;)V" />
-		<method name="startDocument()V" />
-		<method name="startElement(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/xml/sax/Attributes;)V" />
-		<method name="startPrefixMapping(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="unparsedEntityDecl(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="warning(Lorg/xml/sax/SAXParseException;)V" />
 	</class>
 	<class name="org/xml/sax/helpers/XMLReaderAdapter" since="1">
 		<extends name="java/lang/Object" />
@@ -46927,31 +45131,15 @@
 		<implements name="org/xml/sax/Parser" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/xml/sax/XMLReader;)V" />
-		<method name="characters([CII)V" />
-		<method name="endDocument()V" />
-		<method name="endElement(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="endPrefixMapping(Ljava/lang/String;)V" />
-		<method name="ignorableWhitespace([CII)V" />
-		<method name="parse(Ljava/lang/String;)V" />
-		<method name="parse(Lorg/xml/sax/InputSource;)V" />
-		<method name="processingInstruction(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="setDTDHandler(Lorg/xml/sax/DTDHandler;)V" />
-		<method name="setDocumentHandler(Lorg/xml/sax/DocumentHandler;)V" />
-		<method name="setDocumentLocator(Lorg/xml/sax/Locator;)V" />
-		<method name="setEntityResolver(Lorg/xml/sax/EntityResolver;)V" />
-		<method name="setErrorHandler(Lorg/xml/sax/ErrorHandler;)V" />
-		<method name="setLocale(Ljava/util/Locale;)V" />
-		<method name="skippedEntity(Ljava/lang/String;)V" />
-		<method name="startDocument()V" />
-		<method name="startElement(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/xml/sax/Attributes;)V" />
-		<method name="startPrefixMapping(Ljava/lang/String;Ljava/lang/String;)V" />
 	</class>
 	<class name="org/xml/sax/helpers/XMLReaderFactory" since="1">
 		<extends name="java/lang/Object" />
+		<method name="&lt;init>()V" />
 		<method name="createXMLReader()Lorg/xml/sax/XMLReader;" />
 		<method name="createXMLReader(Ljava/lang/String;)Lorg/xml/sax/XMLReader;" />
 	</class>
 	<class name="org/xmlpull/v1/XmlPullParser" since="1">
+		<extends name="java/lang/Object" />
 		<method name="defineEntityReplacementText(Ljava/lang/String;Ljava/lang/String;)V" />
 		<method name="getAttributeCount()I" />
 		<method name="getAttributeName(I)Ljava/lang/String;" />
@@ -47038,6 +45226,7 @@
 		<field name="serializerClasses" />
 	</class>
 	<class name="org/xmlpull/v1/XmlSerializer" since="1">
+		<extends name="java/lang/Object" />
 		<method name="attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;" />
 		<method name="cdsect(Ljava/lang/String;)V" />
 		<method name="comment(Ljava/lang/String;)V" />
@@ -47071,37 +45260,7 @@
 		<implements name="org/xml/sax/XMLReader" />
 		<method name="&lt;init>()V" />
 		<method name="&lt;init>(Lorg/xmlpull/v1/XmlPullParser;)V" />
-		<method name="getColumnNumber()I" />
-		<method name="getContentHandler()Lorg/xml/sax/ContentHandler;" />
-		<method name="getDTDHandler()Lorg/xml/sax/DTDHandler;" />
-		<method name="getEntityResolver()Lorg/xml/sax/EntityResolver;" />
-		<method name="getErrorHandler()Lorg/xml/sax/ErrorHandler;" />
-		<method name="getFeature(Ljava/lang/String;)Z" />
-		<method name="getIndex(Ljava/lang/String;)I" />
-		<method name="getIndex(Ljava/lang/String;Ljava/lang/String;)I" />
-		<method name="getLength()I" />
-		<method name="getLineNumber()I" />
-		<method name="getLocalName(I)Ljava/lang/String;" />
-		<method name="getProperty(Ljava/lang/String;)Ljava/lang/Object;" />
-		<method name="getPublicId()Ljava/lang/String;" />
-		<method name="getQName(I)Ljava/lang/String;" />
-		<method name="getSystemId()Ljava/lang/String;" />
-		<method name="getType(I)Ljava/lang/String;" />
-		<method name="getType(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getType(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getURI(I)Ljava/lang/String;" />
-		<method name="getValue(I)Ljava/lang/String;" />
-		<method name="getValue(Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="getValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" />
-		<method name="parse(Ljava/lang/String;)V" />
-		<method name="parse(Lorg/xml/sax/InputSource;)V" />
 		<method name="parseSubTree(Lorg/xmlpull/v1/XmlPullParser;)V" />
-		<method name="setContentHandler(Lorg/xml/sax/ContentHandler;)V" />
-		<method name="setDTDHandler(Lorg/xml/sax/DTDHandler;)V" />
-		<method name="setEntityResolver(Lorg/xml/sax/EntityResolver;)V" />
-		<method name="setErrorHandler(Lorg/xml/sax/ErrorHandler;)V" />
-		<method name="setFeature(Ljava/lang/String;Z)V" />
-		<method name="setProperty(Ljava/lang/String;Ljava/lang/Object;)V" />
 		<method name="startElement(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" />
 		<field name="APACHE_DYNAMIC_VALIDATION_FEATURE" />
 		<field name="APACHE_SCHEMA_VALIDATION_FEATURE" />