diff --git a/android-sdk-annotations/android/accessibilityservice/annotations.xml b/android-sdk-annotations/android/accessibilityservice/annotations.xml
index dd67f4159d7..a2948df9939 100644
--- a/android-sdk-annotations/android/accessibilityservice/annotations.xml
+++ b/android-sdk-annotations/android/accessibilityservice/annotations.xml
@@ -1,29 +1,59 @@
 <root>
-    <item name='android.accessibilityservice.AccessibilityServiceInfo java.lang.String feedbackTypeToString(int)'>
+    <item name='android.accessibilityservice.IAccessibilityServiceConnection.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accessibilityservice.AccessibilityService android.os.IBinder onBind(android.content.Intent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.accessibilityservice.IAccessibilityServiceClient.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.accessibilityservice.AccessibilityServiceInfo void updateDynamicallyConfigurableProperties(android.accessibilityservice.AccessibilityServiceInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.accessibilityservice.IAccessibilityServiceConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accessibilityservice.IAccessibilityServiceConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accessibilityservice.AccessibilityService.Callbacks void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accessibilityservice.AccessibilityService.IAccessibilityServiceClientWrapper void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.accessibilityservice.AccessibilityServiceInfo java.lang.String loadDescription(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accessibilityservice.AccessibilityService.IAccessibilityServiceClientWrapper void executeMessage(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accessibilityservice.IAccessibilityServiceConnection.Stub android.os.IBinder asBinder()'>
+    <item name='android.accessibilityservice.IAccessibilityServiceConnection void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accessibilityservice.IAccessibilityServiceClient.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accessibilityservice.AccessibilityServiceInfo java.lang.String feedbackTypeToString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accessibilityservice.IAccessibilityServiceClient void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accessibilityservice.AccessibilityServiceInfo void setComponentName(android.content.ComponentName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.accessibilityservice.IAccessibilityServiceClient.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accessibilityservice.AccessibilityServiceInfo java.util.List&lt;android.accessibilityservice.AccessibilityServiceInfo.CapabilityInfo&gt; getCapabilityInfos()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.accessibilityservice.AccessibilityServiceInfo AccessibilityServiceInfo(android.content.pm.ResolveInfo, android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accessibilityservice.IAccessibilityServiceClient.Stub android.os.IBinder asBinder()'>
+    <item name='android.accessibilityservice.AccessibilityServiceInfo java.lang.String capabilityToString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accessibilityservice.AccessibilityServiceInfo AccessibilityServiceInfo(android.content.pm.ResolveInfo, android.content.Context) 1'>
@@ -32,16 +62,10 @@
     <item name='android.accessibilityservice.AccessibilityServiceInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accessibilityservice.AccessibilityServiceInfo java.lang.String capabilityToString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accessibilityservice.AccessibilityServiceInfo java.util.List&lt;android.accessibilityservice.AccessibilityServiceInfo.CapabilityInfo&gt; getCapabilityInfos()'>
+    <item name='android.accessibilityservice.AccessibilityServiceInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accessibilityservice.AccessibilityService android.os.IBinder onBind(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accessibilityservice.AccessibilityServiceInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/accounts/annotations.xml b/android-sdk-annotations/android/accounts/annotations.xml
index 68fd4596e6c..dc55fa826a0 100644
--- a/android-sdk-annotations/android/accounts/annotations.xml
+++ b/android-sdk-annotations/android/accounts/annotations.xml
@@ -1,80 +1,80 @@
 <root>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
+    <item name='android.accounts.IAccountManager void hasFeatures(android.accounts.IAccountManagerResponse, android.accounts.Account, java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountAndUser java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void removeAccount(android.accounts.IAccountManagerResponse, android.accounts.Account) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt; removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+    <item name='android.accounts.IAccountManager void addAccount(android.accounts.IAccountManagerResponse, java.lang.String, java.lang.String, java.lang.String[], boolean, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager java.lang.String getUserData(android.accounts.Account, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; addAccount(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+    <item name='android.accounts.AbstractAccountAuthenticator android.os.Bundle getAccountRemovalAllowed(android.accounts.AccountAuthenticatorResponse, android.accounts.Account)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountAuthenticatorResponse.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.accounts.IAccountManager void getAuthToken(android.accounts.IAccountManagerResponse, android.accounts.Account, java.lang.String, boolean, boolean, android.os.Bundle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AuthenticatorDescription android.accounts.AuthenticatorDescription newKey(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.accounts.AccountManager java.lang.String peekAuthToken(android.accounts.Account, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.ChooseTypeAndAccountActivity void runAddAccountForAuthenticator(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AuthenticatorDescription AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager java.lang.String getPassword(android.accounts.Account) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.accounts.AccountManager android.accounts.Account[] getAccountsByTypeAsUser(java.lang.String, android.os.UserHandle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AuthenticatorDescription AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.ChooseTypeAndAccountActivity void onSaveInstanceState(android.os.Bundle) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 1'>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager android.accounts.Account[] getSharedAccounts(android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentialsAsUser(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler, android.os.UserHandle) 0'>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void invalidateAuthToken(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager void setUserData(android.accounts.Account, java.lang.String, java.lang.String) 1'>
+    <item name='android.accounts.IAccountManager void confirmCredentialsAsUser(android.accounts.IAccountManagerResponse, android.accounts.Account, android.os.Bundle, boolean, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager boolean removeSharedAccount(android.accounts.Account, android.os.UserHandle) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.Account Account(android.os.Parcel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager void setPassword(android.accounts.Account, java.lang.String) 0'>
+    <item name='android.accounts.IAccountManager void removeAccount(android.accounts.IAccountManagerResponse, android.accounts.Account) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager java.lang.String getUserData(android.accounts.Account, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.GrantCredentialsPermissionActivity void onClick(android.view.View) 0'>
+    <item name='android.accounts.AccountManager android.accounts.Account[] getAccounts()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt; hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;, android.os.Handler) 0'>
@@ -83,73 +83,61 @@
     <item name='android.accounts.AccountManager void clearPassword(android.accounts.Account) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.IAccountAuthenticator.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt; removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;, android.os.Handler)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+    <item name='android.accounts.IAccountManager void getAccountsByFeatures(android.accounts.IAccountManagerResponse, java.lang.String, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager java.lang.String peekAuthToken(android.accounts.Account, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+    <item name='android.accounts.IAccountManager void getAuthToken(android.accounts.IAccountManagerResponse, android.accounts.Account, java.lang.String, boolean, boolean, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AuthenticatorDescription AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int) 0'>
+    <item name='android.accounts.IAccountManager void getAuthTokenLabel(android.accounts.IAccountManagerResponse, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager void invalidateAuthToken(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManager get(android.content.Context) 0'>
+    <item name='android.accounts.AccountManager android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList&lt;android.accounts.Account&gt;, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
+    <item name='android.accounts.IAccountManager void setUserData(android.accounts.Account, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager void setUserData(android.accounts.Account, java.lang.String, java.lang.String) 0'>
+    <item name='android.accounts.IAccountManager void invalidateAuthToken(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentialsAsUser(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler, android.os.UserHandle) 5'>
+    <item name='android.accounts.IAccountAuthenticatorResponse.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AbstractAccountAuthenticator android.os.Bundle getAccountRemovalAllowed(android.accounts.AccountAuthenticatorResponse, android.accounts.Account)'>
+    <item name='android.accounts.Account java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountAndUser java.lang.String toString()'>
+    <item name='android.accounts.IAccountManager java.lang.String getPassword(android.accounts.Account) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
+    <item name='android.accounts.IAccountManager void hasFeatures(android.accounts.IAccountManagerResponse, android.accounts.Account, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt; hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.IAccountManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.accounts.IAccountAuthenticator.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AuthenticatorDescription java.lang.String toString()'>
+    <item name='android.accounts.IAccountManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AuthenticatorDescription android.accounts.AuthenticatorDescription newKey(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager java.lang.String blockingGetAuthToken(android.accounts.Account, java.lang.String, boolean) 1'>
+    <item name='android.accounts.IAccountAuthenticatorResponse void onResult(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 1'>
+    <item name='android.accounts.IAccountManager void setUserData(android.accounts.Account, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AuthenticatorDescription void writeToParcel(android.os.Parcel, int) 0'>
@@ -161,75 +149,240 @@
     <item name='android.accounts.AccountAuthenticatorResponse AccountAuthenticatorResponse(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AuthenticatorDescription android.accounts.AuthenticatorDescription newKey(java.lang.String)'>
+    <item name='android.accounts.IAccountManager boolean addSharedAccountAsUser(android.accounts.Account, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 1'>
+    <item name='android.accounts.IAccountManager void updateCredentials(android.accounts.IAccountManagerResponse, android.accounts.Account, java.lang.String, boolean, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt; hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;, android.os.Handler)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String) 0'>
+    <item name='android.accounts.IAccountManager void hasFeatures(android.accounts.IAccountManagerResponse, android.accounts.Account, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.accounts.Account[]&gt; getAccountsByTypeAndFeatures(java.lang.String, java.lang.String[], android.accounts.AccountManagerCallback&lt;android.accounts.Account[]&gt;, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.Account void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.accounts.IAccountManager void addAccount(android.accounts.IAccountManagerResponse, java.lang.String, java.lang.String, java.lang.String[], boolean, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void getAuthToken(android.accounts.IAccountManagerResponse, android.accounts.Account, java.lang.String, boolean, boolean, android.os.Bundle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;java.lang.String&gt; getAuthTokenLabel(java.lang.String, java.lang.String, android.accounts.AccountManagerCallback&lt;java.lang.String&gt;, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager java.lang.String blockingGetAuthToken(android.accounts.Account, java.lang.String, boolean) 0'>
+    <item name='android.accounts.Account void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList&lt;android.accounts.Account&gt;, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle)'>
+    <item name='android.accounts.IAccountAuthenticatorResponse.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountAuthenticatorResponse void onResult(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AccountManager void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.IAccountManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; addAccount(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.AuthenticatorDescription AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int, boolean) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountAuthenticatorResponse void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManagerResponse AccountManagerResponse(android.os.Parcel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+    <item name='android.accounts.IAccountManager void clearPassword(android.accounts.Account) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;java.lang.String&gt; getAuthTokenLabel(java.lang.String, java.lang.String, android.accounts.AccountManagerCallback&lt;java.lang.String&gt;, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.IAccountAuthenticatorResponse.Stub android.os.IBinder asBinder()'>
+    <item name='android.accounts.IAccountManagerResponse void onResult(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.accounts.Account java.lang.String toString()'>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt; hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void confirmCredentialsAsUser(android.accounts.IAccountManagerResponse, android.accounts.Account, android.os.Bundle, boolean, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt; removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AuthenticatorDescription java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void updateCredentials(android.accounts.IAccountManagerResponse, android.accounts.Account, java.lang.String, boolean, android.os.Bundle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManagerResponse.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.accounts.IAccountManagerResponse.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.accounts.AuthenticatorDescription AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager java.lang.String getPassword(android.accounts.Account) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AuthenticatorDescription AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.ChooseTypeAndAccountActivity void onSaveInstanceState(android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.accounts.Account[]&gt; getAccountsByTypeAndFeatures(java.lang.String, java.lang.String[], android.accounts.AccountManagerCallback&lt;android.accounts.Account[]&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager java.lang.String getUserData(android.accounts.Account, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentialsAsUser(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager void setUserData(android.accounts.Account, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager boolean removeSharedAccount(android.accounts.Account, android.os.UserHandle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.Account Account(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager void setPassword(android.accounts.Account, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.GrantCredentialsPermissionActivity void onClick(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountAuthenticator void getAuthTokenLabel(android.accounts.IAccountAuthenticatorResponse, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void updateCredentials(android.accounts.IAccountManagerResponse, android.accounts.Account, java.lang.String, boolean, android.os.Bundle) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManagerResponse.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AuthenticatorDescription AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManager get(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager void setUserData(android.accounts.Account, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager java.lang.String getUserData(android.accounts.Account, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentialsAsUser(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler, android.os.UserHandle) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void setPassword(android.accounts.Account, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void editProperties(android.accounts.IAccountManagerResponse, java.lang.String, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager java.lang.String blockingGetAuthToken(android.accounts.Account, java.lang.String, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager java.lang.String peekAuthToken(android.accounts.Account, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountAuthenticator.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager java.lang.String peekAuthToken(android.accounts.Account, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; addAccount(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void getAccountsByFeatures(android.accounts.IAccountManagerResponse, java.lang.String, java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void getAuthTokenLabel(android.accounts.IAccountManagerResponse, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void editProperties(android.accounts.IAccountManagerResponse, java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager java.lang.String blockingGetAuthToken(android.accounts.Account, java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountAuthenticator.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; addAccount(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager boolean removeSharedAccountAsUser(android.accounts.Account, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountAuthenticatorResponse void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AuthenticatorDescription AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManagerResponse AccountManagerResponse(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountManager void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.AccountManager.BaseFutureTask.Response void onResult(android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.accounts.IAccountAuthenticator void getAccountRemovalAllowed(android.accounts.IAccountAuthenticatorResponse, android.accounts.Account) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.accounts.AccountManager boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/animation/annotations.xml b/android-sdk-annotations/android/animation/annotations.xml
index 291773b91eb..c5f975c8b64 100644
--- a/android-sdk-annotations/android/animation/annotations.xml
+++ b/android-sdk-annotations/android/animation/annotations.xml
@@ -1,59 +1,68 @@
 <root>
-    <item name='android.animation.PropertyValuesHolder void setIntValues(int...) 0'>
+    <item name='android.animation.FloatEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ValueAnimator android.animation.ValueAnimator ofPropertyValuesHolder(android.animation.PropertyValuesHolder...)'>
+    <item name='android.animation.PropertyValuesHolder void setIntValues(int...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.FloatEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.PropertyValuesHolder java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofInt(java.lang.Object, java.lang.String, int...)'>
+    <item name='android.animation.Keyframe java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofFloat(android.util.Property&lt;?,java.lang.Float&gt;, float...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.Animator java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.animation.ValueAnimator android.animation.ValueAnimator ofObject(android.animation.TypeEvaluator, java.lang.Object...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.IntEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofObject(java.lang.String, android.animation.TypeEvaluator, java.lang.Object...)'>
+    <item name='android.animation.ValueAnimator android.animation.ValueAnimator ofFloat(float...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.AnimatorSet android.animation.AnimatorSet setDuration(long)'>
+    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofKeyframe(java.lang.String, android.animation.Keyframe...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.IntEvaluator java.lang.Integer evaluate(float, java.lang.Integer, java.lang.Integer) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.Keyframe android.animation.Keyframe ofObject(float, java.lang.Object)'>
+    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofObject(android.util.Property, android.animation.TypeEvaluator&lt;V&gt;, V...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator clone()'>
+    <item name='android.animation.Animator.AnimatorListener void onAnimationEnd(android.animation.Animator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ObjectAnimator android.animation.ValueAnimator setDuration(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofFloat(java.lang.String, float...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ValueAnimator android.animation.Animator setDuration(long)'>
+    <item name='android.animation.Keyframe android.animation.Keyframe clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.FloatEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object)'>
+    <item name='android.animation.Keyframe android.animation.Keyframe ofObject(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.Keyframe void setValue(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofInt(java.lang.Object, java.lang.String, int...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.Animator java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.LayoutTransition void showChild(android.view.ViewGroup, android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator setDuration(long)'>
+    <item name='android.animation.PropertyValuesHolder java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.AnimatorSet.Builder android.animation.AnimatorSet.Builder after(android.animation.Animator)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofKeyframe(android.util.Property, android.animation.Keyframe...) 1'>
@@ -62,118 +71,106 @@
     <item name='android.animation.RectEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.TypeEvaluator T evaluate(float, T, T)'>
+    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofPropertyValuesHolder(java.lang.Object, android.animation.PropertyValuesHolder...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofInt(android.util.Property&lt;?,java.lang.Integer&gt;, int...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.Animator android.animation.Animator clone()'>
+    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofFloat(T, android.util.Property&lt;T,java.lang.Float&gt;, float...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.AnimatorSet.Builder android.animation.AnimatorSet.Builder before(android.animation.Animator)'>
+    <item name='android.animation.AnimatorListenerAdapter void onAnimationEnd(android.animation.Animator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ObjectAnimator android.animation.ValueAnimator setDuration(long)'>
+    <item name='android.animation.Keyframe android.animation.Keyframe ofObject(float, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.IntEvaluator java.lang.Integer evaluate(float, java.lang.Integer, java.lang.Integer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.AnimatorSet java.util.ArrayList&lt;android.animation.Animator&gt; getChildAnimations()'>
+    <item name='android.animation.ValueAnimator android.animation.ValueAnimator ofPropertyValuesHolder(android.animation.PropertyValuesHolder...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ObjectAnimator java.lang.Object clone()'>
+    <item name='android.animation.ValueAnimator android.animation.Animator clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.ObjectAnimator void setProperty(android.util.Property) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.animation.IntEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.animation.FloatEvaluator java.lang.Float evaluate(float, java.lang.Number, java.lang.Number) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.animation.Keyframe java.lang.Object getValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofInt(T, android.util.Property&lt;T,java.lang.Integer&gt;, int...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.animation.ObjectAnimator java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ObjectAnimator void setIntValues(int...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofFloat(java.lang.String, float...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.RectEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.IntEvaluator java.lang.Integer evaluate(float, java.lang.Integer, java.lang.Integer)'>
+    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofObject(java.lang.Object, java.lang.String, android.animation.TypeEvaluator, java.lang.Object...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.LayoutTransition void removeChild(android.view.ViewGroup, android.view.View) 1'>
+    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofObject(T, android.util.Property&lt;T,V&gt;, android.animation.TypeEvaluator&lt;V&gt;, V...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.AnimatorSet java.util.ArrayList&lt;android.animation.Animator&gt; getChildAnimations()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.LayoutTransition void hideChild(android.view.ViewGroup, android.view.View, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.Keyframe android.animation.Keyframe ofFloat(float, float)'>
+    <item name='android.animation.AnimatorSet.Builder android.animation.AnimatorSet.Builder before(android.animation.Animator)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofKeyframe(java.lang.String, android.animation.Keyframe...)'>
+    <item name='android.animation.LayoutTransition void removeChild(android.view.ViewGroup, android.view.View) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ValueAnimator java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ValueAnimator void setFloatValues(float...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofObject(android.util.Property, android.animation.TypeEvaluator&lt;V&gt;, V...) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ArgbEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object)'>
+    <item name='android.animation.ValueAnimator android.animation.ValueAnimator setDuration(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.LayoutTransition void hideChild(android.view.ViewGroup, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.Keyframe android.animation.Keyframe ofInt(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ValueAnimator java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.AnimatorSet android.animation.AnimatorSet clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.Keyframe android.animation.Keyframe ofObject(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.animation.PropertyValuesHolder void setFloatValues(float...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ValueAnimator android.animation.Animator clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ValueAnimator android.animation.ValueAnimator ofFloat(float...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofInt(java.lang.String, int...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.IntEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.animation.FloatEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofObject(T, android.util.Property&lt;T,V&gt;, android.animation.TypeEvaluator&lt;V&gt;, V...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.animation.ValueAnimator.AnimatorUpdateListener void onAnimationUpdate(android.animation.ValueAnimator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.animation.AnimatorInflater android.animation.Animator loadAnimator(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.AnimatorSet.Builder android.animation.AnimatorSet.Builder after(android.animation.Animator)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.Keyframe android.animation.Keyframe ofFloat(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ObjectAnimator android.animation.Animator setDuration(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofFloat(android.util.Property&lt;?,java.lang.Float&gt;, float...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ObjectAnimator java.lang.String toString()'>
+    <item name='android.animation.ObjectAnimator android.animation.Animator clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.LayoutTransition void hideChild(android.view.ViewGroup, android.view.View, int) 0'>
@@ -182,60 +179,72 @@
     <item name='android.animation.IntEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofFloat(java.lang.Object, java.lang.String, float...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofPropertyValuesHolder(java.lang.Object, android.animation.PropertyValuesHolder...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofObject(T, android.util.Property&lt;T,V&gt;, android.animation.TypeEvaluator&lt;V&gt;, V...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofKeyframe(android.util.Property, android.animation.Keyframe...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.AnimatorSet android.animation.Animator setDuration(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofFloat(T, android.util.Property&lt;T,java.lang.Float&gt;, float...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.PropertyValuesHolder void setObjectValues(java.lang.Object...) 0'>
+    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator setDuration(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.AnimatorSet.Builder android.animation.AnimatorSet.Builder with(android.animation.Animator)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ArgbEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object) 1'>
+    <item name='android.animation.RectEvaluator android.graphics.Rect evaluate(float, android.graphics.Rect, android.graphics.Rect)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofObject(java.lang.Object, java.lang.String, android.animation.TypeEvaluator, java.lang.Object...)'>
+    <item name='android.animation.ValueAnimator android.animation.ValueAnimator clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.RectEvaluator android.graphics.Rect evaluate(float, android.graphics.Rect, android.graphics.Rect) 2'>
+    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofFloat(java.lang.Object, java.lang.String, float...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ValueAnimator java.lang.Object clone()'>
+    <item name='android.animation.TypeEvaluator T evaluate(float, T, T)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofInt(java.lang.String, int...) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ValueAnimator android.animation.ValueAnimator setDuration(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.ValueAnimator android.animation.ValueAnimator ofPropertyValuesHolder(android.animation.PropertyValuesHolder...) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.AnimatorSet.Builder android.animation.AnimatorSet.Builder after(long)'>
+    <item name='android.animation.Keyframe android.animation.Keyframe ofInt(float, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.Animator android.animation.Animator setDuration(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.animation.AnimatorSet.Builder android.animation.AnimatorSet.Builder after(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.PropertyValuesHolder void setObjectValues(java.lang.Object...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ArgbEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ValueAnimator android.animation.Animator setDuration(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.Keyframe android.animation.Keyframe ofFloat(float, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.RectEvaluator android.graphics.Rect evaluate(float, android.graphics.Rect, android.graphics.Rect) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ValueAnimator void setIntValues(int...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.animation.FloatEvaluator java.lang.Float evaluate(float, java.lang.Number, java.lang.Number)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofObject(java.lang.String, android.animation.TypeEvaluator, java.lang.Object...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofFloat(android.util.Property&lt;?,java.lang.Float&gt;, float...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofInt(java.lang.String, int...) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.AnimatorSet android.animation.Animator clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ValueAnimator android.animation.ValueAnimator ofPropertyValuesHolder(android.animation.PropertyValuesHolder...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ObjectAnimator java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.animation.LayoutTransition void layoutChange(android.view.ViewGroup) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -248,46 +257,49 @@
     <item name='android.animation.LayoutTransition void removeChild(android.view.ViewGroup, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.animation.AnimatorSet android.animation.AnimatorSet clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.AnimatorSet java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.animation.TypeEvaluator T evaluate(float, T, T) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.RectEvaluator android.graphics.Rect evaluate(float, android.graphics.Rect, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ObjectAnimator android.animation.Animator clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofObject(android.util.Property, android.animation.TypeEvaluator&lt;V&gt;, V...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.RectEvaluator android.graphics.Rect evaluate(float, android.graphics.Rect, android.graphics.Rect)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.Keyframe android.animation.Keyframe ofInt(float, int)'>
+    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofInt(android.util.Property&lt;?,java.lang.Integer&gt;, int...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.RectEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ValueAnimator android.animation.ValueAnimator clone()'>
+    <item name='android.animation.IntEvaluator java.lang.Integer evaluate(float, java.lang.Integer, java.lang.Integer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.Keyframe android.animation.Keyframe ofInt(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.Keyframe android.animation.Keyframe ofFloat(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofKeyframe(java.lang.String, android.animation.Keyframe...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ValueAnimator android.animation.ValueAnimator ofInt(int...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.animation.AnimatorSet android.animation.Animator clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.animation.FloatEvaluator java.lang.Float evaluate(float, java.lang.Number, java.lang.Number) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.ObjectAnimator android.animation.ValueAnimator clone()'>
+    <item name='android.animation.ValueAnimator java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.AnimatorSet java.lang.Object clone()'>
+    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofInt(java.lang.String, int...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.AnimatorSet android.animation.AnimatorSet setDuration(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.ValueAnimator void setValues(android.animation.PropertyValuesHolder...) 0'>
@@ -302,15 +314,36 @@
     <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofFloat(T, android.util.Property&lt;T,java.lang.Float&gt;, float...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofInt(android.util.Property&lt;?,java.lang.Integer&gt;, int...)'>
+    <item name='android.animation.ObjectAnimator void setFloatValues(float...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.Animator android.animation.Animator clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ObjectAnimator android.animation.Animator setDuration(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.animation.LayoutTransition void addChild(android.view.ViewGroup, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder ofKeyframe(android.util.Property, android.animation.Keyframe...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.AnimatorSet android.animation.Animator setDuration(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.animation.ObjectAnimator android.animation.ObjectAnimator ofInt(T, android.util.Property&lt;T,java.lang.Integer&gt;, int...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.animation.ObjectAnimator android.animation.ValueAnimator clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ArgbEvaluator java.lang.Object evaluate(float, java.lang.Object, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.animation.ValueAnimator android.animation.ValueAnimator ofInt(int...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.animation.LayoutTransition void showChild(android.view.ViewGroup, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/app/admin/annotations.xml b/android-sdk-annotations/android/app/admin/annotations.xml
index 9599a5ccec5..68adebe669f 100644
--- a/android-sdk-annotations/android/app/admin/annotations.xml
+++ b/android-sdk-annotations/android/app/admin/annotations.xml
@@ -2,37 +2,22 @@
     <item name='android.app.admin.DevicePolicyManager android.content.ComponentName setGlobalProxy(android.content.ComponentName, java.net.Proxy, java.util.List&lt;java.lang.String&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.admin.DeviceAdminInfo void readPoliciesFromXml(org.xmlpull.v1.XmlPullParser) 0'>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordQuality(android.content.ComponentName, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.admin.DeviceAdminInfo java.lang.CharSequence loadDescription(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.admin.IDevicePolicyManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.admin.DeviceAdminInfo android.content.ComponentName getComponent()'>
+    <item name='android.app.admin.IDevicePolicyManager boolean setDeviceOwner(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.admin.DeviceAdminReceiver android.app.admin.DevicePolicyManager getManager(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.admin.DeviceAdminInfo java.util.ArrayList&lt;android.app.admin.DeviceAdminInfo.PolicyInfo&gt; getUsedPolicies()'>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordExpirationTimeout(android.content.ComponentName, long, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.admin.DeviceAdminInfo android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.admin.IDevicePolicyManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.admin.DeviceAdminInfo java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.admin.DeviceAdminReceiver void onReceive(android.content.Context, android.content.Intent) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.admin.DeviceAdminInfo DeviceAdminInfo(android.content.Context, android.content.pm.ResolveInfo) 0'>
+    <item name='android.app.admin.IDevicePolicyManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.admin.DeviceAdminInfo void dump(android.util.Printer, java.lang.String) 0'>
@@ -44,13 +29,82 @@
     <item name='android.app.admin.DeviceAdminReceiver void onReceive(android.content.Context, android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.admin.DeviceAdminInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.admin.DeviceAdminInfo void writePoliciesToXml(org.xmlpull.v1.XmlSerializer) 0'>
+    <item name='android.app.admin.DeviceAdminInfo java.util.ArrayList&lt;android.app.admin.DeviceAdminInfo.PolicyInfo&gt; getUsedPolicies()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.admin.DeviceAdminInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.admin.IDevicePolicyManager int setStorageEncryption(android.content.ComponentName, boolean, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordHistoryLength(android.content.ComponentName, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setKeyguardDisabledFeatures(android.content.ComponentName, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.DeviceAdminInfo void readPoliciesFromXml(org.xmlpull.v1.XmlPullParser) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordMinimumLowerCase(android.content.ComponentName, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.DeviceAdminInfo android.content.ComponentName getComponent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordMinimumSymbols(android.content.ComponentName, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.DeviceAdminInfo android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setCameraDisabled(android.content.ComponentName, boolean, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.DeviceAdminInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager boolean resetPassword(java.lang.String, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordMinimumNumeric(android.content.ComponentName, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.DeviceAdminInfo java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setMaximumTimeToLock(android.content.ComponentName, long, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.DeviceAdminReceiver void onReceive(android.content.Context, android.content.Intent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordMinimumNonLetter(android.content.ComponentName, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.DeviceAdminInfo DeviceAdminInfo(android.content.Context, android.content.pm.ResolveInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordMinimumLetters(android.content.ComponentName, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordMinimumUpperCase(android.content.ComponentName, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager void setPasswordMinimumLength(android.content.ComponentName, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.IDevicePolicyManager android.content.ComponentName setGlobalProxy(android.content.ComponentName, java.lang.String, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.admin.DeviceAdminInfo void writePoliciesToXml(org.xmlpull.v1.XmlSerializer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/app/annotations.xml b/android-sdk-annotations/android/app/annotations.xml
index aa9688897cc..b29374c66cf 100644
--- a/android-sdk-annotations/android/app/annotations.xml
+++ b/android-sdk-annotations/android/app/annotations.xml
@@ -1,7 +1,22 @@
 <root>
+    <item name='android.app.Notification.InboxStyle android.app.Notification.InboxStyle setSummaryText(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDescription(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager int startActivityWithConfig(android.app.IApplicationThread, java.lang.String, android.content.Intent, java.lang.String, android.os.IBinder, java.lang.String, int, int, android.content.res.Configuration, android.os.Bundle, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Instrumentation void callActivityOnUserLeaving(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request addRequestHeader(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Activity void startActivities(android.content.Intent[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -14,7 +29,7 @@
     <item name='android.app.DownloadManager long enqueue(android.app.DownloadManager.Request) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.BigTextStyle android.app.Notification build()'>
+    <item name='android.app.IActivityManager void unregisterProcessObserver(android.app.IProcessObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addParentStack(android.app.Activity) 0'>
@@ -23,12 +38,6 @@
     <item name='android.app.Dialog boolean dispatchTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setNumber(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setOnDismissListener(android.content.DialogInterface.OnDismissListener)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Instrumentation android.app.Activity newActivity(java.lang.Class&lt;?&gt;, android.content.Context, android.os.IBinder, android.app.Application, android.content.Intent, android.content.pm.ActivityInfo, java.lang.CharSequence, android.app.Activity, java.lang.String, java.lang.Object) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -38,37 +47,34 @@
     <item name='android.app.Dialog boolean onMenuItemSelected(int, android.view.MenuItem) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Activity android.view.MenuInflater getMenuInflater()'>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putFloat(java.lang.String, float) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void scheduleLaunchActivity(android.content.Intent, android.os.IBinder, int, android.content.pm.ActivityInfo, android.content.res.Configuration, android.content.res.CompatibilityInfo, android.os.Bundle, java.util.List&lt;android.app.ResultInfo&gt;, java.util.List&lt;android.content.Intent&gt;, boolean, boolean, java.lang.String, android.os.ParcelFileDescriptor, boolean) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.MediaRouteButton MediaRouteButton(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleDownAnimation(android.view.View, android.graphics.Bitmap, int, int, android.app.ActivityOptions.OnAnimationStartedListener) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.LoadedApk LoadedApk(android.app.ActivityThread, android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo, android.app.ActivityThread, java.lang.ClassLoader, boolean, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putString(java.lang.String, java.lang.String)'>
+    <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleDownAnimation(android.view.View, android.graphics.Bitmap, int, int, android.app.ActivityOptions.OnAnimationStartedListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActionBar void addTab(android.app.ActionBar.Tab, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setMimeType(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.IInstrumentationWatcher.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setSmallIcon(int)'>
+    <item name='android.app.Notification.BigPictureStyle android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationInExternalPublicDir(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setContentDescription(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction show(android.app.Fragment)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction add(android.app.Fragment, java.lang.String)'>
+    <item name='android.app.IApplicationThread void scheduleBindService(android.os.IBinder, android.content.Intent, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActionBar.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
@@ -77,42 +83,69 @@
     <item name='android.app.ActivityManager.RunningServiceInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.KeyguardManager android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void backupAgentCreated(java.lang.String, android.os.IBinder) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager android.os.Debug.MemoryInfo[] getProcessMemoryInfo(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.UiAutomation.AccessibilityEventFilter boolean accept(android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.MediaRouteButton MediaRouteButton(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.DialogFragment void onSaveInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setLights(int, int, int)'>
+    <item name='android.app.LoadedApk android.content.pm.ApplicationInfo getApplicationInfo()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.content.Context getContext()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setCustomAnimations(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int, android.app.ActivityOptions.OnAnimationStartedListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IApplicationThread void scheduleConfigurationChanged(android.content.res.Configuration) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ActivityManager.ProcessErrorStateInfo void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Notification.Builder android.app.Notification buildInto(android.app.Notification) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.BigPictureStyle android.app.Notification.BigPictureStyle setSummaryText(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.PendingIntent void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.AlertDialog boolean onKeyUp(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder create(android.content.Context)'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setNumber(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.InboxStyle android.app.Notification.InboxStyle setSummaryText(java.lang.CharSequence)'>
+    <item name='android.app.IUserSwitchObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction hide(android.app.Fragment)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setTitle(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity boolean startActivityIfNeeded(android.content.Intent, int, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IAlarmManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ActivityManager.RecentTaskInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -125,31 +158,58 @@
     <item name='android.app.TimePickerDialog TimePickerDialog(android.content.Context, int, android.app.TimePickerDialog.OnTimeSetListener, int, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentBreadCrumbs FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.app.IActivityManager boolean bindBackupAgent(android.content.pm.ApplicationInfo, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification buildInto(android.app.Notification)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setCursor(android.database.Cursor, android.content.DialogInterface.OnClickListener, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setContentDescription(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void scheduleLaunchActivity(android.content.Intent, android.os.IBinder, int, android.content.pm.ActivityInfo, android.content.res.Configuration, android.content.res.CompatibilityInfo, android.os.Bundle, java.util.List&lt;android.app.ResultInfo&gt;, java.util.List&lt;android.content.Intent&gt;, boolean, boolean, java.lang.String, android.os.ParcelFileDescriptor, boolean) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentBreadCrumbs FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Fragment void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setWhen(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity boolean onKeyUp(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean)'>
+    <item name='android.app.IActivityManager int checkGrantUriPermission(int, java.lang.String, android.net.Uri, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation android.app.Instrumentation.ActivityMonitor addMonitor(android.content.IntentFilter, android.app.Instrumentation.ActivityResult, boolean)'>
+    <item name='android.app.TimePickerDialog android.os.Bundle onSaveInstanceState()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Dialog void onRestoreInstanceState(android.os.Bundle) 0'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setPositiveButton(int, android.content.DialogInterface.OnClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setCustomAnimations(int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setContentText(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void unstableProviderDied(android.os.IBinder) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager android.app.IActivityManager.WaitResult startActivityAndWait(android.app.IApplicationThread, java.lang.String, android.content.Intent, java.lang.String, android.os.IBinder, java.lang.String, int, int, java.lang.String, android.os.ParcelFileDescriptor, android.os.Bundle, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity boolean onMenuItemSelected(int, android.view.MenuItem) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent)'>
+    <item name='android.app.Dialog void onRestoreInstanceState(android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager boolean refContentProvider(android.os.IBinder, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getActivityAsUser(android.content.Context, int, android.content.Intent, int, android.os.Bundle, android.os.UserHandle) 0'>
@@ -158,16 +218,43 @@
     <item name='android.app.ActivityManager.MemoryInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IUserSwitchObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Action android.app.Notification.Action clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Instrumentation android.app.Activity newActivity(java.lang.Class&lt;?&gt;, android.content.Context, android.os.IBinder, android.app.Application, android.content.Intent, android.content.pm.ActivityInfo, java.lang.CharSequence, android.app.Activity, java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setBreadCrumbTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.IAlarmManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Activity android.app.FragmentManager getFragmentManager()'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMultiChoiceItems(java.lang.CharSequence[], boolean[], android.content.DialogInterface.OnMultiChoiceClickListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IActivityController.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.Notification.Style android.widget.RemoteViews getStandardView(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void scheduleLaunchActivity(android.content.Intent, android.os.IBinder, int, android.content.pm.ActivityInfo, android.content.res.Configuration, android.content.res.CompatibilityInfo, android.os.Bundle, java.util.List&lt;android.app.ResultInfo&gt;, java.util.List&lt;android.content.Intent&gt;, boolean, boolean, java.lang.String, android.os.ParcelFileDescriptor, boolean) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.DownloadManager.Query android.app.DownloadManager.Query orderBy(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void updatePersistentConfiguration(android.content.res.Configuration) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void unbindFinished(android.os.IBinder, android.content.Intent, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.INotificationManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Dialog boolean dispatchGenericMotionEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Notification.Action void writeToParcel(android.os.Parcel, int) 0'>
@@ -176,76 +263,103 @@
     <item name='android.app.TabActivity void onRestoreInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.BigTextStyle android.app.Notification.BigTextStyle setSummaryText(java.lang.CharSequence)'>
+    <item name='android.app.Notification.BigPictureStyle android.app.Notification.BigPictureStyle setBigContentTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Activity android.view.LayoutInflater getLayoutInflater()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void registerProcessObserver(android.app.IProcessObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation android.app.Activity newActivity(java.lang.Class&lt;?&gt;, android.content.Context, android.os.IBinder, android.app.Application, android.content.Intent, android.content.pm.ActivityInfo, java.lang.CharSequence, android.app.Activity, java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IInstrumentationWatcher.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IThumbnailReceiver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity boolean shouldUpRecreateTask(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addParentStack(android.app.Activity)'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction replace(int, android.app.Fragment)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationUri(android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder addKind(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentManager void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setTicker(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityThread android.content.pm.ActivityInfo resolveActivityInfo(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Style android.widget.RemoteViews getStandardView(int)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setIcon(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setText(int)'>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setTitle(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setProgress(int, int, boolean)'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setAllowedOverMetered(boolean)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setCustomTitle(android.view.View)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setSubText(java.lang.CharSequence)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setOnKeyListener(android.content.DialogInterface.OnKeyListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setNeutralButton(int, android.content.DialogInterface.OnClickListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.DownloadManager.Query android.app.DownloadManager.Query orderBy(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Action android.app.Notification.Action clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setContentDescription(java.lang.CharSequence)'>
+    <item name='android.app.Notification.Builder android.app.Notification getNotification()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationInExternalFilesDir(android.content.Context, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setSmallIcon(int, int)'>
+    <item name='android.app.IThumbnailReceiver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setAutoCancel(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity void openContextMenu(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IUiModeManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setLargeIcon(android.graphics.Bitmap)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setDeleteIntent(android.app.PendingIntent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setNegativeButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)'>
+    <item name='android.app.INotificationManager void enqueueNotificationWithTag(java.lang.String, java.lang.String, java.lang.String, int, android.app.Notification, int[], int) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Fragment android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation android.app.Activity newActivity(java.lang.Class&lt;?&gt;, android.content.Context, android.os.IBinder, android.app.Application, android.content.Intent, android.content.pm.ActivityInfo, java.lang.CharSequence, android.app.Activity, java.lang.String, java.lang.Object)'>
+    <item name='android.app.ActionBar android.app.ActionBar.Tab newTab()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setTransitionStyle(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.InboxStyle android.app.Notification.InboxStyle setBigContentTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActivityThread android.app.ActivityThread.ApplicationThread getApplicationThread()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean) 0'>
@@ -254,21 +368,33 @@
     <item name='android.app.Instrumentation void callActivityOnPostCreate(android.app.Activity, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Activity android.view.MenuInflater getMenuInflater()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ActionBar.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.FragmentBreadCrumbs FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityManager int startActivityIntentSender(android.app.IApplicationThread, android.content.IntentSender, android.content.Intent, java.lang.String, android.os.IBinder, java.lang.String, int, int, int, android.os.Bundle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ApplicationThreadNative android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void attachApplication(android.app.IApplicationThread) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IProcessObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.WallpaperInfo android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.WallpaperManager android.app.WallpaperManager getInstance(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setContentInfo(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.DatePickerDialog DatePickerDialog(android.content.Context, int, android.app.DatePickerDialog.OnDateSetListener, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -278,112 +404,115 @@
     <item name='android.app.AlertDialog AlertDialog(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setCustomView(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Activity boolean dispatchKeyShortcutEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ISearchManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.IUiAutomationConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.ISearchManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putLong(java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Fragment android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setStyle(android.app.Notification.Style)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMultiChoiceItems(android.database.Cursor, java.lang.String, java.lang.String, android.content.DialogInterface.OnMultiChoiceClickListener)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.ActivityManager.MemoryInfo void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Fragment java.lang.CharSequence getText(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ActivityManager.RunningAppProcessInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setView(android.view.View)'>
+    <item name='android.app.LoadedApk android.content.IIntentReceiver forgetReceiverDispatcher(android.content.Context, android.content.BroadcastReceiver)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putFloat(java.lang.String, float)'>
+    <item name='android.app.IServiceConnection.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Fragment java.lang.String getString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager int startActivities(android.app.IApplicationThread, java.lang.String, android.content.Intent[], java.lang.String[], android.os.IBinder, android.os.Bundle, int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityThread android.app.LoadedApk getPackageInfoNoCheck(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IInstrumentationWatcher.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence)'>
+    <item name='android.app.WallpaperInfo android.content.ComponentName getComponent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity void onSaveInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Instrumentation android.app.Application newApplication(java.lang.ClassLoader, java.lang.String, android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ActivityOptions android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setTabListener(android.app.ActionBar.TabListener)'>
+    <item name='android.app.Fragment android.view.LayoutInflater getLayoutInflater(android.os.Bundle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IUiAutomationConnection.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.IUiAutomationConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setSingleChoiceItems(java.lang.CharSequence[], int, android.content.DialogInterface.OnClickListener)'>
+    <item name='android.app.ISearchManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.content.Context getContext()'>
+    <item name='android.app.IActivityManager long[] getProcessPss(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction detach(android.app.Fragment)'>
+    <item name='android.app.Instrumentation android.os.Bundle getAllocCounts()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setVibrate(long[])'>
+    <item name='android.app.SearchDialog boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Application void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Fragment java.lang.String toString()'>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationInExternalFilesDir(android.content.Context, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setCancelable(boolean)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setOnDismissListener(android.content.DialogInterface.OnDismissListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager int startActivities(android.app.IApplicationThread, java.lang.String, android.content.Intent[], java.lang.String[], android.os.IBinder, android.os.Bundle, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation android.app.Activity waitForMonitorWithTimeout(android.app.Instrumentation.ActivityMonitor, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.LauncherActivity.IconResizer android.graphics.drawable.Drawable createIconThumbnail(android.graphics.drawable.Drawable)'>
+    <item name='android.app.Notification.BigTextStyle android.app.Notification.BigTextStyle setSummaryText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int, android.app.ActivityOptions.OnAnimationStartedListener)'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setProgress(int, int, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.WallpaperManager void setBitmap(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setExtras(android.os.Bundle)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setIcon(android.graphics.drawable.Drawable)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction attach(android.app.Fragment)'>
+    <item name='android.app.IActivityManager int broadcastIntent(android.app.IApplicationThread, android.content.Intent, java.lang.String, android.content.IIntentReceiver, int, java.lang.String, android.os.Bundle, java.lang.String, int, boolean, boolean, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentManager android.app.FragmentTransaction beginTransaction()'>
+    <item name='android.app.IApplicationThread void unstableProviderDied(android.os.IBinder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ApplicationThreadNative android.os.IBinder asBinder()'>
+    <item name='android.app.DownloadManager.Query android.app.DownloadManager.Query setFilterById(long...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setIcon(int)'>
+    <item name='android.app.ActionBar void addTab(android.app.ActionBar.Tab) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Fragment java.lang.String getString(int, java.lang.Object...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setPositiveButton(int, android.content.DialogInterface.OnClickListener)'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setOnlyAlertOnce(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Notification void cloneInto(android.app.Notification, boolean) 0'>
@@ -392,37 +521,40 @@
     <item name='android.app.NativeActivity void surfaceRedrawNeeded(android.view.SurfaceHolder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ApplicationErrorReport.BatteryInfo BatteryInfo(android.os.Parcel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.IUiModeManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setIcon(android.graphics.drawable.Drawable)'>
+    <item name='android.app.ApplicationErrorReport.BatteryInfo BatteryInfo(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.UiAutomation.OnAccessibilityEventListener void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.IStopUserCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ApplicationErrorReport.RunningServiceInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Instrumentation android.app.Activity newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.BigPictureStyle android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap)'>
+    <item name='android.app.ApplicationErrorReport.RunningServiceInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setSingleChoiceItems(int, int, android.content.DialogInterface.OnClickListener)'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction disallowAddToBackStack()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder addAction(int, java.lang.CharSequence, android.app.PendingIntent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.BigPictureStyle android.app.Notification build()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.MediaRouteButton void onDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder addKind(java.lang.String)'>
+    <item name='android.app.Activity void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Activity void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) 0'>
+    <item name='android.app.ActivityOptions android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int, android.os.Handler, android.app.ActivityOptions.OnAnimationStartedListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.UiAutomation android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) 0'>
@@ -434,88 +566,142 @@
     <item name='android.app.IntentService android.os.IBinder onBind(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.LoadedApk android.content.pm.ApplicationInfo getApplicationInfo()'>
+    <item name='android.app.IActivityManager void noteWakeupAlarm(android.content.IIntentSender) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putBoolean(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.INotificationManager void cancelNotificationFromListener(android.service.notification.INotificationListener, java.lang.String, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMultiChoiceItems(android.database.Cursor, java.lang.String, java.lang.String, android.content.DialogInterface.OnMultiChoiceClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction attach(android.app.Fragment)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.WallpaperInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.UiAutomation android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long)'>
+    <item name='android.app.PendingIntent android.content.IntentSender getIntentSender()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Notification.BigPictureStyle void addExtras(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setOnKeyListener(android.content.DialogInterface.OnKeyListener)'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setContentInfo(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Dialog android.content.Context getContext()'>
+    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addParentStack(android.app.Activity)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setContentIntent(android.app.PendingIntent)'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setPriority(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void bindApplication(java.lang.String, android.content.pm.ApplicationInfo, java.util.List&lt;android.content.pm.ProviderInfo&gt;, android.content.ComponentName, java.lang.String, android.os.ParcelFileDescriptor, boolean, android.os.Bundle, android.app.IInstrumentationWatcher, android.app.IUiAutomationConnection, int, boolean, boolean, boolean, android.content.res.Configuration, android.content.res.CompatibilityInfo, java.util.Map&lt;java.lang.String,android.os.IBinder&gt;, android.os.Bundle) 15'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Action java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setTag(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Fragment java.lang.String getString(int, java.lang.Object...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction remove(android.app.Fragment)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addParentStack(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation void callActivityOnSaveInstanceState(android.app.Activity, android.os.Bundle) 0'>
+    <item name='android.app.IStopUserCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.NativeActivity void onSaveInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Instrumentation void callActivityOnSaveInstanceState(android.app.Activity, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationInExternalFilesDir(android.content.Context, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.LocalActivityManager android.view.Window startActivity(java.lang.String, android.content.Intent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction replace(int, android.app.Fragment)'>
+    <item name='android.app.FragmentManager android.app.FragmentTransaction beginTransaction()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity void startActivityFromFragment(android.app.Fragment, android.content.Intent, int, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.ActivityManager java.util.Map&lt;java.lang.String,java.lang.Integer&gt; getAllPackageLaunchCounts()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ActivityManager.TaskThumbnails void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DialogFragment android.app.Dialog onCreateDialog(android.os.Bundle)'>
+    <item name='android.app.ITransientNotification.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation android.app.Activity newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent)'>
+    <item name='android.app.IApplicationThread void scheduleDestroyBackupAgent(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityPendingResult.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMessage(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity void onCreateNavigateUpTaskStack(android.app.TaskStackBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityOptions android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int)'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setContentIntent(android.app.PendingIntent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.LoaderManager android.content.Loader&lt;D&gt; restartLoader(int, android.os.Bundle, android.app.LoaderManager.LoaderCallbacks&lt;D&gt;) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setPositiveButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Notification.InboxStyle void addExtras(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String)'>
+    <item name='android.app.IActivityManager void getMemoryInfo(android.app.ActivityManager.MemoryInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setTitle(java.lang.CharSequence)'>
+    <item name='android.app.IActivityManager int startActivityWithConfig(android.app.IApplicationThread, java.lang.String, android.content.Intent, java.lang.String, android.os.IBinder, java.lang.String, int, int, android.content.res.Configuration, android.os.Bundle, int) 8'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setCustomView(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager android.app.PendingIntent getRunningServiceControlPanel(android.content.ComponentName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity void finishActivityFromChild(android.app.Activity, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IThumbnailReceiver.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.Notification.InboxStyle android.app.Notification.InboxStyle addLine(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setSingleChoiceItems(android.database.Cursor, int, java.lang.String, android.content.DialogInterface.OnClickListener)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setIcon(android.graphics.drawable.Drawable)'>
+    <item name='android.app.IActivityManager int startActivity(android.app.IApplicationThread, java.lang.String, android.content.Intent, java.lang.String, android.os.IBinder, java.lang.String, int, int, java.lang.String, android.os.ParcelFileDescriptor, android.os.Bundle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Dialog boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setVisibleInDownloadsUi(boolean)'>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setShowRunningNotification(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
@@ -527,43 +713,73 @@
     <item name='android.app.ApplicationErrorReport.AnrInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction add(android.app.Fragment, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setSound(android.net.Uri, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.BigTextStyle android.app.Notification.BigTextStyle setBigContentTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction add(int, android.app.Fragment) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.AppOpsManager.OpEntry void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.DownloadManager java.lang.Long getRecommendedMaxBytesOverMobile(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setShowWhen(boolean)'>
+    <item name='android.app.IApplicationThread void scheduleDestroyBackupAgent(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setLargeIcon(android.graphics.Bitmap)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IUiModeManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.IActivityManager.ContentProviderHolder void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setIconAttribute(int)'>
+    <item name='android.app.IActivityManager void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Activity void unregisterForContextMenu(android.view.View) 0'>
+    <item name='android.app.IActivityManager java.lang.String getProviderMimeType(android.net.Uri, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.INotificationManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.InboxStyle android.app.Notification build()'>
+    <item name='android.app.Activity void unregisterForContextMenu(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ResultInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Dialog Dialog(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setCustomView(android.view.View)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setIcon(android.graphics.drawable.Drawable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ApplicationErrorReport.CrashInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.DownloadManager java.lang.Long getMaxBytesOverMobile(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Query android.app.DownloadManager.Query setFilterByStatus(int)'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction add(android.app.Fragment, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setItems(int, android.content.DialogInterface.OnClickListener)'>
+    <item name='android.app.IActivityManager android.content.Intent getIntentForIntentSender(android.content.IIntentSender) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor remove(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.UiAutomationConnection boolean injectInputEvent(android.view.InputEvent, boolean) 0'>
@@ -572,34 +788,55 @@
     <item name='android.app.UiAutomation UiAutomation(android.os.Looper, android.app.IUiAutomationConnection) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setDefaults(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setContentText(java.lang.CharSequence)'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setContentTitle(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ListFragment android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setTag(java.lang.Object)'>
+    <item name='android.app.IActivityManager boolean handleApplicationWtf(android.os.IBinder, java.lang.String, android.app.ApplicationErrorReport.CrashInfo) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder addAction(int, java.lang.CharSequence, android.app.PendingIntent)'>
+    <item name='android.app.IActivityManager void grantUriPermission(android.app.IApplicationThread, java.lang.String, android.net.Uri, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setItems(java.lang.CharSequence[], android.content.DialogInterface.OnClickListener)'>
+    <item name='android.app.Notification android.app.Notification clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setAllowedNetworkTypes(int)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setOnItemSelectedListener(android.widget.AdapterView.OnItemSelectedListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void handleApplicationStrictModeViolation(android.os.IBinder, int, android.os.StrictMode.ViolationInfo) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.ApplicationThreadNative boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setInverseBackgroundForced(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityController.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity void registerForContextMenu(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setIcon(int)'>
+    <item name='android.app.ISearchManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActionBar void setCustomView(android.view.View, android.app.ActionBar.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IAlarmManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.PendingIntent java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setVibrate(long[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.AlertDialog AlertDialog(android.content.Context, int) 0'>
@@ -608,22 +845,28 @@
     <item name='android.app.Activity boolean navigateUpTo(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setBreadCrumbTitle(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.UiAutomation UiAutomation(android.os.Looper, android.app.IUiAutomationConnection) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation void callApplicationOnCreate(android.app.Application) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityManager void grantUriPermission(android.app.IApplicationThread, java.lang.String, android.net.Uri, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Instrumentation void callActivityOnSaveInstanceState(android.app.Activity, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setSmallIcon(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ITransientNotification.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setAllowedOverRoaming(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.LoadedApk android.app.IServiceConnection getServiceDispatcher(android.content.ServiceConnection, android.content.Context, android.os.Handler, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityThread android.app.LoadedApk getPackageInfo(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo, int) 0'>
@@ -632,10 +875,13 @@
     <item name='android.app.ApplicationErrorReport.RunningServiceInfo RunningServiceInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setExtras(android.os.Bundle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getService(android.content.Context, int, android.content.Intent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addParentStack(android.content.ComponentName)'>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putString(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.NativeActivity void surfaceChanged(android.view.SurfaceHolder, int, int, int) 0'>
@@ -644,7 +890,7 @@
     <item name='android.app.Notification Notification(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setSound(android.net.Uri, int)'>
+    <item name='android.app.DialogFragment void onAttach(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getService(android.content.Context, int, android.content.Intent, int) 2'>
@@ -662,13 +908,19 @@
     <item name='android.app.Dialog Dialog(android.content.Context, boolean, android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setTitle(int)'>
+    <item name='android.app.Activity boolean dispatchGenericMotionEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.IWallpaperManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean, android.content.DialogInterface.OnCancelListener)'>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setTabListener(android.app.ActionBar.TabListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void revokeUriPermission(android.app.IApplicationThread, android.net.Uri, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void scheduleCreateBackupAgent(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityThread void handleRequestActivityExtras(android.app.ActivityThread.RequestActivityExtras) 0'>
@@ -677,121 +929,145 @@
     <item name='android.app.Activity android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setContent(android.widget.RemoteViews)'>
+    <item name='android.app.Instrumentation void sendKeySync(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ApplicationErrorReport android.content.ComponentName getErrorReportReceiver(android.content.Context, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation void sendKeySync(android.view.KeyEvent) 0'>
+    <item name='android.app.AppOpsManager.PackageOps void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AppOpsManager.PackageOps void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.app.ActivityManagerNative boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ResultInfo ResultInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.FragmentManager android.app.Fragment.SavedState saveFragmentInstanceState(android.app.Fragment) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setSingleChoiceItems(java.lang.CharSequence[], int, android.content.DialogInterface.OnClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.UiAutomation android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request Request(android.net.Uri) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.ISearchManagerCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.TaskStackBuilder android.content.Intent[] getIntents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.DownloadManager.Request Request(android.net.Uri) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putStringSet(java.lang.String, java.util.Set&lt;java.lang.String&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity void startActivityFromChild(android.app.Activity, android.content.Intent, int, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IServiceConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void bindApplication(java.lang.String, android.content.pm.ApplicationInfo, java.util.List&lt;android.content.pm.ProviderInfo&gt;, android.content.ComponentName, java.lang.String, android.os.ParcelFileDescriptor, boolean, android.os.Bundle, android.app.IInstrumentationWatcher, android.app.IUiAutomationConnection, int, boolean, boolean, boolean, android.content.res.Configuration, android.content.res.CompatibilityInfo, java.util.Map&lt;java.lang.String,android.os.IBinder&gt;, android.os.Bundle) 14'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.MediaRouteActionProvider MediaRouteActionProvider(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.BigPictureStyle android.app.Notification.BigPictureStyle setBigContentTitle(java.lang.CharSequence)'>
+    <item name='android.app.Activity android.app.FragmentManager getFragmentManager()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.WallpaperInfo java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityManager void handleApplicationCrash(android.os.IBinder, android.app.ApplicationErrorReport.CrashInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void scheduleLaunchActivity(android.content.Intent, android.os.IBinder, int, android.content.pm.ActivityInfo, android.content.res.Configuration, android.content.res.CompatibilityInfo, android.os.Bundle, java.util.List&lt;android.app.ResultInfo&gt;, java.util.List&lt;android.content.Intent&gt;, boolean, boolean, java.lang.String, android.os.ParcelFileDescriptor, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ResultInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IProcessObserver.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.IWallpaperManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void revokeUriPermission(android.app.IApplicationThread, android.net.Uri, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation void sendTrackballEventSync(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.WallpaperInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IUiAutomationConnection.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Dialog boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Style android.app.Notification build()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setSingleChoiceItems(android.widget.ListAdapter, int, android.content.DialogInterface.OnClickListener)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Instrumentation android.app.Activity newActivity(java.lang.Class&lt;?&gt;, android.content.Context, android.os.IBinder, android.app.Application, android.content.Intent, android.content.pm.ActivityInfo, java.lang.CharSequence, android.app.Activity, java.lang.String, java.lang.Object) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setCancelable(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Fragment void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setInverseBackgroundForced(boolean)'>
+    <item name='android.app.IApplicationThread void dumpGfxInfo(java.io.FileDescriptor, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation void callActivityOnCreate(android.app.Activity, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityManager void grantUriPermission(android.app.IApplicationThread, java.lang.String, android.net.Uri, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Fragment java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IServiceConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ApplicationThreadNative boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setDeleteIntent(android.app.PendingIntent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ActivityManagerNative boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setTitle(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Activity java.lang.String getLocalClassName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setTransition(int)'>
+    <item name='android.app.IUiAutomationConnection boolean injectInputEvent(android.view.InputEvent, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request addRequestHeader(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActionBar android.app.ActionBar.Tab newTab()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.DialogFragment int show(android.app.FragmentTransaction, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Query android.app.DownloadManager.Query setFilterById(long...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.LoadedApk android.app.IServiceConnection getServiceDispatcher(android.content.ServiceConnection, android.content.Context, android.os.Handler, int)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setIconAttribute(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Dialog void registerForContextMenu(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setCustomAnimations(int, int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Service android.os.IBinder onBind(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putStringSet(java.lang.String, java.util.Set&lt;java.lang.String&gt;)'>
+    <item name='android.app.Instrumentation android.app.Activity newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setShowRunningNotification(boolean)'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction add(int, android.app.Fragment)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Instrumentation android.app.Instrumentation.ActivityMonitor addMonitor(java.lang.String, android.app.Instrumentation.ActivityResult, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getActivities(android.content.Context, int, android.content.Intent[], int) 2'>
@@ -806,16 +1082,28 @@
     <item name='android.app.PendingIntent void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.InboxStyle android.app.Notification.InboxStyle addLine(java.lang.CharSequence)'>
+    <item name='android.app.IActivityManager android.app.IActivityManager.WaitResult startActivityAndWait(android.app.IApplicationThread, java.lang.String, android.content.Intent, java.lang.String, android.os.IBinder, java.lang.String, int, int, java.lang.String, android.os.ParcelFileDescriptor, android.os.Bundle, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActivityThread android.app.LoadedApk getPackageInfoNoCheck(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation void sendPointerSync(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setNeutralButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void reportTopActivityExtras(android.os.IBinder, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.SearchDialog void onRestoreInstanceState(android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.FragmentBreadCrumbs FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setAdapter(android.widget.ListAdapter, android.content.DialogInterface.OnClickListener)'>
+    <item name='android.app.IActivityManager void registerUserSwitchObserver(android.app.IUserSwitchObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.WallpaperInfo void dump(android.util.Printer, java.lang.String) 0'>
@@ -824,16 +1112,19 @@
     <item name='android.app.TimePickerDialog TimePickerDialog(android.content.Context, android.app.TimePickerDialog.OnTimeSetListener, int, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setBreadCrumbTitle(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.WallpaperInfo java.lang.CharSequence loadDescription(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction disallowAddToBackStack()'>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setContentDescription(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Fragment android.view.LayoutInflater getLayoutInflater(android.os.Bundle)'>
+    <item name='android.app.IActivityManager void grantUriPermissionFromOwner(android.os.IBinder, int, java.lang.String, android.net.Uri, int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void unregisterReceiver(android.content.IIntentReceiver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager boolean isIntentSenderTargetedToPackage(android.content.IIntentSender) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.DownloadManager void restartDownload(long...) 0'>
@@ -842,43 +1133,46 @@
     <item name='android.app.ApplicationErrorReport void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.LauncherActivity java.util.List&lt;android.app.LauncherActivity.ListItem&gt; makeListItems()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setTicker(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setPriority(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.ActivityManager.RunningTaskInfo void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityManager android.content.Intent registerReceiver(android.app.IApplicationThread, java.lang.String, android.content.IIntentReceiver, android.content.IntentFilter, java.lang.String, int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.NotificationManager void notifyAsUser(java.lang.String, int, android.app.Notification, android.os.UserHandle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.BigPictureStyle android.app.Notification build()'>
+    <item name='android.app.IActivityManager void unregisterUserSwitchObserver(android.app.IUserSwitchObserver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putFloat(java.lang.String, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Presentation android.view.Display getDisplay()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.LauncherActivity.IconResizer android.graphics.drawable.Drawable createIconThumbnail(android.graphics.drawable.Drawable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putInt(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ApplicationErrorReport void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.LauncherActivity void onSortResultList(java.util.List&lt;android.content.pm.ResolveInfo&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification java.lang.String toString()'>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setAllowedOverMetered(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation void callActivityOnNewIntent(android.app.Activity, android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setCustomAnimations(int, int)'>
+    <item name='android.app.FragmentBreadCrumbs FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentBreadCrumbs FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet, int) 1'>
+    <item name='android.app.Instrumentation android.os.Bundle getBinderCounts()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Fragment android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle) 0'>
@@ -890,34 +1184,46 @@
     <item name='android.app.Notification Notification(android.content.Context, int, java.lang.CharSequence, long, java.lang.CharSequence, java.lang.CharSequence, android.content.Intent) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Dialog android.view.LayoutInflater getLayoutInflater()'>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationInExternalPublicDir(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationInExternalPublicDir(java.lang.String, java.lang.String) 1'>
+    <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean, android.content.DialogInterface.OnCancelListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Fragment java.lang.String getString(int, java.lang.Object...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setNegativeButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ApplicationErrorReport.CrashInfo CrashInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation void callActivityOnRestart(android.app.Activity) 0'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setTitle(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.KeyguardManager void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification getNotification()'>
+    <item name='android.app.Instrumentation void callActivityOnRestart(android.app.Activity) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IProcessObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager int bindService(android.app.IApplicationThread, android.os.IBinder, android.content.Intent, java.lang.String, android.app.IServiceConnection, int, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.MediaRouteButton MediaRouteButton(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IUiAutomationConnection void connect(android.accessibilityservice.IAccessibilityServiceClient) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityGroup void onSaveInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.MediaRouteActionProvider android.view.View onCreateActionView()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.MediaRouteButton MediaRouteButton(android.content.Context) 0'>
+    <item name='android.app.Notification.BigTextStyle android.app.Notification build()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Service void onConfigurationChanged(android.content.res.Configuration) 0'>
@@ -932,19 +1238,16 @@
     <item name='android.app.PendingIntent android.app.PendingIntent getActivities(android.content.Context, int, android.content.Intent[], int, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification build()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setCustomTitle(android.view.View)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Dialog Dialog(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Fragment java.lang.CharSequence getText(int)'>
+    <item name='android.app.IApplicationThread android.os.Debug.MemoryInfo dumpMemInfo(java.io.FileDescriptor, boolean, boolean, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityManager java.util.Map&lt;java.lang.String,java.lang.Integer&gt; getAllPackageLaunchCounts()'>
+    <item name='android.app.IActivityManager java.lang.String getPackageForIntentSender(android.content.IIntentSender) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.LauncherActivity android.content.Intent getTargetIntent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityManager.RecentTaskInfo void readFromParcel(android.os.Parcel) 0'>
@@ -953,58 +1256,67 @@
     <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationInExternalPublicDir(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Dialog android.os.Bundle onSaveInstanceState()'>
+    <item name='android.app.IApplicationThread void scheduleCreateBackupAgent(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setCursor(android.database.Cursor, android.content.DialogInterface.OnClickListener, java.lang.String)'>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setNotificationVisibility(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityOptions android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int)'>
+    <item name='android.app.Notification.Style void addExtras(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation android.app.Application newApplication(java.lang.Class&lt;?&gt;, android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setText(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.IBackupAgent.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.IProcessObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.WallpaperManager void setStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMessage(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.PendingIntent void send(android.content.Context, int, android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setOnlyAlertOnce(boolean)'>
+    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder create(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.DialogFragment void show(android.app.FragmentManager, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMessage(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Fragment void onSaveInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction detach(android.app.Fragment)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.TimePickerDialog void onRestoreInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.ActionBar void setCustomView(android.view.View, android.app.ActionBar.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.DatePickerDialog void onRestoreInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityThread android.app.ActivityThread systemMain()'>
+    <item name='android.app.IWallpaperManagerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.BigTextStyle android.app.Notification.BigTextStyle bigText(java.lang.CharSequence)'>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Dialog boolean dispatchTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor remove(java.lang.String)'>
+    <item name='android.app.LoaderManager void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IBackupAgent void doRestoreFile(android.os.ParcelFileDescriptor, long, int, java.lang.String, java.lang.String, long, long, int, android.app.backup.IBackupManager) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setVisibleInDownloadsUi(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager android.content.pm.ConfigurationInfo getDeviceConfigurationInfo()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.DatePickerDialog DatePickerDialog(android.content.Context, android.app.DatePickerDialog.OnDateSetListener, int, int, int) 0'>
@@ -1013,76 +1325,100 @@
     <item name='android.app.PendingIntent android.app.PendingIntent getActivities(android.content.Context, int, android.content.Intent[], int, android.os.Bundle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ISearchManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.IActivityManager void cancelIntentSender(android.content.IIntentSender) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ProgressDialog ProgressDialog(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager android.database.Cursor query(android.app.DownloadManager.Query) 0'>
+    <item name='android.app.IBackupAgent.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityOptions android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int, android.os.Handler, android.app.ActivityOptions.OnAnimationStartedListener)'>
+    <item name='android.app.DownloadManager android.database.Cursor query(android.app.DownloadManager.Query) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation android.app.Activity waitForMonitor(android.app.Instrumentation.ActivityMonitor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.LoadedApk android.content.IIntentReceiver forgetReceiverDispatcher(android.content.Context, android.content.BroadcastReceiver)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog create()'>
+    <item name='android.app.Service int onStartCommand(android.content.Intent, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.SearchableInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setAllowedOverRoaming(boolean)'>
+    <item name='android.app.ISearchManagerCallback.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.WallpaperInfo java.lang.String toString()'>
+    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setBreadCrumbShortTitle(int)'>
+    <item name='android.app.IActivityManager void publishService(android.os.IBinder, android.content.Intent, android.os.IBinder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Notification void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IActivityPendingResult.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Dialog Dialog(android.content.Context, boolean, android.content.DialogInterface.OnCancelListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation android.app.Application newApplication(java.lang.ClassLoader, java.lang.String, android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Action java.lang.Object clone()'>
+    <item name='android.app.Notification.BigPictureStyle android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Presentation Presentation(android.content.Context, android.view.Display, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putBoolean(java.lang.String, boolean)'>
+    <item name='android.app.INotificationManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void getMemoryInfo(android.os.Debug.MemoryInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActivityOptions android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IBackupAgent.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Dialog android.content.Context getContext()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setShowWhen(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setContent(android.widget.RemoteViews)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity java.lang.Object getSystemService(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Presentation android.view.Display getDisplay()'>
+    <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int, android.app.ActivityOptions.OnAnimationStartedListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.QueuedWork void add(java.lang.Runnable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityManager int startActivityAsUser(android.app.IApplicationThread, java.lang.String, android.content.Intent, java.lang.String, android.os.IBinder, java.lang.String, int, int, java.lang.String, android.os.ParcelFileDescriptor, android.os.Bundle, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.SearchDialog.SearchBar SearchBar(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.FragmentManager void putFragment(android.os.Bundle, java.lang.String, android.app.Fragment) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void publishService(android.os.IBinder, android.content.Intent, android.os.IBinder) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Instrumentation boolean checkMonitorHit(android.app.Instrumentation.ActivityMonitor, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.WallpaperManager android.app.WallpaperManager getInstance(android.content.Context)'>
+    <item name='android.app.IActivityManager int getUidForIntentSender(android.content.IIntentSender) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.MediaRouteActionProvider android.view.View onCreateActionView()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityManager.RunningTaskInfo void writeToParcel(android.os.Parcel, int) 0'>
@@ -1091,64 +1427,58 @@
     <item name='android.app.SearchDialog.SearchBar SearchBar(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ResultInfo java.lang.String toString()'>
+    <item name='android.app.Instrumentation android.app.Application newApplication(java.lang.Class&lt;?&gt;, android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleDownAnimation(android.view.View, android.graphics.Bitmap, int, int, android.app.ActivityOptions.OnAnimationStartedListener)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction remove(android.app.Fragment)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.ActivityManagerNative android.os.IBinder asBinder()'>
+    <item name='android.app.IActivityManager void grantUriPermissionFromOwner(android.os.IBinder, int, java.lang.String, android.net.Uri, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Fragment.SavedState void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.PendingIntent android.content.IntentSender getIntentSender()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.AlertDialog.Builder Builder(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Activity android.view.LayoutInflater getLayoutInflater()'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setView(android.view.View)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setPositiveButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setItems(java.lang.CharSequence[], android.content.DialogInterface.OnClickListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityThread android.app.LoadedApk getPackageInfoNoCheck(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo)'>
+    <item name='android.app.IBackupAgent.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request addRequestHeader(java.lang.String, java.lang.String)'>
+    <item name='android.app.IActivityManager boolean unbindService(android.app.IServiceConnection) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.BigTextStyle android.app.Notification.BigTextStyle setBigContentTitle(java.lang.CharSequence)'>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setIcon(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.LoadedApk android.content.IIntentReceiver forgetReceiverDispatcher(android.content.Context, android.content.BroadcastReceiver) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IApplicationThread void scheduleUnbindService(android.os.IBinder, android.content.Intent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addParentStack(java.lang.Class&lt;?&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setSmallIcon(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.DownloadManager int markRowDeleted(long...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.LauncherActivity.IconResizer IconResizer(android.app.LauncherActivity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification android.app.Notification clone()'>
+    <item name='android.app.IApplicationThread void dumpDbInfo(java.io.FileDescriptor, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setMimeType(java.lang.String)'>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setAllowedNetworkTypes(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationToSystemCache()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.IUserSwitchObserver.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.ActivityThread android.app.LoadedApk getPackageInfo(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int) 0'>
@@ -1157,58 +1487,88 @@
     <item name='android.app.Notification.BigTextStyle void addExtras(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction addToBackStack(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.DatePickerDialog android.os.Bundle onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity void onRestoreInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityManager.RunningServiceInfo void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityThread android.app.LoadedApk getPackageInfo(android.content.pm.ApplicationInfo, android.content.res.CompatibilityInfo, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addNextIntent(android.content.Intent)'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction add(int, android.app.Fragment, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getActivities(android.content.Context, int, android.content.Intent[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.LoadedApk android.content.IIntentReceiver getReceiverDispatcher(android.content.BroadcastReceiver, android.content.Context, android.os.Handler, android.app.Instrumentation, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ApplicationErrorReport.AnrInfo void dump(android.util.Printer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putLong(java.lang.String, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationToSystemCache()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean, android.content.DialogInterface.OnCancelListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setLights(int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Instrumentation android.app.Application newApplication(java.lang.Class&lt;?&gt;, android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.SearchDialog.SearchBar SearchBar(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Query android.app.DownloadManager.Query setOnlyIncludeVisibleInDownloadsUi(boolean)'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setSubText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setTransitionStyle(int)'>
+    <item name='android.app.IActivityManager boolean clearApplicationUserData(java.lang.String, android.content.pm.IPackageDataObserver, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Fragment android.app.Fragment instantiate(android.content.Context, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity boolean dispatchTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setNegativeButton(int, android.content.DialogInterface.OnClickListener)'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActivityOptions android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IThumbnailReceiver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setDefaults(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity android.app.PendingIntent createPendingResult(int, android.content.Intent, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.InboxStyle android.app.Notification.InboxStyle setBigContentTitle(java.lang.CharSequence)'>
+    <item name='android.app.IThumbnailRetriever.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IStopUserCallback.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.IApplicationThread void dumpDbInfo(java.io.FileDescriptor, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setRecycleOnMeasureEnabled(boolean)'>
+    <item name='android.app.LauncherActivity.IconResizer android.graphics.drawable.Drawable createIconThumbnail(android.graphics.drawable.Drawable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification build()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
@@ -1217,25 +1577,61 @@
     <item name='android.app.NativeActivity void onInputQueueCreated(android.view.InputQueue) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setSound(android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setItems(int, android.content.DialogInterface.OnClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Dialog boolean onTouchEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int, android.os.Bundle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMessage(java.lang.CharSequence)'>
+    <item name='android.app.IntentService int onStartCommand(android.content.Intent, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentManager void putFragment(android.os.Bundle, java.lang.String, android.app.Fragment) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setRecycleOnMeasureEnabled(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityOptions void update(android.app.ActivityOptions) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityManager void unbindBackupAgent(android.content.pm.ApplicationInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getActivitiesAsUser(android.content.Context, int, android.content.Intent[], int, android.os.Bundle, android.os.UserHandle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation android.app.Application newApplication(java.lang.ClassLoader, java.lang.String, android.content.Context)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setNegativeButton(int, android.content.DialogInterface.OnClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager int checkUriPermission(android.net.Uri, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Fragment void onAttach(android.app.Activity) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMultiChoiceItems(int, boolean[], android.content.DialogInterface.OnMultiChoiceClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentManager android.app.Fragment getFragment(android.os.Bundle, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void unbroadcastIntent(android.app.IApplicationThread, android.content.Intent, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IBackupAgent void doFullBackup(android.os.ParcelFileDescriptor, int, android.app.backup.IBackupManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setOnCancelListener(android.content.DialogInterface.OnCancelListener)'>
+    <item name='android.app.IApplicationThread void scheduleCreateService(android.os.IBinder, android.content.pm.ServiceInfo, android.content.res.CompatibilityInfo) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.IActivityPendingResult.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
@@ -1244,88 +1640,124 @@
     <item name='android.app.ProgressDialog ProgressDialog(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.BigPictureStyle android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap)'>
+    <item name='android.app.IApplicationThread void scheduleRegisteredReceiver(android.content.IIntentReceiver, android.content.Intent, int, java.lang.String, android.os.Bundle, boolean, boolean, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ApplicationErrorReport.CrashInfo void dump(android.util.Printer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.LauncherActivity android.content.Intent getTargetIntent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.WallpaperInfo android.graphics.drawable.Drawable loadThumbnail(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.PendingIntent java.lang.String toString()'>
+    <item name='android.app.Dialog android.view.LayoutInflater getLayoutInflater()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification buildInto(android.app.Notification)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void serviceDoneExecuting(android.os.IBinder, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity void onPrepareDialog(int, android.app.Dialog, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setCustomView(android.view.View)'>
+    <item name='android.app.Instrumentation android.app.Activity newActivity(java.lang.Class&lt;?&gt;, android.content.Context, android.os.IBinder, android.app.Application, android.content.Intent, android.content.pm.ActivityInfo, java.lang.CharSequence, android.app.Activity, java.lang.String, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity boolean startNextMatchingActivity(android.content.Intent, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setNotificationVisibility(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IInstrumentationWatcher.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Dialog boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IWallpaperManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setTransition(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity void onApplyThemeResource(android.content.res.Resources.Theme, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.PendingIntent android.app.PendingIntent readPendingIntentOrNullFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActionBar.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Instrumentation void callActivityOnStart(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.LoadedApk android.content.IIntentReceiver getReceiverDispatcher(android.content.BroadcastReceiver, android.content.Context, android.os.Handler, android.app.Instrumentation, boolean)'>
+    <item name='android.app.ActionBar.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.AlertDialog AlertDialog(android.content.Context, boolean, android.content.DialogInterface.OnCancelListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog show()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.SearchDialog SearchDialog(android.content.Context, android.app.SearchManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putInt(java.lang.String, int)'>
+    <item name='android.app.IApplicationThread void scheduleCreateService(android.os.IBinder, android.content.pm.ServiceInfo, android.content.res.CompatibilityInfo) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ListActivity void onRestoreInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.ActivityManagerNative android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getBroadcast(android.content.Context, int, android.content.Intent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor clear()'>
+    <item name='android.app.IThumbnailRetriever.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager boolean navigateUpTo(android.os.IBinder, android.content.Intent, int, android.content.Intent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void scheduleRegisteredReceiver(android.content.IIntentReceiver, android.content.Intent, int, java.lang.String, android.os.Bundle, boolean, boolean, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog show()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction show(android.app.Fragment)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ITransientNotification.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Dialog void unregisterForContextMenu(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.ActionBar void removeTab(android.app.ActionBar.Tab) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.DialogFragment void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.LoadedApk android.app.IServiceConnection forgetServiceDispatcher(android.content.Context, android.content.ServiceConnection)'>
+    <item name='android.app.FragmentManager android.app.FragmentTransaction openTransaction()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActionBar.Tab android.app.ActionBar.Tab setText(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void removeContentProvider(android.os.IBinder, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.MediaRouteButton MediaRouteButton(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity boolean startActivityIfNeeded(android.content.Intent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.MediaRouteButton MediaRouteButton(android.content.Context, android.util.AttributeSet, int) 0'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction replace(int, android.app.Fragment) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActivityOptions android.os.Bundle toBundle()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getActivitiesAsUser(android.content.Context, int, android.content.Intent[], int, android.os.Bundle, android.os.UserHandle) 0'>
@@ -1334,19 +1766,49 @@
     <item name='android.app.IThumbnailRetriever.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation android.app.Instrumentation.ActivityMonitor addMonitor(java.lang.String, android.app.Instrumentation.ActivityResult, boolean)'>
+    <item name='android.app.IActivityController boolean appCrashed(java.lang.String, int, java.lang.String, java.lang.String, long, java.lang.String) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation void callActivityOnPause(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityManager android.content.ComponentName startService(android.app.IApplicationThread, android.content.Intent, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActionBar void addTab(android.app.ActionBar.Tab, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IWallpaperManagerCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ActivityThread android.app.ActivityThread systemMain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager int checkPermission(java.lang.String, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.PendingIntent android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityController.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Instrumentation android.app.Instrumentation.ActivityMonitor addMonitor(android.content.IntentFilter, android.app.Instrumentation.ActivityResult, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity void onPrepareDialog(int, android.app.Dialog) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IServiceConnection.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.ITransientNotification.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActivityOptions android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int) 0'>
@@ -1355,25 +1817,49 @@
     <item name='android.app.NativeActivity void surfaceCreated(android.view.SurfaceHolder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Fragment java.lang.String getString(int)'>
+    <item name='android.app.IActivityManager android.content.res.Configuration getConfiguration()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putInt(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void bindApplication(java.lang.String, android.content.pm.ApplicationInfo, java.util.List&lt;android.content.pm.ProviderInfo&gt;, android.content.ComponentName, java.lang.String, android.os.ParcelFileDescriptor, boolean, android.os.Bundle, android.app.IInstrumentationWatcher, android.app.IUiAutomationConnection, int, boolean, boolean, boolean, android.content.res.Configuration, android.content.res.CompatibilityInfo, java.util.Map&lt;java.lang.String,android.os.IBinder&gt;, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.IActivityManager.WaitResult void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Notification.InboxStyle android.app.Notification build()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.MediaRouteButton MediaRouteButton(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IStopUserCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationInExternalPublicDir(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void updatePackageCompatibilityInfo(java.lang.String, android.content.res.CompatibilityInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.DownloadManager.Query android.app.DownloadManager.Query setFilterByStatus(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.FragmentBreadCrumbs void setActivity(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.PendingIntent void writePendingIntentOrNullToParcel(android.app.PendingIntent, android.os.Parcel) 1'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setBreadCrumbTitle(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.INotificationManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.IActivityManager void updateConfiguration(android.content.res.Configuration) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.PendingIntent void writePendingIntentOrNullToParcel(android.app.PendingIntent, android.os.Parcel) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
@@ -1382,13 +1868,7 @@
     <item name='android.app.WallpaperInfo java.lang.CharSequence loadAuthor(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMultiChoiceItems(int, boolean[], android.content.DialogInterface.OnMultiChoiceClickListener)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setNeutralButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence)'>
+    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addParentStack(android.content.ComponentName)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Notification void setUser(android.os.UserHandle) 0'>
@@ -1400,22 +1880,28 @@
     <item name='android.app.IActivityController.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setUsesChronometer(boolean)'>
+    <item name='android.app.Notification.Builder void addExtras(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder void addExtras(android.os.Bundle) 0'>
+    <item name='android.app.ActionBar void addTab(android.app.ActionBar.Tab, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setAdapter(android.widget.ListAdapter, android.content.DialogInterface.OnClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager void showWaitingForDebugger(android.app.IApplicationThread, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setOnCancelListener(android.content.DialogInterface.OnCancelListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor clear()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setView(android.view.View, int, int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IWallpaperManagerCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setWhen(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Fragment android.app.Fragment instantiate(android.content.Context, java.lang.String)'>
+    <item name='android.app.LoadedApk android.app.IServiceConnection forgetServiceDispatcher(android.content.Context, android.content.ServiceConnection)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.TabActivity void onSaveInstanceState(android.os.Bundle) 0'>
@@ -1424,18 +1910,18 @@
     <item name='android.app.ActivityManager.TaskThumbnails void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationInExternalFilesDir(android.content.Context, java.lang.String, java.lang.String)'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction hide(android.app.Fragment)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Dialog boolean onKeyUp(int, android.view.KeyEvent) 1'>
+    <item name='android.app.IWallpaperManagerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ActionBar.LayoutParams LayoutParams(android.app.ActionBar.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.Dialog boolean onKeyUp(int, android.view.KeyEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.FragmentBreadCrumbs FragmentBreadCrumbs(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1445,24 +1931,24 @@
     <item name='android.app.Instrumentation void callActivityOnRestoreInstanceState(android.app.Activity, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation android.os.Bundle getAllocCounts()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setContentTitle(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setOnItemSelectedListener(android.widget.AdapterView.OnItemSelectedListener)'>
+    <item name='android.app.Notification java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.AlertDialog.Builder Builder(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Instrumentation android.os.Bundle getBinderCounts()'>
+    <item name='android.app.DownloadManager.Query android.app.DownloadManager.Query setOnlyIncludeVisibleInDownloadsUi(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Dialog void openContextMenu(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.UiAutomation android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.ISearchManagerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Service void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1472,34 +1958,46 @@
     <item name='android.app.Activity void startActivityFromChild(android.app.Activity, android.content.Intent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityThread android.app.ActivityThread.ApplicationThread getApplicationThread()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Notification Notification(android.content.Context, int, java.lang.CharSequence, long, java.lang.CharSequence, java.lang.CharSequence, android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IAlarmManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.IActivityManager int bindService(android.app.IApplicationThread, android.os.IBinder, android.content.Intent, java.lang.String, android.app.IServiceConnection, int, int) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.NotificationManager void notify(int, android.app.Notification) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Fragment void registerForContextMenu(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.IThumbnailRetriever.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.IActivityManager boolean killPids(int[], java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void scheduleReceiver(android.content.Intent, android.content.pm.ActivityInfo, android.content.res.CompatibilityInfo, int, java.lang.String, android.os.Bundle, boolean, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setOngoing(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IBackupAgent void doRestore(android.os.ParcelFileDescriptor, int, android.os.ParcelFileDescriptor, int, android.app.backup.IBackupManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ApplicationErrorReport void dump(android.util.Printer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ActivityOptions android.os.Bundle toBundle()'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setUsesChronometer(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction add(int, android.app.Fragment)'>
+    <item name='android.app.IApplicationThread android.os.Debug.MemoryInfo dumpMemInfo(java.io.FileDescriptor, boolean, boolean, java.lang.String[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDescription(java.lang.CharSequence)'>
+    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addNextIntent(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.WallpaperManager android.app.WallpaperManager getInstance(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ApplicationErrorReport.BatteryInfo void writeToParcel(android.os.Parcel, int) 0'>
@@ -1511,10 +2009,19 @@
     <item name='android.app.Instrumentation void callActivityOnRestoreInstanceState(android.app.Activity, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putBoolean(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Fragment void unregisterForContextMenu(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DatePickerDialog android.os.Bundle onSaveInstanceState()'>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager android.os.ParcelFileDescriptor openContentUri(android.net.Uri) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Activity java.lang.String getLocalClassName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.NotificationManager void notify(java.lang.String, int, android.app.Notification) 2'>
@@ -1523,16 +2030,25 @@
     <item name='android.app.AlertDialog boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.LauncherActivity java.util.List&lt;android.app.LauncherActivity.ListItem&gt; makeListItems()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IUiModeManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Dialog boolean dispatchKeyShortcutEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setOngoing(boolean)'>
+    <item name='android.app.IApplicationThread void scheduleReceiver(android.content.Intent, android.content.pm.ActivityInfo, android.content.res.CompatibilityInfo, int, java.lang.String, android.os.Bundle, boolean, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ExpandableListActivity void onRestoreInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.KeyguardManager android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String)'>
+    <item name='android.app.IActivityManager android.os.IBinder peekService(android.content.Intent, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.INotificationManager android.service.notification.StatusBarNotification[] getActiveNotificationsFromListener(android.service.notification.INotificationListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity boolean navigateUpToFromChild(android.app.Activity, android.content.Intent) 1'>
@@ -1544,67 +2060,79 @@
     <item name='android.app.Presentation Presentation(android.content.Context, android.view.Display) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Query android.app.DownloadManager.Query orderBy(java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.SearchManager void triggerSearch(java.lang.String, android.content.ComponentName, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Activity boolean startNextMatchingActivity(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setSingleChoiceItems(android.database.Cursor, int, java.lang.String, android.content.DialogInterface.OnClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.DialogFragment android.app.Dialog onCreateDialog(android.os.Bundle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction setBreadCrumbShortTitle(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Builder android.app.Notification.Builder setStyle(android.app.Notification.Style)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.Activity boolean dispatchTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Instrumentation void callActivityOnResume(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setNeutralButton(int, android.content.DialogInterface.OnClickListener)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int)'>
+    <item name='android.app.Notification.BigTextStyle android.app.Notification.BigTextStyle bigText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Presentation Presentation(android.content.Context, android.view.Display) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.IActivityManager android.app.IActivityManager.ContentProviderHolder getContentProvider(android.app.IApplicationThread, java.lang.String, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.Style android.app.Notification build()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager int stopService(android.app.IApplicationThread, android.content.Intent, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.Notification.BigPictureStyle android.app.Notification.BigPictureStyle setSummaryText(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.ApplicationErrorReport.AnrInfo AnrInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setAutoCancel(boolean)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setSingleChoiceItems(int, int, android.content.DialogInterface.OnClickListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.DownloadManager.Request android.app.DownloadManager.Request setDestinationUri(android.net.Uri)'>
+    <item name='android.app.FragmentTransaction android.app.FragmentTransaction add(int, android.app.Fragment, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews)'>
+    <item name='android.app.Service void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IApplicationThread void scheduleReceiver(android.content.Intent, android.content.pm.ActivityInfo, android.content.res.CompatibilityInfo, int, java.lang.String, android.os.Bundle, boolean, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.PendingIntent void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentManager android.app.FragmentTransaction openTransaction()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.NativeActivity void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.TaskStackBuilder android.app.TaskStackBuilder addParentStack(java.lang.Class&lt;?&gt;)'>
+    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setSingleChoiceItems(android.widget.ListAdapter, int, android.content.DialogInterface.OnClickListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.Instrumentation void callActivityOnDestroy(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.WallpaperInfo android.content.ComponentName getComponent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.IWallpaperManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.app.IBackupAgent void doBackup(android.os.ParcelFileDescriptor, android.os.ParcelFileDescriptor, android.os.ParcelFileDescriptor, int, android.app.backup.IBackupManager) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.WallpaperInfo WallpaperInfo(android.content.Context, android.content.pm.ResolveInfo) 1'>
@@ -1613,34 +2141,40 @@
     <item name='android.app.DownloadManager int remove(long...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.AlertDialog.Builder android.app.AlertDialog.Builder setMultiChoiceItems(java.lang.CharSequence[], boolean[], android.content.DialogInterface.OnMultiChoiceClickListener)'>
+    <item name='android.app.Activity void startActivities(android.content.Intent[], android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.Notification.Builder android.app.Notification.Builder setSound(android.net.Uri)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction addToBackStack(java.lang.String)'>
+    <item name='android.app.ActivityOptions android.app.ActivityOptions makeThumbnailScaleDownAnimation(android.view.View, android.graphics.Bitmap, int, int, android.app.ActivityOptions.OnAnimationStartedListener)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.TimePickerDialog void onClick(android.content.DialogInterface, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.ApplicationErrorReport.CrashInfo CrashInfo(java.lang.Throwable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.Instrumentation void finish(int, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.TimePickerDialog android.os.Bundle onSaveInstanceState()'>
+    <item name='android.app.ApplicationErrorReport.CrashInfo CrashInfo(java.lang.Throwable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager boolean isIntentSenderAnActivity(android.content.IIntentSender) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.ProgressDialog android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.SharedPreferencesImpl.EditorImpl android.content.SharedPreferences.Editor putLong(java.lang.String, long)'>
+    <item name='android.app.ISearchManagerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.FragmentTransaction android.app.FragmentTransaction add(int, android.app.Fragment, java.lang.String)'>
+    <item name='android.app.INotificationManager void cancelAllNotificationsFromListener(android.service.notification.INotificationListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IUserSwitchObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityPendingResult.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.IActivityManager boolean startNextMatchingActivity(android.os.IBinder, android.content.Intent, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/app/backup/annotations.xml b/android-sdk-annotations/android/app/backup/annotations.xml
index f9cb53aa661..16cb05a7e3e 100644
--- a/android-sdk-annotations/android/app/backup/annotations.xml
+++ b/android-sdk-annotations/android/app/backup/annotations.xml
@@ -1,31 +1,25 @@
 <root>
-    <item name='android.app.backup.RestoreSet void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.app.backup.IRestoreObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.BackupAgent void onRestoreFile(android.os.ParcelFileDescriptor, long, int, java.lang.String, java.lang.String, long, long) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.backup.BackupAgent void onRestoreFile(android.os.ParcelFileDescriptor, long, java.io.File, int, long, long) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.backup.BackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.backup.FileBackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
+    <item name='android.app.backup.IRestoreObserver.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.BackupAgent void fullBackupFileTree(java.lang.String, java.lang.String, java.lang.String, java.util.HashSet&lt;java.lang.String&gt;, android.app.backup.FullBackupDataOutput) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.backup.IFullBackupRestoreObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.backup.IRestoreSession.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.BackupHelper void restoreEntity(android.app.backup.BackupDataInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.backup.IRestoreSession.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.backup.WallpaperBackupHelper WallpaperBackupHelper(android.content.Context, java.lang.String[], java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -35,52 +29,40 @@
     <item name='android.app.backup.FileBackupHelper FileBackupHelper(android.content.Context, java.lang.String...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.backup.AbsoluteFileBackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.IFullBackupRestoreObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.backup.WallpaperBackupHelper void writeNewStateDescription(android.os.ParcelFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.backup.SharedPreferencesBackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.backup.AbsoluteFileBackupHelper void writeNewStateDescription(android.os.ParcelFileDescriptor) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.backup.IRestoreObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.backup.IBackupManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.backup.BackupAgent void fullBackupFile(java.io.File, android.app.backup.FullBackupDataOutput) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.app.backup.BackupHelperDispatcher void performRestore(android.app.backup.BackupDataInput, int, android.os.ParcelFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.BackupDataInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.backup.FileBackupHelper void writeNewStateDescription(android.os.ParcelFileDescriptor) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.backup.IFullBackupRestoreObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.backup.BackupAgent void onFullBackup(android.app.backup.FullBackupDataOutput) 0'>
+    <item name='android.app.backup.IRestoreSession int restoreSome(long, android.app.backup.IRestoreObserver, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.BackupHelper void writeNewStateDescription(android.os.ParcelFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.backup.BackupDataOutput BackupDataOutput(java.io.FileDescriptor) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.app.backup.BackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
+    <item name='android.app.backup.IRestoreSession.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.WallpaperBackupHelper void restoreEntity(android.app.backup.BackupDataInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.backup.IBackupManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.app.backup.BackupAgent void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.FullBackupAgent void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupAgent void onRestore(android.app.backup.BackupDataInput, int, android.os.ParcelFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.SharedPreferencesBackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
@@ -89,13 +71,16 @@
     <item name='android.app.backup.BackupHelperDispatcher void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.backup.IBackupManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.backup.BackupAgentHelper void onRestore(android.app.backup.BackupDataInput, int, android.os.ParcelFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.SharedPreferencesBackupHelper void restoreEntity(android.app.backup.BackupDataInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.backup.FileBackupHelper void restoreEntity(android.app.backup.BackupDataInputStream) 0'>
+    <item name='android.app.backup.BackupDataInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.SharedPreferencesBackupHelper void writeNewStateDescription(android.os.ParcelFileDescriptor) 0'>
@@ -104,15 +89,90 @@
     <item name='android.app.backup.BackupDataInput BackupDataInput(java.io.FileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.app.backup.BackupAgentHelper void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
+    <item name='android.app.backup.AbsoluteFileBackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.app.backup.AbsoluteFileBackupHelper void restoreEntity(android.app.backup.BackupDataInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.backup.IFullBackupRestoreObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupAgentHelper void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.RestoreSet void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.IBackupManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupAgent void onRestoreFile(android.os.ParcelFileDescriptor, long, java.io.File, int, long, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.FileBackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.IRestoreSession.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.SharedPreferencesBackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.AbsoluteFileBackupHelper void writeNewStateDescription(android.os.ParcelFileDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.WallpaperBackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupAgent void fullBackupFile(java.io.File, android.app.backup.FullBackupDataOutput) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.FileBackupHelper void writeNewStateDescription(android.os.ParcelFileDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupAgent void onFullBackup(android.app.backup.FullBackupDataOutput) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.IRestoreObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupDataOutput BackupDataOutput(java.io.FileDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupAgent void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.FullBackupAgent void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.IBackupManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.FileBackupHelper void restoreEntity(android.app.backup.BackupDataInputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.BackupAgentHelper void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.FullBackupAgent void onRestore(android.app.backup.BackupDataInput, int, android.os.ParcelFileDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.app.backup.IRestoreSession int getAvailableRestoreSets(android.app.backup.IRestoreObserver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.backup.FullBackupDataOutput FullBackupDataOutput(android.os.ParcelFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.app.backup.WallpaperBackupHelper void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.app.backup.BackupAgent void fullBackupFile(java.io.File, android.app.backup.FullBackupDataOutput) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/appwidget/annotations.xml b/android-sdk-annotations/android/appwidget/annotations.xml
index 108fa3d8b20..b3692587b7e 100644
--- a/android-sdk-annotations/android/appwidget/annotations.xml
+++ b/android-sdk-annotations/android/appwidget/annotations.xml
@@ -2,9 +2,6 @@
     <item name='android.appwidget.AppWidgetProvider void onReceive(android.content.Context, android.content.Intent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.appwidget.AppWidgetManager java.util.List&lt;android.appwidget.AppWidgetProviderInfo&gt; getInstalledProviders()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.appwidget.AppWidgetHostView AppWidgetHostView(android.content.Context, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -14,10 +11,7 @@
     <item name='android.appwidget.AppWidgetHostView void prepareView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.appwidget.AppWidgetHost android.appwidget.AppWidgetHostView onCreateView(android.content.Context, int, android.appwidget.AppWidgetProviderInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.appwidget.AppWidgetProviderInfo android.appwidget.AppWidgetProviderInfo clone()'>
+    <item name='android.appwidget.AppWidgetManager java.util.List&lt;android.appwidget.AppWidgetProviderInfo&gt; getInstalledProviders()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.appwidget.AppWidgetManager void unbindRemoteViewsService(int, android.content.Intent, android.os.UserHandle) 2'>
@@ -26,7 +20,7 @@
     <item name='android.appwidget.AppWidgetHostView boolean drawChild(android.graphics.Canvas, android.view.View, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.appwidget.AppWidgetProviderInfo java.lang.String toString()'>
+    <item name='android.appwidget.AppWidgetHostView android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.appwidget.AppWidgetHostView android.graphics.Rect getDefaultPaddingForWidget(android.content.Context, android.content.ComponentName, android.graphics.Rect) 0'>
@@ -35,45 +29,39 @@
     <item name='android.appwidget.AppWidgetHostView android.widget.FrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.appwidget.AppWidgetHostView android.graphics.Rect getDefaultPaddingForWidget(android.content.Context, android.content.ComponentName, android.graphics.Rect)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.appwidget.AppWidgetHost android.appwidget.AppWidgetHostView createView(android.content.Context, int, android.appwidget.AppWidgetProviderInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.appwidget.AppWidgetHost AppWidgetHost(android.content.Context, int, android.widget.RemoteViews.OnClickHandler, android.os.Looper) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.appwidget.AppWidgetHostView void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.appwidget.AppWidgetManager java.util.List&lt;android.appwidget.AppWidgetProviderInfo&gt; getInstalledProviders(int)'>
+    <item name='android.appwidget.AppWidgetManager android.appwidget.AppWidgetManager getInstance(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.appwidget.AppWidgetHost android.appwidget.AppWidgetHostView onCreateView(android.content.Context, int, android.appwidget.AppWidgetProviderInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.appwidget.AppWidgetHostView android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.appwidget.AppWidgetManager android.appwidget.AppWidgetManager getInstance(android.content.Context) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.appwidget.AppWidgetHostView android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.appwidget.AppWidgetHost AppWidgetHost(android.content.Context, int) 0'>
+    <item name='android.appwidget.AppWidgetProviderInfo android.appwidget.AppWidgetProviderInfo clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.appwidget.AppWidgetHostView android.view.View getDefaultView()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.appwidget.AppWidgetProviderInfo java.lang.Object clone()'>
+    <item name='android.appwidget.AppWidgetManager android.appwidget.AppWidgetManager getInstance(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.appwidget.AppWidgetHost AppWidgetHost(android.content.Context, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.appwidget.AppWidgetProviderInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.appwidget.AppWidgetHost android.appwidget.AppWidgetHostView createView(android.content.Context, int, android.appwidget.AppWidgetProviderInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.appwidget.AppWidgetManager android.appwidget.AppWidgetManager getInstance(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.appwidget.AppWidgetHostView void dispatchSaveInstanceState(android.util.SparseArray&lt;android.os.Parcelable&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -98,6 +86,9 @@
     <item name='android.appwidget.AppWidgetHostView android.graphics.Rect getDefaultPaddingForWidget(android.content.Context, android.content.ComponentName, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.appwidget.AppWidgetHost android.appwidget.AppWidgetHostView createView(android.content.Context, int, android.appwidget.AppWidgetProviderInfo)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.appwidget.AppWidgetProviderInfo AppWidgetProviderInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -107,9 +98,18 @@
     <item name='android.appwidget.AppWidgetHost android.appwidget.AppWidgetHostView onCreateView(android.content.Context, int, android.appwidget.AppWidgetProviderInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.appwidget.AppWidgetHostView android.graphics.Rect getDefaultPaddingForWidget(android.content.Context, android.content.ComponentName, android.graphics.Rect)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.appwidget.AppWidgetProviderInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.appwidget.AppWidgetManager java.util.List&lt;android.appwidget.AppWidgetProviderInfo&gt; getInstalledProviders(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.appwidget.AppWidgetProviderInfo java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.appwidget.AppWidgetHost AppWidgetHost(android.content.Context, int, android.widget.RemoteViews.OnClickHandler, android.os.Looper) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/bluetooth/annotations.xml b/android-sdk-annotations/android/bluetooth/annotations.xml
index c2349ca4410..a2587ad0197 100644
--- a/android-sdk-annotations/android/bluetooth/annotations.xml
+++ b/android-sdk-annotations/android/bluetooth/annotations.xml
@@ -1,89 +1,68 @@
 <root>
-    <item name='android.bluetooth.BluetoothGattServer boolean connect(android.bluetooth.BluetoothDevice, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothGattServer boolean removeService(android.bluetooth.BluetoothGattService) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.bluetooth.BluetoothGattServer boolean sendResponse(android.bluetooth.BluetoothDevice, int, int, int, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothGattServerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothUuid boolean isHeadset(android.os.ParcelUuid) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingInsecureRfcommWithServiceRecord(java.lang.String, java.util.UUID)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothServerSocket android.bluetooth.BluetoothSocket accept(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothGattCharacteristic boolean addDescriptor(android.bluetooth.BluetoothGattDescriptor) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothStateChangeCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingEncryptedRfcommOn(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothDevice android.bluetooth.BluetoothSocket createInsecureRfcommSocket(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothUuid boolean isAudioSink(android.os.ParcelUuid) 0'>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onServiceAdded(int, int, int, android.os.ParcelUuid) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGatt.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothStateChangeCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothInputDevice.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothGatt boolean readDescriptor(android.bluetooth.BluetoothGattDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothHealthCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.bluetooth.BluetoothUuid boolean isAudioSink(android.os.ParcelUuid) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothDevice android.bluetooth.BluetoothSocket createScoSocket()'>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onDescriptorWriteRequest(java.lang.String, int, int, int, boolean, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, android.os.ParcelUuid, byte[]) 11'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothPan.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback void onDescriptorWrite(java.lang.String, int, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, android.os.ParcelUuid) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothDevice void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothTetheringDataTracker void startMonitoring(android.content.Context, android.os.Handler) 1'>
+    <item name='android.bluetooth.IBluetoothManager.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothHeadsetPhone.Stub android.os.IBinder asBinder()'>
+    <item name='android.bluetooth.IBluetoothManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingRfcommOn(int)'>
+    <item name='android.bluetooth.IBluetoothHeadset.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothManagerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.bluetooth.IBluetoothGattCallback void onGetService(java.lang.String, int, int, android.os.ParcelUuid) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothUuid int getServiceIdentifierFromParcelUuid(android.os.ParcelUuid) 0'>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onCharacteristicReadRequest(java.lang.String, int, int, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothUuid boolean isNap(android.os.ParcelUuid) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingRfcommWithServiceRecord(java.lang.String, java.util.UUID)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothClass void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothManagerCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingScoOn()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.bluetooth.BluetoothHealthAppConfiguration void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothGattCallback.Stub android.os.IBinder asBinder()'>
+    <item name='android.bluetooth.IBluetoothGattCallback void onClientConnectionState(int, int, boolean, java.lang.String) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback void onSearchComplete(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.IBluetoothPbap.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
@@ -92,52 +71,232 @@
     <item name='android.bluetooth.BluetoothGatt void abortReliableWrite(android.bluetooth.BluetoothDevice) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothGattCharacteristic boolean setValue(java.lang.String) 0'>
+    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingInsecureRfcommOn(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothUuid boolean isAudioSource(android.os.ParcelUuid) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothDevice android.bluetooth.BluetoothSocket createRfcommSocket(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothHealth.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingEncryptedRfcommWithServiceRecord(java.lang.String, java.util.UUID)'>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onDescriptorWriteRequest(java.lang.String, int, int, int, boolean, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, android.os.ParcelUuid, byte[]) 10'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothManager android.bluetooth.BluetoothGattServer openGattServer(android.content.Context, android.bluetooth.BluetoothGattServerCallback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothServerSocket android.bluetooth.BluetoothSocket accept()'>
+    <item name='android.bluetooth.IBluetoothManagerCallback.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothHealthAppConfiguration java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothUuid boolean isBnep(android.os.ParcelUuid) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingInsecureRfcommOn(int)'>
+    <item name='android.bluetooth.BluetoothSocket java.io.InputStream getInputStream()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothPbap BluetoothPbap(android.content.Context, android.bluetooth.BluetoothPbap.ServiceListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothGattCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.bluetooth.BluetoothPbap boolean doesClassMatchSink(android.bluetooth.BluetoothClass) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothTetheringDataTracker java.lang.String getTcpBufferSizesPropName()'>
+    <item name='android.bluetooth.IBluetoothGattCallback void onGetDescriptor(java.lang.String, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, android.os.ParcelUuid) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback void onDescriptorRead(java.lang.String, int, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, android.os.ParcelUuid, byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothGatt boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothServerSocket android.bluetooth.BluetoothSocket accept(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothPbap.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothPbap.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothUuid boolean isInputDevice(android.os.ParcelUuid) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothHeadsetPhone.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback void onGetCharacteristic(java.lang.String, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback void onCharacteristicWrite(java.lang.String, int, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onDescriptorReadRequest(java.lang.String, int, int, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, android.os.ParcelUuid) 9'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothManager android.bluetooth.BluetoothGattServer openGattServer(android.content.Context, android.bluetooth.BluetoothGattServerCallback) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothTetheringDataTracker android.net.LinkProperties getLinkProperties()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothA2dp.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothGatt boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothTetheringDataTracker android.net.NetworkInfo getNetworkInfo()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothUuid boolean isPanu(android.os.ParcelUuid) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattServerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothStateChangeCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onDescriptorWriteRequest(java.lang.String, int, int, int, boolean, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, android.os.ParcelUuid, byte[]) 8'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothDevice android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingRfcommWithServiceRecord(java.lang.String, java.util.UUID)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothA2dp java.lang.String stateToString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothInputDevice.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothGattServer void cancelConnection(android.bluetooth.BluetoothDevice) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingInsecureRfcommWithServiceRecord(java.lang.String, java.util.UUID)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothHeadset.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothUuid boolean isAvrcpTarget(android.os.ParcelUuid) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onDescriptorReadRequest(java.lang.String, int, int, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, android.os.ParcelUuid) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothTetheringDataTracker android.net.LinkCapabilities getLinkCapabilities()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.bluetooth.IBluetoothManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothGattServer boolean addService(android.bluetooth.BluetoothGattService) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothHeadset.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothGatt java.util.List&lt;android.bluetooth.BluetoothGattService&gt; getServices()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothGattServer boolean removeService(android.bluetooth.BluetoothGattService) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothGattServer boolean connect(android.bluetooth.BluetoothDevice, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback void onCharacteristicRead(java.lang.String, int, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothUuid boolean isHeadset(android.os.ParcelUuid) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetooth.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattServerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothHealth.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothGattCharacteristic boolean addDescriptor(android.bluetooth.BluetoothGattDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothServerSocket android.bluetooth.BluetoothSocket accept()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothHealthCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothTetheringDataTracker void startMonitoring(android.content.Context, android.os.Handler) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothPan.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingScoOn()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothManagerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothUuid int getServiceIdentifierFromParcelUuid(android.os.ParcelUuid) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothClass void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingRfcommOn(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onCharacteristicWriteRequest(java.lang.String, int, int, int, boolean, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, byte[]) 10'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothDevice android.bluetooth.BluetoothSocket createRfcommSocket(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothGattCharacteristic boolean setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothClass java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onDescriptorReadRequest(java.lang.String, int, int, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, android.os.ParcelUuid) 6'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.bluetooth.IBluetoothHealthCallback.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothPbap boolean doesClassMatchSink(android.bluetooth.BluetoothClass) 0'>
+    <item name='android.bluetooth.IBluetoothHealth.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothUuid boolean isBnep(android.os.ParcelUuid) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothHealthCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback void onGetIncludedService(java.lang.String, int, int, android.os.ParcelUuid, int, int, android.os.ParcelUuid) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothManagerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.IBluetoothPan.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
@@ -146,66 +305,42 @@
     <item name='android.bluetooth.BluetoothGattService boolean addCharacteristic(android.bluetooth.BluetoothGattCharacteristic) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothHeadset.Stub android.os.IBinder asBinder()'>
+    <item name='android.bluetooth.BluetoothTetheringDataTracker void startMonitoring(android.content.Context, android.os.Handler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothDevice getRemoteDevice(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothUuid boolean isHandsfree(android.os.ParcelUuid) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothGatt java.util.List&lt;android.bluetooth.BluetoothGattService&gt; getServices()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothGatt boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor) 0'>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onCharacteristicReadRequest(java.lang.String, int, int, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothGattServer boolean notifyCharacteristicChanged(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothGattCharacteristic, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothTetheringDataTracker android.net.NetworkInfo getNetworkInfo()'>
+    <item name='android.bluetooth.IBluetoothA2dp.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.IBluetoothHeadsetPhone.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothUuid boolean isInputDevice(android.os.ParcelUuid) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothDevice android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothStateChangeCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothPbap.Stub android.os.IBinder asBinder()'>
+    <item name='android.bluetooth.IBluetoothGattCallback void onNotify(java.lang.String, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.IBluetoothGattServerCallback.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothA2dp.Stub android.os.IBinder asBinder()'>
+    <item name='android.bluetooth.IBluetoothGattCallback void onReadRemoteRssi(java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothGatt boolean readCharacteristic(android.bluetooth.BluetoothGattCharacteristic) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothTetheringDataTracker android.net.LinkProperties getLinkProperties()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothHealth.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.bluetooth.BluetoothHeadset boolean isBluetoothVoiceDialingEnabled(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothManager android.bluetooth.BluetoothGattServer openGattServer(android.content.Context, android.bluetooth.BluetoothGattServerCallback) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.bluetooth.IBluetoothA2dp.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -215,73 +350,61 @@
     <item name='android.bluetooth.IBluetoothGatt.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothDevice android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID)'>
+    <item name='android.bluetooth.IBluetoothCallback.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothInputDevice.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothSocket java.io.OutputStream getOutputStream()'>
+    <item name='android.bluetooth.IBluetoothHealth.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.IBluetooth.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothGatt boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean) 0'>
+    <item name='android.bluetooth.IBluetooth.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothUuid boolean isPanu(android.os.ParcelUuid) 0'>
+    <item name='android.bluetooth.BluetoothDevice android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.bluetooth.IBluetoothGattCallback void onExecuteWrite(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.BluetoothUuid boolean isAvrcpController(android.os.ParcelUuid) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothPan.Stub android.os.IBinder asBinder()'>
+    <item name='android.bluetooth.IBluetoothHeadsetPhone.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingEncryptedRfcommOn(int)'>
+    <item name='android.bluetooth.BluetoothHealthAppConfiguration java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothSocket java.io.InputStream getInputStream()'>
+    <item name='android.bluetooth.IBluetoothGattServerCallback void onCharacteristicWriteRequest(java.lang.String, int, int, int, boolean, boolean, int, int, android.os.ParcelUuid, int, android.os.ParcelUuid, byte[]) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothGatt.Stub android.os.IBinder asBinder()'>
+    <item name='android.bluetooth.BluetoothSocket java.io.OutputStream getOutputStream()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetooth.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothGattServer void cancelConnection(android.bluetooth.BluetoothDevice) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothA2dp java.lang.String stateToString(int)'>
+    <item name='android.bluetooth.BluetoothDevice android.bluetooth.BluetoothSocket createScoSocket()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.bluetooth.IBluetoothInputDevice.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothUuid boolean isAvrcpTarget(android.os.ParcelUuid) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.BluetoothClass java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.bluetooth.IBluetoothManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.bluetooth.BluetoothUuid boolean isAdvAudioDist(android.os.ParcelUuid) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.bluetooth.IBluetoothGatt.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.bluetooth.BluetoothGatt boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothGattServer boolean addService(android.bluetooth.BluetoothGattService) 0'>
+    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothServerSocket listenUsingEncryptedRfcommWithServiceRecord(java.lang.String, java.util.UUID)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.IBluetoothHeadset.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.bluetooth.IBluetoothStateChangeCallback.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothDevice getRemoteDevice(byte[])'>
+    <item name='android.bluetooth.BluetoothTetheringDataTracker java.lang.String getTcpBufferSizesPropName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/content/annotations.xml b/android-sdk-annotations/android/content/annotations.xml
index 75466255cfa..027a6051210 100644
--- a/android-sdk-annotations/android/content/annotations.xml
+++ b/android-sdk-annotations/android/content/annotations.xml
@@ -1,26 +1,83 @@
 <root>
-    <item name='android.content.Intent android.content.Intent putCharSequenceArrayListExtra(java.lang.String, java.util.ArrayList&lt;java.lang.CharSequence&gt;)'>
+    <item name='android.content.IOnPrimaryClipChangedListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void setWallpaper(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentProvider void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putFloat(java.lang.String, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtras(android.os.Bundle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context java.io.FileInputStream openFileInput(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void removeStickyBroadcast(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProvider int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SearchRecentSuggestionsProvider int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setAction(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentUris android.net.Uri withAppendedId(android.net.Uri, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentValues java.util.Set&lt;java.util.Map.Entry&lt;java.lang.String,java.lang.Object&gt;&gt; valueSet()'>
+    <item name='android.content.SharedPreferences long getLong(java.lang.String, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider android.content.res.AssetFileDescriptor openTypedAssetFile(java.lang.String, android.net.Uri, java.lang.String, android.os.Bundle) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent getIntent(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.BroadcastReceiver android.os.IBinder peekService(android.content.Context, android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.lang.CharSequence[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.ContentResolver android.content.IContentProvider acquireUnstableProvider(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProvider android.net.Uri rejectInsert(android.net.Uri, android.content.ContentValues)'>
+    <item name='android.content.Context java.io.File getDatabasePath(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ClipData android.content.ClipData newRawUri(java.lang.CharSequence, android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IOnPrimaryClipChangedListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent java.lang.String toUri(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider android.database.Cursor query(java.lang.String, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.ICancellationSignal) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IIntentReceiver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, float[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setClass(android.content.Context, java.lang.Class&lt;?&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProvider android.content.ContentProviderResult[] applyBatch(java.util.ArrayList&lt;android.content.ContentProviderOperation&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider int update(java.lang.String, android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentFilter void readFromXml(org.xmlpull.v1.XmlPullParser) 0'>
@@ -29,94 +86,133 @@
     <item name='android.content.Loader void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context android.content.Context createPackageContextAsUser(java.lang.String, int, android.os.UserHandle) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentUris android.net.Uri withAppendedId(android.net.Uri, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.SearchRecentSuggestionsProvider int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.BroadcastReceiver android.os.IBinder peekService(android.content.Context, android.content.Intent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, float[])'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, short)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.SearchRecentSuggestionsProvider java.lang.String getType(android.net.Uri)'>
+    <item name='android.content.ContentProvider android.net.Uri rejectInsert(android.net.Uri, android.content.ContentValues)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SharedPreferences android.content.SharedPreferences.Editor edit()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentSender android.content.IntentSender readIntentSenderOrNullFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.ClipDescription void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.ISyncContext.Stub android.os.IBinder asBinder()'>
+    <item name='android.content.Intent android.content.Intent setDataAndNormalize(android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ClipData java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent replaceExtras(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ISyncContext.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.SyncAdapterType SyncAdapterType(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.IContentService void unregisterContentObserver(android.database.IContentObserver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContextWrapper int checkCallingPermission(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContextWrapper android.content.Context createConfigurationContext(android.content.res.Configuration) 0'>
+    <item name='android.content.ContextWrapper boolean deleteFile(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContextWrapper int checkPermission(java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setClass(android.content.Context, java.lang.Class&lt;?&gt;)'>
+    <item name='android.content.ContextWrapper android.content.Context createConfigurationContext(android.content.res.Configuration) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putInt(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Loader java.lang.String dataToString(D)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver android.net.Uri insert(android.net.Uri, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putParcelableArrayListExtra(java.lang.String, java.util.ArrayList&lt;? extends android.os.Parcelable&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.Context int checkCallingPermission(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent java.lang.String toString()'>
+    <item name='android.content.ContextWrapper void unregisterReceiver(android.content.BroadcastReceiver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ISyncAdapter.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newInsert(android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ComponentName ComponentName(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentResolver java.lang.Object addStatusChangeListener(int, android.content.SyncStatusObserver)'>
+    <item name='android.content.Context android.content.Context createDisplayContext(android.view.Display)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.IContentService.Stub android.os.IBinder asBinder()'>
+    <item name='android.content.Context void sendStickyOrderedBroadcast(android.content.Intent, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ISyncStatusObserver.Stub android.os.IBinder asBinder()'>
+    <item name='android.content.ContentProvider int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.AsyncQueryHandler android.os.Handler createHandler(android.os.Looper)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver android.content.ContentProviderClient acquireContentProviderClient(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, long)'>
+    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withValueBackReference(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context android.content.Context createPackageContextAsUser(java.lang.String, int, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ISyncContext.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ClipData.Item java.lang.CharSequence coerceToText(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setType(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.IClipboard.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.ClipData.Item java.lang.CharSequence coerceToStyledText(android.content.Context)'>
+    <item name='android.content.Context void sendOrderedBroadcast(android.content.Intent, java.lang.String, int, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent android.content.Intent parseIntent(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
@@ -128,48 +224,84 @@
     <item name='android.content.Intent void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ClipData.Item java.lang.CharSequence coerceToStyledText(android.content.Context) 0'>
+    <item name='android.content.IIntentReceiver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderResult java.lang.String toString()'>
+    <item name='android.content.ContentProviderOperation java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ClipData.Item java.lang.CharSequence coerceToStyledText(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent Intent(android.content.Context, java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent void readFromParcel(android.os.Parcel) 0'>
+    <item name='android.content.SyncAdapterType android.content.SyncAdapterType newKey(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentFilter void addDataType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent void readFromParcel(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProvider int bulkInsert(android.net.Uri, android.content.ContentValues[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context java.io.File getFileStreamPath(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Context void enforcePermission(java.lang.String, int, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.SharedPreferences float getFloat(java.lang.String, float) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setPackage(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.SearchRecentSuggestionsProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ComponentName java.lang.String toShortString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context void startActivities(android.content.Intent[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Intent android.content.Intent parseIntent(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, android.os.Parcelable[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent Intent(android.content.Context, java.lang.Class&lt;?&gt;) 1'>
+    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent java.lang.String resolveType(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent Intent(android.content.Context, java.lang.Class&lt;?&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentResolver android.content.IContentProvider acquireExistingProvider(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context android.content.pm.ApplicationInfo getApplicationInfo()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider java.lang.String[] getStreamTypes(android.net.Uri, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent java.lang.String toURI()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper android.content.Intent registerReceiverAsUser(android.content.BroadcastReceiver, android.os.UserHandle, android.content.IntentFilter, java.lang.String, android.os.Handler) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ComponentCallbacks void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -179,70 +311,118 @@
     <item name='android.content.ContextWrapper void enforceCallingOrSelfPermission(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.SearchRecentSuggestionsProvider java.lang.String getType(android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Context boolean startInstrumentation(android.content.ComponentName, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent android.content.Intent parseIntent(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withSelection(java.lang.String, java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider int update(java.lang.String, android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider java.lang.String getType(android.net.Uri) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, android.os.IBinder)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ClipData.Item java.lang.String coerceToHtmlText(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IIntentSender.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ClipDescription java.lang.String toString()'>
+    <item name='android.content.Context android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Loader.OnLoadCompleteListener void onLoadComplete(android.content.Loader&lt;D&gt;, D) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.SyncStatusInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.IIntentSender.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, short[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(int, int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver android.content.ContentProviderClient acquireUnstableContentProviderClient(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, double[])'>
+    <item name='android.content.ClipData android.content.ClipData newPlainText(java.lang.CharSequence, java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ClipData android.content.ClipData newHtmlText(java.lang.CharSequence, java.lang.CharSequence, java.lang.String)'>
+    <item name='android.content.Context android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent android.content.Intent setDataAndTypeAndNormalize(android.net.Uri, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, double)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper java.io.FileInputStream openFileInput(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void sendStickyOrderedBroadcast(android.content.Intent, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Intent android.content.Intent putExtras(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentResolver void addPeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle, long) 2'>
+    <item name='android.content.Context void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SearchRecentSuggestionsProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentFilter IntentFilter(android.content.IntentFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentResolver void addPeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle, long) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IIntentSender.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentValues void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ISyncAdapter.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ComponentName android.content.ComponentName readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent setFlags(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, android.os.Parcelable[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Context java.lang.Object getSystemService(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentUris android.net.Uri.Builder appendId(android.net.Uri.Builder, long)'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, byte)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IIntentReceiver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProvider java.lang.String[] getStreamTypes(android.net.Uri, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.DefaultDataHandler void startPrefixMapping(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver void startSync(android.net.Uri, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Entity java.util.ArrayList&lt;android.content.Entity.NamedContentValues&gt; getSubValues()'>
+    <item name='android.content.Context android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.CursorLoader CursorLoader(android.content.Context, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
@@ -251,21 +431,12 @@
     <item name='android.content.SyncInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, android.os.Parcelable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.ClipData.Item java.lang.String toString()'>
+    <item name='android.content.ClipData.Item java.lang.CharSequence coerceToStyledText(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IContentService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setPackage(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent cloneFilter()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.Intent android.content.Intent setClass(android.content.Context, java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -275,25 +446,34 @@
     <item name='android.content.ContentResolver java.io.OutputStream openOutputStream(android.net.Uri, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ClipData android.content.ClipData newPlainText(java.lang.CharSequence, java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent setClassName(android.content.Context, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.ContentProvider android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.IContentService.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.lang.CharSequence[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentResolver void removePeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver void addPeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ISyncAdapter.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtras(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Context void enforceCallingPermission(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation android.content.ContentProviderResult apply(android.content.ContentProvider, android.content.ContentProviderResult[], int)'>
+    <item name='android.content.ClipData.Item java.lang.String coerceToHtmlText(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider int delete(java.lang.String, android.net.Uri, java.lang.String, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) 0'>
@@ -302,19 +482,34 @@
     <item name='android.content.ContentProviderResult ContentProviderResult(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.DialogInterface.OnClickListener void onClick(android.content.DialogInterface, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent createChooser(android.content.Intent, java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Intent android.content.pm.ActivityInfo resolveActivityInfo(android.content.pm.PackageManager, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation build()'>
+    <item name='android.content.Entity java.util.ArrayList&lt;android.content.Entity.NamedContentValues&gt; getSubValues()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IClipboard void addPrimaryClipChangedListener(android.content.IOnPrimaryClipChangedListener, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setClass(android.content.Context, java.lang.Class&lt;?&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Context void enforceCallingOrSelfPermission(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setClass(android.content.Context, java.lang.Class&lt;?&gt;) 1'>
+    <item name='android.content.SharedPreferences int getInt(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContextWrapper void unbindService(android.content.ServiceConnection) 0'>
@@ -323,67 +518,106 @@
     <item name='android.content.ContentResolver android.content.ContentResolver.OpenResourceIdResult getResourceId(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ComponentName java.lang.String flattenToString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.ContentUris android.net.Uri withAppendedId(android.net.Uri, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.ContentResolver void addPeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withValueBackReferences(android.content.ContentValues)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentResolver void removePeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.IContentProvider int bulkInsert(java.lang.String, android.net.Uri, android.content.ContentValues[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putParcelableArrayListExtra(java.lang.String, java.util.ArrayList&lt;? extends android.os.Parcelable&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withValues(android.content.ContentValues)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ISyncContext.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void sendStickyBroadcast(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ClipData.Item void toShortString(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.AsyncQueryHandler android.os.Handler createHandler(android.os.Looper) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context android.content.Context createDisplayContext(android.view.Display) 0'>
+    <item name='android.content.Context void sendOrderedBroadcast(android.content.Intent, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ComponentName java.lang.Object clone()'>
+    <item name='android.content.Context android.content.Context createDisplayContext(android.view.Display) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.SearchRecentSuggestionsProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent java.lang.Object clone()'>
+    <item name='android.content.ContextWrapper java.io.File getFilesDir()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SharedPreferences boolean getBoolean(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, boolean[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setTypeAndNormalize(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentFilter void addDataScheme(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.IContentProvider int bulkInsert(java.lang.String, android.net.Uri, android.content.ContentValues[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setType(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentResolver android.os.ParcelFileDescriptor openFileDescriptor(android.net.Uri, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent android.content.Intent setClassName(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putStringArrayListExtra(java.lang.String, java.util.ArrayList&lt;java.lang.String&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.SyncAdapterType android.content.SyncAdapterType newKey(java.lang.String, java.lang.String)'>
+    <item name='android.content.Context android.content.Context getApplicationContext()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.RestrictionEntry void setChoiceEntries(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context java.lang.String getString(int, java.lang.Object...)'>
+    <item name='android.content.SearchRecentSuggestionsProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withValue(java.lang.String, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.AsyncTaskLoader void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.SyncStats java.lang.String toString()'>
+    <item name='android.content.ISyncStatusObserver.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setData(android.net.Uri)'>
+    <item name='android.content.ContextWrapper void sendBroadcast(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.CursorEntityIterator android.content.Entity getEntityAndIncrementCursor(android.database.Cursor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, char[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent android.content.Intent setClassName(android.content.Context, java.lang.String) 1'>
@@ -392,43 +626,58 @@
     <item name='android.content.Loader Loader(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent makeMainSelectorActivity(java.lang.String, java.lang.String)'>
+    <item name='android.content.Intent android.content.Intent parseUri(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, int[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.SyncResult java.lang.String toString()'>
+    <item name='android.content.Loader java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ComponentName int compareTo(android.content.ComponentName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setDataAndTypeAndNormalize(android.net.Uri, java.lang.String)'>
+    <item name='android.content.IClipboard.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent createChooser(android.content.Intent, java.lang.CharSequence)'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, android.os.Parcelable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context void setWallpaper(android.graphics.Bitmap) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.DefaultDataHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentFilter IntentFilter(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContextWrapper void sendOrderedBroadcast(android.content.Intent, java.lang.String, int, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProvider android.net.Uri rejectInsert(android.net.Uri, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context void removeStickyBroadcast(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.CursorEntityIterator android.content.Entity getEntityAndIncrementCursor(android.database.Cursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.DefaultDataHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent Intent(java.lang.String, android.net.Uri, android.content.Context, java.lang.Class&lt;?&gt;) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.Intent android.content.Intent setClassName(android.content.Context, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putIntegerArrayListExtra(java.lang.String, java.util.ArrayList&lt;java.lang.Integer&gt;)'>
+    <item name='android.content.Intent Intent(java.lang.String, android.net.Uri, android.content.Context, java.lang.Class&lt;?&gt;) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, android.os.Bundle)'>
+    <item name='android.content.IContentProvider android.os.ParcelFileDescriptor openFile(java.lang.String, android.net.Uri, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProviderNative android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.SyncAdaptersCache android.content.SyncAdapterType parseServiceAttributes(android.content.res.Resources, java.lang.String, android.util.AttributeSet) 0'>
@@ -437,7 +686,7 @@
     <item name='android.content.Context void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(int[])'>
+    <item name='android.content.ComponentName java.lang.String getPackageName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ComponentName void writeToParcel(android.os.Parcel, int) 0'>
@@ -446,34 +695,31 @@
     <item name='android.content.IntentFilter IntentFilter(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent setClassName(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Intent android.content.ComponentName resolveActivity(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setClassName(java.lang.String, java.lang.String) 1'>
+    <item name='android.content.DefaultDataHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.CursorLoader void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent java.lang.String toURI()'>
+    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ComponentName java.lang.String getClassName()'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent replaceExtras(android.os.Bundle)'>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putLong(java.lang.String, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Context boolean bindService(android.content.Intent, android.content.ServiceConnection, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent getIntent(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, long[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, char)'>
+    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(int, int[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent Intent(java.lang.String, android.net.Uri, android.content.Context, java.lang.Class&lt;?&gt;) 3'>
@@ -482,31 +728,43 @@
     <item name='android.content.ContextWrapper void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation build()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Intent android.content.Intent replaceExtras(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setAction(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Context java.lang.CharSequence getText(int)'>
+    <item name='android.content.Context java.lang.String getString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ClipDescription ClipDescription(java.lang.CharSequence, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentValues java.util.Set&lt;java.lang.String&gt; keySet()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putLong(java.lang.String, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.IntentFilter int matchDataAuthority(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withValue(java.lang.String, java.lang.Object)'>
+    <item name='android.content.Context android.content.Intent registerReceiverAsUser(android.content.BroadcastReceiver, android.os.UserHandle, android.content.IntentFilter, java.lang.String, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.lang.CharSequence)'>
+    <item name='android.content.SyncResult java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver void removePeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent makeMainActivity(android.content.ComponentName)'>
+    <item name='android.content.ClipDescription java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper java.io.FileOutputStream openFileOutput(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContextWrapper boolean bindService(android.content.Intent, android.content.ServiceConnection, int) 1'>
@@ -515,58 +773,73 @@
     <item name='android.content.ContentResolver java.io.OutputStream openOutputStream(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context void sendBroadcast(android.content.Intent, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentResolver android.content.res.AssetFileDescriptor openAssetFileDescriptor(android.net.Uri, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.IntentFilter int match(android.content.ContentResolver, android.content.Intent, boolean, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentResolver android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ComponentName ComponentName(android.content.Context, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.IntentFilter int match(android.content.ContentResolver, android.content.Intent, boolean, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.SyncAdaptersCache android.content.SyncAdapterType parseServiceAttributes(android.content.res.Resources, java.lang.String, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProvider android.content.ContentProviderResult[] applyBatch(java.util.ArrayList&lt;android.content.ContentProviderOperation&gt;)'>
+    <item name='android.content.IContentProvider android.content.res.AssetFileDescriptor openTypedAssetFile(java.lang.String, android.net.Uri, java.lang.String, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ClipData android.content.ClipData newRawUri(java.lang.CharSequence, android.net.Uri)'>
+    <item name='android.content.IContentService void requestSync(android.accounts.Account, java.lang.String, android.os.Bundle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setClassName(java.lang.String, java.lang.String)'>
+    <item name='android.content.ComponentName java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withYieldAllowed(boolean)'>
+    <item name='android.content.ContentProvider android.content.IContentProvider getIContentProvider()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent android.content.Intent parseUri(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProvider java.lang.String getType(android.net.Uri)'>
+    <item name='android.content.DefaultDataHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setDataAndNormalize(android.net.Uri)'>
+    <item name='android.content.Intent android.content.Intent setData(android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.AsyncQueryHandler void handleMessage(android.os.Message) 0'>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putFloat(java.lang.String, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentSender void writeIntentSenderOrNullToParcel(android.content.IntentSender, android.os.Parcel) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.AsyncQueryHandler void handleMessage(android.os.Message) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.CursorLoader CursorLoader(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentFilter void addDataAuthority(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(int, int[])'>
+    <item name='android.content.Context void sendBroadcast(android.content.Intent, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentResolver void unstableProviderDied(android.content.IContentProvider) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context java.io.FileOutputStream openFileOutput(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IClipboard void removePrimaryClipChangedListener(android.content.IOnPrimaryClipChangedListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.SyncStatusInfo SyncStatusInfo(android.os.Parcel) 0'>
@@ -578,39 +851,48 @@
     <item name='android.content.ClipDescription boolean compareMimeTypes(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, byte)'>
+    <item name='android.content.IIntentSender.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withValueBackReference(java.lang.String, int)'>
+    <item name='android.content.ContextWrapper java.io.File getDatabasePath(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent replaceExtras(android.content.Intent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(int[]) 0'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.io.Serializable)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newInsert(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ClipData ClipData(android.content.ClipDescription, android.content.ClipData.Item) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContextWrapper boolean bindServiceAsUser(android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProviderResult ContentProviderResult(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withValueBackReferences(android.content.ContentValues)'>
+    <item name='android.content.Context boolean deleteFile(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentResolver android.content.ContentResolver.OpenResourceIdResult getResourceId(android.net.Uri)'>
+    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withYieldAllowed(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent android.content.Intent getIntentOld(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.DefaultDataHandler void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor remove(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ClipData android.content.ClipData newUri(android.content.ContentResolver, java.lang.CharSequence, android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -620,25 +902,22 @@
     <item name='android.content.IntentFilter void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentValues java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.io.Serializable)'>
+    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withExpectedCount(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContextWrapper void enforceCallingPermission(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int) 0'>
+    <item name='android.content.DefaultDataHandler void processingInstruction(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ClipData ClipData(java.lang.CharSequence, java.lang.String[], android.content.ClipData.Item) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderNative android.os.IBinder asBinder()'>
+    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ComponentName java.lang.String toString()'>
+    <item name='android.content.IContentProvider android.content.ContentProviderResult[] applyBatch(java.lang.String, java.util.ArrayList&lt;android.content.ContentProviderOperation&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent.ShortcutIconResource void writeToParcel(android.os.Parcel, int) 0'>
@@ -647,27 +926,36 @@
     <item name='android.content.SearchRecentSuggestionsProvider void setupSuggestions(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context java.lang.String getString(int)'>
+    <item name='android.content.AbstractThreadedSyncAdapter void onSyncCanceled(java.lang.Thread) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.AbstractThreadedSyncAdapter void onSyncCanceled(java.lang.Thread) 0'>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putString(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.RestrictionEntry void setChoiceValues(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.AsyncQueryHandler android.os.Handler createHandler(android.os.Looper)'>
+    <item name='android.content.Intent android.content.Intent makeMainActivity(android.content.ComponentName)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent java.lang.String toShortString(boolean, boolean, boolean, boolean)'>
+    <item name='android.content.Context void unregisterReceiver(android.content.BroadcastReceiver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderResult void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.content.DefaultDataHandler void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putCharSequenceArrayListExtra(java.lang.String, java.util.ArrayList&lt;java.lang.CharSequence&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProvider java.lang.String getType(android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.RestrictionEntry RestrictionEntry(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentProviderResult void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentResolver android.content.IContentProvider acquireProvider(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -677,22 +965,34 @@
     <item name='android.content.IntentFilter void dump(android.util.Printer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ComponentName java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, char[])'>
+    <item name='android.content.ContextWrapper int checkUriPermission(android.net.Uri, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.DefaultDataHandler void processingInstruction(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ComponentName ComponentName(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, short[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentService void registerContentObserver(android.net.Uri, boolean, android.database.IContentObserver, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Context int checkPermission(java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent.ShortcutIconResource android.content.Intent.ShortcutIconResource fromContext(android.content.Context, int)'>
+    <item name='android.content.ContentProvider android.os.ParcelFileDescriptor openPipeHelper(android.net.Uri, java.lang.String, android.os.Bundle, T, android.content.ContentProvider.PipeDataWriter&lt;T&gt;) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProvider android.os.ParcelFileDescriptor openPipeHelper(android.net.Uri, java.lang.String, android.os.Bundle, T, android.content.ContentProvider.PipeDataWriter&lt;T&gt;) 4'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.PeriodicSync PeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle, long) 2'>
@@ -701,7 +1001,13 @@
     <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newUpdate(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, boolean[])'>
+    <item name='android.content.Context java.io.File getFileStreamPath(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putInt(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ComponentName java.lang.String getClassName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentUris android.net.Uri.Builder appendId(android.net.Uri.Builder, long) 0'>
@@ -710,28 +1016,31 @@
     <item name='android.content.IntentFilter.AuthorityEntry AuthorityEntry(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent parseIntent(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet)'>
+    <item name='android.content.DefaultDataHandler void setDocumentLocator(org.xml.sax.Locator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ClipData android.content.ClipData newIntent(java.lang.CharSequence, android.content.Intent)'>
+    <item name='android.content.ContentProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Entity java.lang.String toString()'>
+    <item name='android.content.Intent java.lang.String toShortString(boolean, boolean, boolean, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[])'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, android.os.Bundle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.IOnPrimaryClipChangedListener.Stub android.os.IBinder asBinder()'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setDataAndType(android.net.Uri, java.lang.String)'>
+    <item name='android.content.Intent android.content.Intent makeMainSelectorActivity(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SyncStats java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ClipData android.content.ClipData newUri(android.content.ContentResolver, java.lang.CharSequence, android.net.Uri) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withExpectedCount(int)'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent.ShortcutIconResource android.content.Intent.ShortcutIconResource fromContext(android.content.Context, int) 0'>
@@ -743,22 +1052,37 @@
     <item name='android.content.ComponentName ComponentName(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentResolver void removeStatusChangeListener(java.lang.Object) 0'>
+    <item name='android.content.ComponentName java.lang.String flattenToString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withValues(android.content.ContentValues)'>
+    <item name='android.content.Context void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context void startActivitiesAsUser(android.content.Intent[], android.os.Bundle, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentResolver void removeStatusChangeListener(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent int fillIn(android.content.Intent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent addCategory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ClipData ClipData(android.content.ClipData) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentProvider void attachInfo(android.content.Context, android.content.pm.ProviderInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newAssertQuery(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ComponentName android.content.ComponentName clone()'>
+    <item name='android.content.Context java.io.File getSharedPrefsFile(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentService void registerContentObserver(android.net.Uri, boolean, android.database.IContentObserver, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver int bulkInsert(android.net.Uri, android.content.ContentValues[]) 0'>
@@ -770,10 +1094,7 @@
     <item name='android.content.Context android.content.Context createConfigurationContext(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newDelete(android.net.Uri)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent java.lang.String toInsecureStringWithClip()'>
+    <item name='android.content.IntentSender java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent java.lang.String resolveType(android.content.ContentResolver) 0'>
@@ -788,15 +1109,27 @@
     <item name='android.content.DefaultDataHandler void insert(android.content.ContentResolver, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, float)'>
+    <item name='android.content.Intent java.lang.String toInsecureString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, double)'>
+    <item name='android.content.Context java.io.File getDatabasePath(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setClassName(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setDataAndType(android.net.Uri, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver void requestSync(android.accounts.Account, java.lang.String, android.os.Bundle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentResolver java.util.List&lt;android.content.PeriodicSync&gt; getPeriodicSyncs(android.accounts.Account, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -806,40 +1139,52 @@
     <item name='android.content.Intent android.content.Intent putExtras(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context void setWallpaper(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContextWrapper java.lang.Object getSystemService(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.SharedPreferences java.util.Map&lt;java.lang.String,?&gt; getAll()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.IntentFilter android.content.IntentFilter create(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ComponentName java.lang.String getPackageName()'>
+    <item name='android.content.Context android.content.Context createPackageContext(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Loader java.lang.String dataToString(D)'>
+    <item name='android.content.Context void startActivitiesAsUser(android.content.Intent[], android.os.Bundle, android.os.UserHandle) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentUris long parseId(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context java.lang.String getString(int, java.lang.Object...) 1'>
+    <item name='android.content.ComponentName android.content.ComponentName clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context android.content.Context createPackageContext(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentQueryMap ContentQueryMap(android.database.Cursor, java.lang.String, boolean, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context java.lang.String getString(int, java.lang.Object...) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProvider int delete(android.net.Uri, java.lang.String, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context void unbindService(android.content.ServiceConnection) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.IntentFilter IntentFilter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newInsert(android.net.Uri)'>
+    <item name='android.content.Context void unbindService(android.content.ServiceConnection) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.SyncResult void writeToParcel(android.os.Parcel, int) 0'>
@@ -848,10 +1193,19 @@
     <item name='android.content.ContentResolver void validateSyncExtrasBundle(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentProviderOperation android.content.ContentProviderResult apply(android.content.ContentProvider, android.content.ContentProviderResult[], int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.IntentFilter void addAction(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.SyncResult java.lang.String toDebugString()'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, double[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setDataAndTypeAndNormalize(android.net.Uri, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentFilter android.content.IntentFilter create(java.lang.String, java.lang.String) 0'>
@@ -860,25 +1214,52 @@
     <item name='android.content.ComponentName android.content.ComponentName unflattenFromString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent makeRestartActivityTask(android.content.ComponentName)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentInsertHandler void insert(android.content.ContentResolver, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.UriMatcher int match(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent setClassName(android.content.Context, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SyncAdapterType java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.IntentSender void sendIntent(android.content.Context, int, android.content.Intent, android.content.IntentSender.OnFinished, android.os.Handler, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentQueryMap ContentQueryMap(android.database.Cursor, java.lang.String, boolean, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.IntentFilter android.content.IntentFilter create(java.lang.String, java.lang.String)'>
+    <item name='android.content.ContentValues java.util.Set&lt;java.util.Map.Entry&lt;java.lang.String,java.lang.Object&gt;&gt; valueSet()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent java.lang.String toUri(int)'>
+    <item name='android.content.ContextWrapper java.io.File getFileStreamPath(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProvider int delete(android.net.Uri, java.lang.String, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newAssertQuery(android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newDelete(android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor clear()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.PeriodicSync void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent java.lang.String resolveTypeIfNeeded(android.content.ContentResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.PeriodicSync void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.content.Context java.io.FileInputStream openFileInput(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver int delete(android.net.Uri, java.lang.String, java.lang.String[]) 0'>
@@ -893,6 +1274,12 @@
     <item name='android.content.ContentProviderOperation android.content.ContentProviderResult apply(android.content.ContentProvider, android.content.ContentProviderResult[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newUpdate(android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentResolver java.lang.Object addStatusChangeListener(int, android.content.SyncStatusObserver)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.BroadcastReceiver void onReceive(android.content.Context, android.content.Intent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -902,55 +1289,76 @@
     <item name='android.content.SyncAdaptersCache java.lang.Object parseServiceAttributes(android.content.res.Resources, java.lang.String, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ClipData.Item java.lang.String coerceToHtmlText(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent addCategory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.IIntentReceiver.Stub android.os.IBinder asBinder()'>
+    <item name='android.content.Context android.content.SharedPreferences getSharedPreferences(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentProvider void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context void startActivities(android.content.Intent[], android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent.ShortcutIconResource android.content.Intent.ShortcutIconResource fromContext(android.content.Context, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void startActivities(android.content.Intent[], android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContextWrapper int checkCallingOrSelfPermission(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.SyncAdapterType java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withSelection(java.lang.String, java.lang.String[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.ClipData void addItem(android.content.ClipData.Item) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setTypeAndNormalize(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.AsyncQueryHandler.WorkerHandler void handleMessage(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.SearchRecentSuggestionsProvider java.lang.String getType(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context android.content.Context createPackageContextAsUser(java.lang.String, int, android.os.UserHandle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContextWrapper void enforcePermission(java.lang.String, int, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.DialogInterface.OnKeyListener boolean onKey(android.content.DialogInterface, int, android.view.KeyEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent putIntegerArrayListExtra(java.lang.String, java.util.ArrayList&lt;java.lang.Integer&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent addFlags(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentResolver android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.IIntentReceiver void performReceive(android.content.Intent, int, java.lang.String, android.os.Bundle, boolean, boolean, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putBoolean(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent cloneFilter()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ComponentName int compareTo(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent android.content.Intent addCategory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putBoolean(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.IntentSender void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.IntentSender java.lang.String toString()'>
+    <item name='android.content.ClipData android.content.ClipData newHtmlText(java.lang.CharSequence, java.lang.CharSequence, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentFilter boolean hasDataAuthority(android.net.Uri) 0'>
@@ -959,43 +1367,70 @@
     <item name='android.content.IntentFilter void writeToXml(org.xmlpull.v1.XmlSerializer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ISyncAdapter.Stub android.os.IBinder asBinder()'>
+    <item name='android.content.ContextWrapper void startActivitiesAsUser(android.content.Intent[], android.os.Bundle, android.os.UserHandle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Loader java.lang.String toString()'>
+    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withSelectionBackReference(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver java.util.List&lt;android.content.PeriodicSync&gt; getPeriodicSyncs(android.accounts.Account, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContextWrapper void sendBroadcast(android.content.Intent, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider java.lang.String getType(android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.RestrictionEntry java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ClipData android.content.ClipData newIntent(java.lang.CharSequence, android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void startActivities(android.content.Intent[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider android.content.res.AssetFileDescriptor openAssetFile(java.lang.String, android.net.Uri, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context java.lang.CharSequence getText(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void sendOrderedBroadcast(android.content.Intent, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Intent Intent(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.lang.String)'>
+    <item name='android.content.SearchRecentSuggestionsProvider int delete(android.net.Uri, java.lang.String, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.SyncAdaptersCache java.lang.Object parseServiceAttributes(android.content.res.Resources, java.lang.String, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentProviderNative java.lang.String getProviderName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.IntentFilter void addDataPath(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ComponentName java.lang.String toShortString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.SearchRecentSuggestionsProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)'>
+    <item name='android.content.ClipData android.content.ClipData newUri(android.content.ContentResolver, java.lang.CharSequence, android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.BroadcastReceiver void onReceive(android.content.Context, android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContextWrapper android.content.Context createPackageContext(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContextWrapper android.content.Context createDisplayContext(android.view.Display) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, android.os.IBinder)'>
+    <item name='android.content.ISyncStatusObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ClipData android.content.ClipData newUri(android.content.ContentResolver, java.lang.CharSequence, android.net.Uri)'>
+    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, long[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentProvider java.lang.String getType(android.net.Uri) 0'>
@@ -1010,42 +1445,81 @@
     <item name='android.content.ContentResolver java.lang.String getType(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent.FilterComparison android.content.Intent getIntent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.SyncStats SyncStats(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContextWrapper void sendBroadcast(android.content.Intent, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContextWrapper void startActivitiesAsUser(android.content.Intent[], android.os.Bundle, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IOnPrimaryClipChangedListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.IntentFilter.AuthorityEntry int match(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ComponentName java.lang.String flattenToShortString()'>
+    <item name='android.content.IClipboard.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtras(android.content.Intent)'>
+    <item name='android.content.ContentProviderResult java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context java.io.File getDir(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IntentFilter android.content.IntentFilter create(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent getIntentOld(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver void unregisterContentObserver(android.database.ContentObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.IContentProvider android.net.Uri insert(java.lang.String, android.net.Uri, android.content.ContentValues) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Intent android.content.Intent createChooser(android.content.Intent, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent Intent(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setComponent(android.content.ComponentName)'>
+    <item name='android.content.ContentUris android.net.Uri.Builder appendId(android.net.Uri.Builder, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentValues java.util.Set&lt;java.lang.String&gt; keySet()'>
+    <item name='android.content.ContextWrapper android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Context android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int)'>
+    <item name='android.content.ContextWrapper android.content.Context createPackageContextAsUser(java.lang.String, int, android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, short)'>
+    <item name='android.content.ISyncStatusObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context android.content.Context createConfigurationContext(android.content.res.Configuration)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentValues java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SyncResult java.lang.String toDebugString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.IntentSender void sendIntent(android.content.Context, int, android.content.Intent, android.content.IntentSender.OnFinished, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent replaceExtras(android.os.Bundle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProviderNative boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Intent android.content.Intent getIntent(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1055,79 +1529,97 @@
     <item name='android.content.ClipDescription java.lang.String[] filterMimeTypes(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newDelete(android.net.Uri) 0'>
+    <item name='android.content.ComponentName java.lang.String flattenToShortString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ContentProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent setComponent(android.content.ComponentName)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.RestrictionEntry void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newDelete(android.net.Uri) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context java.lang.String getString(int, java.lang.Object...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ClipDescription boolean hasMimeType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.RestrictionEntry java.lang.String toString()'>
+    <item name='android.content.ContextWrapper void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newAssertQuery(android.net.Uri)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent putExtras(android.os.Bundle)'>
+    <item name='android.content.Context void sendStickyBroadcast(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentProviderNative boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent makeRestartActivityTask(android.content.ComponentName)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.ContentProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent.FilterComparison android.content.Intent getIntent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.Intent android.content.Intent putExtra(java.lang.String, java.lang.String[])'>
+    <item name='android.content.Context java.lang.String[] fileList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver java.io.InputStream openInputStream(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent.FilterComparison FilterComparison(android.content.Intent) 0'>
+    <item name='android.content.ContentResolver android.content.ContentResolver.OpenResourceIdResult getResourceId(android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent parseUri(java.lang.String, int)'>
+    <item name='android.content.Intent.FilterComparison FilterComparison(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.PeriodicSync boolean syncExtrasEquals(android.os.Bundle, android.os.Bundle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.IntentFilter int match(android.content.ContentResolver, android.content.Intent, boolean, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.PeriodicSync boolean syncExtrasEquals(android.os.Bundle, android.os.Bundle) 1'>
+    <item name='android.content.Context java.lang.String[] databaseList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.ContentResolver android.os.Bundle call(android.net.Uri, java.lang.String, java.lang.String, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation.Builder android.content.ContentProviderOperation.Builder withSelectionBackReference(int, int)'>
+    <item name='android.content.Context int checkUriPermission(android.net.Uri, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent java.lang.String toInsecureStringWithClip()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Intent android.content.Intent setDataAndNormalize(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContextWrapper android.content.Context createPackageContextAsUser(java.lang.String, int, android.os.UserHandle) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Intent android.content.Intent parseIntent(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ComponentName void writeToParcel(android.content.ComponentName, android.os.Parcel) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ContextWrapper void setWallpaper(android.graphics.Bitmap) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProviderOperation void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent setFlags(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.SyncAdapterType void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent getIntentOld(java.lang.String)'>
+    <item name='android.content.ClipData.Item java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.IContentProvider android.net.Uri insert(java.lang.String, android.net.Uri, android.content.ContentValues) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.Context int checkCallingOrSelfPermission(java.lang.String) 0'>
@@ -1136,6 +1628,9 @@
     <item name='android.content.PeriodicSync boolean syncExtrasEquals(android.os.Bundle, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Intent android.content.Intent putStringArrayListExtra(java.lang.String, java.util.ArrayList&lt;java.lang.String&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.Intent android.content.Intent makeMainSelectorActivity(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1148,22 +1643,31 @@
     <item name='android.content.ContextWrapper boolean startInstrumentation(android.content.ComponentName, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context boolean bindServiceAsUser(android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.SharedPreferences.Editor android.content.SharedPreferences.Editor putStringSet(java.lang.String, java.util.Set&lt;java.lang.String&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentValues ContentValues(android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent java.lang.String toInsecureString()'>
+    <item name='android.content.Context void sendBroadcast(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.ContentProviderOperation android.content.ContentProviderOperation.Builder newUpdate(android.net.Uri)'>
+    <item name='android.content.Entity java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.AsyncTaskLoader AsyncTaskLoader(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.Intent android.content.Intent addFlags(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.ContentProvider android.database.Cursor rejectQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.Context java.io.FileOutputStream openFileOutput(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.Context void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/content/pm/annotations.xml b/android-sdk-annotations/android/content/pm/annotations.xml
index e18cf38470c..3e1102c7518 100644
--- a/android-sdk-annotations/android/content/pm/annotations.xml
+++ b/android-sdk-annotations/android/content/pm/annotations.xml
@@ -1,89 +1,59 @@
 <root>
-    <item name='android.content.pm.ActivityInfo void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.content.pm.XmlSerializerAndParser T createFromXml(org.xmlpull.v1.XmlPullParser)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageManager android.content.pm.PackageInfo getPackageArchiveInfo(java.lang.String, int) 0'>
+    <item name='android.content.pm.VerifierDeviceIdentity android.content.pm.VerifierDeviceIdentity generate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageParser.PermissionGroup java.lang.String toString()'>
+    <item name='android.content.pm.IPackageMoveObserver.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageParser.Instrumentation java.lang.String toString()'>
+    <item name='android.content.pm.PackageManager android.content.pm.ResolveInfo resolveActivityAsUser(android.content.Intent, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageParser.Provider Provider(android.content.pm.PackageParser.ParseComponentArgs, android.content.pm.ProviderInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ApplicationInfo android.content.pm.ApplicationInfo getApplicationInfo()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageParser.ServiceIntentInfo java.lang.String toString()'>
+    <item name='android.content.pm.PackageManager android.content.pm.ActivityInfo getReceiverInfo(android.content.ComponentName, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.ConfigurationInfo ConfigurationInfo(android.content.pm.ConfigurationInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageItemInfo java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageUserState PackageUserState(android.content.pm.PackageUserState) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageStats java.lang.String toString()'>
+    <item name='android.content.pm.PackageParser.ServiceIntentInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.ActivityInfo void dump(android.util.Printer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ServiceInfo void dump(android.util.Printer, java.lang.String) 0'>
+    <item name='android.content.pm.LimitedLengthInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ResolveInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.VerifierDeviceIdentity java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ParceledListSlice void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.content.pm.RegisteredServicesCache V parseServiceAttributes(android.content.res.Resources, java.lang.String, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.UserInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageItemInfo void dumpFront(android.util.Printer, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.IPackageStatsObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageItemInfo android.graphics.drawable.Drawable loadDefaultIcon(android.content.pm.PackageManager) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.ApplicationInfo ApplicationInfo(android.content.pm.ApplicationInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ServiceInfo java.lang.String toString()'>
+    <item name='android.content.pm.ComponentInfo android.graphics.drawable.Drawable loadDefaultIcon(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageParser.Permission java.lang.String toString()'>
+    <item name='android.content.pm.IPackageManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PackageItemInfo android.graphics.drawable.Drawable loadLogo(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PermissionGroupInfo void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.content.pm.ContainerEncryptionParams java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageItemInfo void dumpBack(android.util.Printer, java.lang.String) 0'>
+    <item name='android.content.pm.ResolveInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ActivityInfo java.lang.String toString()'>
+    <item name='android.content.pm.IPackageManager void querySyncProviders(java.util.List&lt;java.lang.String&gt;, java.util.List&lt;android.content.pm.ProviderInfo&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.VerifierDeviceIdentity android.content.pm.VerifierDeviceIdentity parse(java.lang.String)'>
+    <item name='android.content.pm.ApplicationInfo android.graphics.drawable.Drawable loadDefaultIcon(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PackageParser.Component Component(android.content.pm.PackageParser.ParsePackageItemArgs, android.content.pm.PackageItemInfo) 0'>
@@ -92,25 +62,394 @@
     <item name='android.content.pm.Signature Signature(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageManager java.lang.String getDataDirForUser(int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.IPackageInstallObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ApplicationInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.VerifierDeviceIdentity android.content.pm.VerifierDeviceIdentity generate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.ComponentInfo ComponentInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PermissionInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ConfigurationInfo java.lang.String toString()'>
+    <item name='android.content.pm.PackageManager android.graphics.drawable.Drawable getActivityLogo(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.VerifierInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageInstallObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.Component Component(android.content.pm.PackageParser.Component&lt;II&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo android.content.res.XmlResourceParser loadXmlMetaData(android.content.pm.PackageManager, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.VerifierInfo VerifierInfo(java.lang.String, java.security.PublicKey) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ActivityInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ResolveInfo.DisplayNameComparator int compare(java.lang.Object, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ResolveInfo.DisplayNameComparator int compare(android.content.pm.ResolveInfo, android.content.pm.ResolveInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.RegisteredServicesCache V parseServiceAttributes(android.content.res.Resources, java.lang.String, android.util.AttributeSet) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryBroadcastReceivers(android.content.Intent, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageManager void querySyncProviders(java.util.List&lt;java.lang.String&gt;, java.util.List&lt;android.content.pm.ProviderInfo&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.MacAuthenticatedInputStream MacAuthenticatedInputStream(java.io.InputStream, javax.crypto.Mac) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.content.pm.ResolveInfo resolveService(android.content.Intent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentServicesAsUser(android.content.Intent, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageInstallObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo PackageItemInfo(android.content.pm.PackageItemInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager java.lang.String getDataDirForUser(int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.RegisteredServicesCache void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.VerifierDeviceIdentity android.content.pm.VerifierDeviceIdentity parse(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ResolveInfo.DisplayNameComparator int compare(android.content.pm.ResolveInfo, android.content.pm.ResolveInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.FeatureInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager void replacePreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.content.pm.ServiceInfo getServiceInfo(android.content.ComponentName, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser android.content.pm.Signature stringToSignature(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.Signature void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.Signature boolean areExactMatch(android.content.pm.Signature[], android.content.pm.Signature[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager java.util.List&lt;android.content.pm.PermissionInfo&gt; queryPermissionsByGroup(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo.DisplayNameComparator int compare(android.content.pm.PackageItemInfo, android.content.pm.PackageItemInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.UserInfo UserInfo(android.content.pm.UserInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageInfoLite void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.Instrumentation Instrumentation(android.content.pm.PackageParser.ParsePackageItemArgs, android.content.pm.InstrumentationInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.content.pm.ApplicationInfo getApplicationInfo(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageManager void removePermission(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentActivitiesAsUser(android.content.Intent, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.Instrumentation java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageStats PackageStats(android.content.pm.PackageStats) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.Signature char[] toChars(char[], int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.PackageLite PackageLite(java.lang.String, int, int, java.util.List&lt;android.content.pm.VerifierInfo&gt;) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentServices(android.content.Intent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ComponentInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.FeatureInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PermissionInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.ActivityIntentInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo PackageItemInfo(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ContainerEncryptionParams ContainerEncryptionParams(java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey, java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey, byte[], long, long, long) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ServiceInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ContainerEncryptionParams ContainerEncryptionParams(java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser android.content.pm.PackageParser.Package parsePackage(java.io.File, java.lang.String, android.util.DisplayMetrics, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PermissionGroupInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ComponentInfo void dumpBack(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ComponentInfo void dumpFront(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo.DisplayNameComparator int compare(java.lang.Object, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PermissionInfo java.lang.String protectionToString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.VerificationParams java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ResolveInfo android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageDeleteObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ApplicationInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.content.Intent buildPermissionRequestIntent(java.lang.String...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ResolveInfo.DisplayNameComparator int compare(java.lang.Object, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ConfigurationInfo java.lang.String getGlEsVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageStatsObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ContainerEncryptionParams ContainerEncryptionParams(java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager java.lang.CharSequence getApplicationLabel(android.content.pm.ApplicationInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ContainerEncryptionParams ContainerEncryptionParams(java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey, java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey, byte[], long, long, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.graphics.drawable.Drawable getApplicationLogo(android.content.pm.ApplicationInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageManager java.lang.String[] canonicalToCurrentPackageNames(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.Provider java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageMoveObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ResolveInfo void dump(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ApplicationInfo android.content.pm.ApplicationInfo getApplicationInfo()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo.DisplayNameComparator int compare(java.lang.Object, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PermissionGroupInfo PermissionGroupInfo(android.content.pm.PermissionGroupInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.content.pm.ResolveInfo resolveActivity(android.content.Intent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ProviderInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.content.Intent buildPermissionRequestIntent(java.lang.String...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.Signature byte[] toByteArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageManager void clearApplicationUserData(java.lang.String, android.content.pm.IPackageDataObserver, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ApplicationInfo void dump(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ServiceInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.Activity java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser android.content.pm.Signature stringToSignature(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryBroadcastReceivers(android.content.Intent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.Permission java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo.DisplayNameComparator int compare(android.content.pm.PackageItemInfo, android.content.pm.PackageItemInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageManager java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.LabeledIntent void readFromParcel(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ServiceInfo ServiceInfo(android.content.pm.ServiceInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ManifestDigest void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ComponentInfo java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageMoveObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ConfigurationInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageDataObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.LabeledIntent java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageInstallObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.VerifierDeviceIdentity android.content.pm.VerifierDeviceIdentity parse(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ActivityInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.FeatureInfo java.lang.String getGlEsVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.content.pm.PackageInfo getPackageArchiveInfo(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager android.graphics.drawable.Drawable getApplicationIcon(android.content.pm.ApplicationInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.RegisteredServicesCache.ServiceInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.Provider Provider(android.content.pm.PackageParser.ParseComponentArgs, android.content.pm.ProviderInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.XmlSerializerAndParser void writeAsXml(T, org.xmlpull.v1.XmlSerializer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageUserState PackageUserState(android.content.pm.PackageUserState) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ServiceInfo void dump(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ResolveInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ParceledListSlice void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageManager int getPreferredActivities(java.util.List&lt;android.content.IntentFilter&gt;, java.util.List&lt;android.content.ComponentName&gt;, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo void dumpFront(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo android.graphics.drawable.Drawable loadDefaultIcon(android.content.pm.PackageManager) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ContainerEncryptionParams java.security.spec.AlgorithmParameterSpec getEncryptionSpec()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageDeleteObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.XmlSerializerAndParser void writeAsXml(T, org.xmlpull.v1.XmlSerializer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageDataObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PermissionGroupInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageItemInfo void dumpBack(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.IPackageManager int getPreferredActivities(java.util.List&lt;android.content.IntentFilter&gt;, java.util.List&lt;android.content.ComponentName&gt;, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.ApplicationInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.PermissionGroup java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PathPermission PathPermission(android.os.Parcel) 0'>
@@ -125,97 +464,43 @@
     <item name='android.content.pm.PackageParser.Component Component(android.content.pm.PackageParser.ParseComponentArgs, android.content.pm.ComponentInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.VerifierInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageParser.Component Component(android.content.pm.PackageParser.Component&lt;II&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.PermissionGroupInfo java.lang.CharSequence loadDescription(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.IPackageManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.content.pm.ConfigurationInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.FeatureInfo java.lang.String getGlEsVersion()'>
+    <item name='android.content.pm.PackageInfoLite java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageItemInfo android.content.res.XmlResourceParser loadXmlMetaData(android.content.pm.PackageManager, java.lang.String) 0'>
+    <item name='android.content.pm.ProviderInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.VerifierInfo VerifierInfo(java.lang.String, java.security.PublicKey) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.VerificationParams java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.IPackageDeleteObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ApplicationInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ResolveInfo.DisplayNameComparator int compare(java.lang.Object, java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ResolveInfo.DisplayNameComparator int compare(android.content.pm.ResolveInfo, android.content.pm.ResolveInfo) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PermissionInfo java.lang.String protectionToString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.InstrumentationInfo java.lang.String toString()'>
+    <item name='android.content.pm.IPackageDataObserver.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.InstrumentationInfo InstrumentationInfo(android.content.pm.InstrumentationInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageParser.Activity java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.ApplicationInfo.DisplayNameComparator int compare(java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageParser.Package java.lang.String toString()'>
+    <item name='android.content.pm.XmlSerializerAndParser T createFromXml(org.xmlpull.v1.XmlPullParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.Signature java.lang.String toCharsString()'>
+    <item name='android.content.pm.PackageManager android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.VerificationParams void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.MacAuthenticatedInputStream MacAuthenticatedInputStream(java.io.InputStream, javax.crypto.Mac) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ResolveInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.Signature char[] toChars(char[], int[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageItemInfo PackageItemInfo(android.content.pm.PackageItemInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageParser.ActivityIntentInfo java.lang.String toString()'>
+    <item name='android.content.pm.PackageManager android.content.pm.PackageInfo getPackageInfo(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.LabeledIntent android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.RegisteredServicesCache void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[], int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.FeatureInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ResolveInfo.DisplayNameComparator int compare(android.content.pm.ResolveInfo, android.content.pm.ResolveInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.FeatureInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageItemInfo void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.content.pm.Signature char[] toChars()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.Signature Signature(byte[]) 0'>
@@ -227,64 +512,43 @@
     <item name='android.content.pm.ActivityInfo ActivityInfo(android.content.pm.ActivityInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ProviderInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageParser.Service java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageParser android.content.pm.Signature stringToSignature(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.Signature void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.content.pm.IPackageManager void replacePreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PackageStats void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.Signature boolean areExactMatch(android.content.pm.Signature[], android.content.pm.Signature[]) 1'>
+    <item name='android.content.pm.PackageManager int getPreferredActivities(java.util.List&lt;android.content.IntentFilter&gt;, java.util.List&lt;android.content.ComponentName&gt;, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageItemInfo.DisplayNameComparator int compare(android.content.pm.PackageItemInfo, android.content.pm.PackageItemInfo) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.UserInfo UserInfo(android.content.pm.UserInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageInfoLite void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageManager android.content.Intent buildPermissionRequestIntent(java.lang.String...)'>
+    <item name='android.content.pm.PackageManager java.lang.String[] canonicalToCurrentPackageNames(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.MacAuthenticatedInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageParser.Instrumentation Instrumentation(android.content.pm.PackageParser.ParsePackageItemArgs, android.content.pm.InstrumentationInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.PackageStats PackageStats(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.VerifierDeviceIdentity void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageStats PackageStats(android.content.pm.PackageStats) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageParser.PackageLite PackageLite(java.lang.String, int, int, java.util.List&lt;android.content.pm.VerifierInfo&gt;) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.PackageParser android.content.pm.PackageInfo generatePackageInfo(android.content.pm.PackageParser.Package, int[], int, long, long, java.util.HashSet&lt;java.lang.String&gt;, android.content.pm.PackageUserState) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ComponentInfo void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.content.pm.LimitedLengthInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.LabeledIntent void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.LimitedLengthInputStream int read(byte[]) 0'>
+    <item name='android.content.pm.IPackageStatsObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageParser.Service java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.PackageManager int getPreferredActivities(java.util.List&lt;android.content.IntentFilter&gt;, java.util.List&lt;android.content.ComponentName&gt;, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.RegisteredServicesCache java.util.Collection&lt;android.content.pm.RegisteredServicesCache.ServiceInfo&lt;V&gt;&gt; getAllServices(int)'>
@@ -293,202 +557,121 @@
     <item name='android.content.pm.UserInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageItemInfo PackageItemInfo(android.os.Parcel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.IPackageManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ContainerEncryptionParams ContainerEncryptionParams(java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey, java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey, byte[], long, long, long) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageParser android.content.pm.PackageParser.Package parsePackage(java.io.File, java.lang.String, android.util.DisplayMetrics, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.IPackageMoveObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ContainerEncryptionParams ContainerEncryptionParams(java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageParser.Provider java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.VerifierInfo VerifierInfo(java.lang.String, java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ComponentInfo void dumpBack(android.util.Printer, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.LabeledIntent LabeledIntent(android.content.Intent, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ComponentInfo void dumpFront(android.util.Printer, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageItemInfo.DisplayNameComparator int compare(java.lang.Object, java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.InstrumentationInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.ComponentInfo ComponentInfo(android.content.pm.ComponentInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ResolveInfo android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager) 0'>
+    <item name='android.content.pm.ApplicationInfo.DisplayNameComparator int compare(android.content.pm.ApplicationInfo, android.content.pm.ApplicationInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PackageParser android.content.pm.PackageInfo generatePackageInfo(android.content.pm.PackageParser.Package, int[], int, long, long, java.util.HashSet&lt;java.lang.String&gt;, android.content.pm.PackageUserState, int) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ApplicationInfo.DisplayNameComparator int compare(android.content.pm.ApplicationInfo, android.content.pm.ApplicationInfo) 0'>
+    <item name='android.content.pm.PackageManager android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ResolveInfo.DisplayNameComparator int compare(java.lang.Object, java.lang.Object) 1'>
+    <item name='android.content.pm.PackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentActivities(android.content.Intent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.FeatureInfo FeatureInfo(android.content.pm.FeatureInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.RegisteredServicesCache.ServiceInfo java.lang.String toString()'>
+    <item name='android.content.pm.PackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentActivityOptions(android.content.ComponentName, android.content.Intent[], android.content.Intent, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PackageCleanItem void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageInfoLite java.lang.String toString()'>
+    <item name='android.content.pm.IPackageStatsObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ContainerEncryptionParams ContainerEncryptionParams(java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey) 1'>
+    <item name='android.content.pm.Signature java.lang.String toCharsString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ContainerEncryptionParams ContainerEncryptionParams(java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey, java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.SecretKey, byte[], long, long, long) 1'>
+    <item name='android.content.pm.InstrumentationInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PackageParser.Service Service(android.content.pm.PackageParser.ParseComponentArgs, android.content.pm.ServiceInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ResolveInfo void dump(android.util.Printer, java.lang.String) 0'>
+    <item name='android.content.pm.IPackageDeleteObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageItemInfo.DisplayNameComparator int compare(java.lang.Object, java.lang.Object) 1'>
+    <item name='android.content.pm.PackageParser.Package java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.pm.UserInfo android.os.UserHandle getUserHandle()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.ContainerEncryptionParams void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PermissionGroupInfo PermissionGroupInfo(android.content.pm.PermissionGroupInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.ProviderInfo ProviderInfo(android.content.pm.ProviderInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ProviderInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.LabeledIntent LabeledIntent(android.content.Intent, java.lang.String, java.lang.CharSequence, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.ApplicationInfo.DisplayNameComparator int compare(android.content.pm.ApplicationInfo, android.content.pm.ApplicationInfo) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageManager android.content.Intent buildPermissionRequestIntent(java.lang.String...) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.Signature byte[] toByteArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.IPackageDataObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ApplicationInfo void dump(android.util.Printer, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.ApplicationInfo java.lang.CharSequence loadDescription(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.pm.PackageManager android.content.pm.ProviderInfo getProviderInfo(android.content.ComponentName, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.pm.PackageItemInfo android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ServiceInfo void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.content.pm.PackageManager android.content.pm.PermissionInfo getPermissionInfo(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.LabeledIntent LabeledIntent(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageItemInfo.DisplayNameComparator int compare(android.content.pm.PackageItemInfo, android.content.pm.PackageItemInfo) 0'>
+    <item name='android.content.pm.VerifierDeviceIdentity java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.Signature char[] toChars()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PermissionGroupInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.LabeledIntent void readFromParcel(android.os.Parcel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ServiceInfo ServiceInfo(android.content.pm.ServiceInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ContainerEncryptionParams java.security.spec.AlgorithmParameterSpec getEncryptionSpec()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ComponentInfo java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ManifestDigest void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ContainerEncryptionParams java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ConfigurationInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PackageInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.ResolveInfo ResolveInfo(android.content.pm.ResolveInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.pm.PermissionInfo java.lang.String toString()'>
+    <item name='android.content.pm.PackageManager android.content.res.Resources getResourcesForApplication(android.content.pm.ApplicationInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PackageParser.Provider Provider(android.content.pm.PackageParser.Provider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.UserInfo android.os.UserHandle getUserHandle()'>
+    <item name='android.content.pm.ResolveInfo ResolveInfo(android.content.pm.ResolveInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PathPermission void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ConfigurationInfo java.lang.String getGlEsVersion()'>
+    <item name='android.content.pm.PackageStats java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PermissionInfo java.lang.CharSequence loadDescription(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.LabeledIntent java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.pm.LimitedLengthInputStream LimitedLengthInputStream(java.io.InputStream, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.VerifierDeviceIdentity android.content.pm.VerifierDeviceIdentity parse(java.lang.String) 0'>
+    <item name='android.content.pm.PackageManager void removePermission(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PackageParser.Activity Activity(android.content.pm.PackageParser.ParseComponentArgs, android.content.pm.ActivityInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.PackageParser android.content.pm.Signature stringToSignature(java.lang.String)'>
+    <item name='android.content.pm.ManifestDigest java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.pm.PackageParser boolean collectCertificates(android.content.pm.PackageParser.Package, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.pm.ManifestDigest java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/content/res/annotations.xml b/android-sdk-annotations/android/content/res/annotations.xml
index 1a23fc1d20f..df783ca00fd 100644
--- a/android-sdk-annotations/android/content/res/annotations.xml
+++ b/android-sdk-annotations/android/content/res/annotations.xml
@@ -2,13 +2,19 @@
     <item name='android.content.res.Resources void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.AssetManager java.io.InputStream open(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.Resources.Theme boolean resolveAttribute(int, android.util.TypedValue, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.TypedArray java.lang.String getPositionDescription()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.CompatibilityInfo void applyToDisplayMetrics(android.util.DisplayMetrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.AssetManager android.content.res.AssetFileDescriptor openNonAssetFd(java.lang.String)'>
+    <item name='android.content.res.ColorStateList android.content.res.ColorStateList withAlpha(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int) 0'>
@@ -17,30 +23,48 @@
     <item name='android.content.res.ObbScanner android.content.res.ObbInfo getObbInfo(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.Resources java.lang.String getResourcePackageName(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.CompatibilityInfo float computeCompatibleScaling(android.util.DisplayMetrics, android.util.DisplayMetrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.AssetFileDescriptor java.io.FileInputStream createInputStream()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.AssetFileDescriptor void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Configuration java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.res.CompatibilityInfo.Translator void translateRectInScreenToAppWinFrame(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.AssetManager java.lang.String[] getLocales()'>
+    <item name='android.content.res.Resources java.lang.String getQuantityString(int, int, java.lang.Object...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.AssetManager android.content.res.AssetFileDescriptor openNonAssetFd(int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.CompatibilityInfo.Translator android.graphics.Rect getTranslatedVisibleInsets(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.Resources android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(int, int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.Resources android.content.res.Resources.Theme newTheme()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.ColorStateList android.content.res.ColorStateList valueOf(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.AssetManager java.io.InputStream openNonAsset(int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.AssetFileDescriptor java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -50,9 +74,6 @@
     <item name='android.content.res.Resources.Theme void setTo(android.content.res.Resources.Theme) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources java.lang.String getResourceEntryName(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.res.CompatibilityInfo CompatibilityInfo(android.content.pm.ApplicationInfo, int, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -62,10 +83,16 @@
     <item name='android.content.res.Configuration int diff(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.CompatibilityInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.CompatibilityInfo.Translator void translateRectInScreenToAppWindow(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.AssetManager java.io.InputStream openNonAsset(java.lang.String, int)'>
+    <item name='android.content.res.Resources android.content.res.TypedArray obtainTypedArray(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Resources java.lang.String getResourceEntryName(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.CompatibilityInfo.Translator android.graphics.Region getTranslatedTouchableArea(android.graphics.Region) 0'>
@@ -74,49 +101,37 @@
     <item name='android.content.res.CompatibilityInfo.Translator void translateCanvas(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources android.content.res.Resources getSystem()'>
+    <item name='android.content.res.ColorStateList java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.AssetFileDescriptor.AutoCloseInputStream AutoCloseInputStream(android.content.res.AssetFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources java.lang.String getQuantityString(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.CompatibilityInfo.Translator void translateRectInAppWindowToScreen(android.graphics.Rect) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.AssetManager android.content.res.AssetFileDescriptor openNonAssetFd(int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.AssetManager java.io.InputStream open(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.TypedArray java.lang.String getPositionDescription()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.AssetManager java.io.InputStream open(java.lang.String, int)'>
+    <item name='android.content.res.Resources java.lang.String getResourceTypeName(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Resources java.lang.String getString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.CompatibilityInfo.Translator void translateRectInAppWindowToScreen(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Resources int[] getIntArray(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Configuration java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.AssetManager android.content.res.AssetFileDescriptor openFd(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.Resources void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources java.lang.String getResourceTypeName(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.ColorStateList java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(int[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Resources java.lang.String getResourcePackageName(int)'>
+    <item name='android.content.res.Resources java.io.InputStream openRawResource(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.CompatibilityInfo.Translator void translateWindowLayout(android.view.WindowManager.LayoutParams) 0'>
@@ -131,58 +146,58 @@
     <item name='android.content.res.AssetFileDescriptor AssetFileDescriptor(android.os.ParcelFileDescriptor, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.AssetFileDescriptor java.lang.String toString()'>
+    <item name='android.content.res.AssetManager java.io.InputStream openNonAsset(int, java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources android.content.res.Configuration getConfiguration()'>
+    <item name='android.content.res.ObbInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Resources java.lang.String getString(int, java.lang.Object...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources java.io.InputStream openRawResource(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Resources android.content.res.ColorStateList getColorStateList(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.res.Resources void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Resources java.lang.String getString(int, java.lang.Object...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.Resources android.content.res.AssetFileDescriptor openRawResourceFd(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(int, int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.Resources int getIdentifier(java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.Resources java.lang.CharSequence getQuantityText(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.AssetFileDescriptor.AutoCloseInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Configuration void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.AssetManager java.lang.String[] list(java.lang.String)'>
+    <item name='android.content.res.AssetManager java.io.InputStream open(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Resources java.io.InputStream openRawResource(int, android.util.TypedValue)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Resources android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.AssetManager java.lang.String[] getLocales()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.ColorStateList android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.ColorStateList android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.AssetManager java.io.InputStream openNonAsset(int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Resources android.content.res.TypedArray obtainTypedArray(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Resources android.content.res.Resources.Theme newTheme()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.AssetFileDescriptor java.io.FileInputStream createInputStream()'>
+    <item name='android.content.res.AssetFileDescriptor java.io.FileOutputStream createOutputStream()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.CompatibilityInfo void writeToParcel(android.os.Parcel, int) 0'>
@@ -191,24 +206,21 @@
     <item name='android.content.res.Configuration void setTo(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.ObbScanner android.content.res.ObbInfo getObbInfo(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.res.TypedArray boolean getValue(int, android.util.TypedValue) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources java.lang.CharSequence getQuantityText(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.AssetManager java.io.InputStream openNonAsset(java.lang.String)'>
+    <item name='android.content.res.Resources java.lang.String getQuantityString(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.CompatibilityInfo.Translator void translateLayoutParamsInAppWindowToScreen(android.view.WindowManager.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.Resources android.util.DisplayMetrics getDisplayMetrics()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.CompatibilityInfo.Translator void translateEventInScreenToAppWindow(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -218,34 +230,28 @@
     <item name='android.content.res.AssetManager.AssetInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.AssetFileDescriptor java.io.FileOutputStream createOutputStream()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.AssetManager java.io.InputStream openNonAsset(int, java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.ColorStateList void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.ObbInfo java.lang.String toString()'>
+    <item name='android.content.res.Resources android.content.res.Resources getSystem()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Resources java.lang.CharSequence getText(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.ColorStateList void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Resources java.lang.String getResourceName(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.ObbScanner android.content.res.ObbInfo getObbInfo(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Resources android.content.res.ColorStateList getColorStateList(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.res.CompatibilityInfo.Translator android.graphics.Rect getTranslatedContentInsets(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources int[] getIntArray(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Resources java.lang.String getQuantityString(int, int, java.lang.Object...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.TypedArray java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Resources android.util.DisplayMetrics getDisplayMetrics()'>
+    <item name='android.content.res.Resources java.lang.String[] getStringArray(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Configuration int compareTo(android.content.res.Configuration) 0'>
@@ -254,16 +260,37 @@
     <item name='android.content.res.Resources java.lang.String getQuantityString(int, int, java.lang.Object...) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.ColorStateList android.content.res.ColorStateList valueOf(int)'>
+    <item name='android.content.res.AssetManager android.content.res.AssetFileDescriptor openNonAssetFd(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(int, int[])'>
+    <item name='android.content.res.AssetManager java.io.InputStream openNonAsset(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Resources.Theme android.content.res.TypedArray obtainStyledAttributes(int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.AssetFileDescriptor.AutoCloseInputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.TypedArray java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Configuration int compareTo(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources java.lang.String[] getStringArray(int)'>
+    <item name='android.content.res.Resources java.lang.CharSequence[] getTextArray(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.ColorStateList android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.AssetManager java.io.InputStream openNonAsset(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.AssetManager java.lang.String[] list(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.res.Resources android.content.res.Configuration getConfiguration()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Configuration int updateFrom(android.content.res.Configuration) 0'>
@@ -275,49 +302,31 @@
     <item name='android.content.res.ObbInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources java.lang.CharSequence[] getTextArray(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.res.Resources java.io.InputStream openRawResource(int, android.util.TypedValue) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources java.io.InputStream openRawResource(int, android.util.TypedValue)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.res.ColorStateList ColorStateList(int[][], int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Resources Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.AssetManager android.content.res.AssetFileDescriptor openFd(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.CompatibilityInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.ColorStateList android.content.res.ColorStateList withAlpha(int)'>
+    <item name='android.content.res.AssetManager.AssetInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.CompatibilityInfo void applyToConfiguration(int, android.content.res.Configuration) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.ColorStateList android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.res.Resources void getValue(java.lang.String, android.util.TypedValue, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.content.res.Resources Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration, android.content.res.CompatibilityInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.content.res.Resources android.content.res.AssetFileDescriptor openRawResourceFd(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.content.res.Resources java.lang.String getResourceName(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.content.res.AssetFileDescriptor.AutoCloseOutputStream AutoCloseOutputStream(android.content.res.AssetFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.res.AssetFileDescriptor.AutoCloseOutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/database/annotations.xml b/android-sdk-annotations/android/database/annotations.xml
index 859df1308dd..fdd4c2d8e56 100644
--- a/android-sdk-annotations/android/database/annotations.xml
+++ b/android-sdk-annotations/android/database/annotations.xml
@@ -11,12 +11,15 @@
     <item name='android.database.DatabaseUtils void dumpCurrentRow(android.database.Cursor, java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorJoiner java.util.Iterator&lt;android.database.CursorJoiner.Result&gt; iterator()'>
+    <item name='android.database.CursorWrapper byte[] getBlob(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void cursorRowToContentValues(android.database.Cursor, android.content.ContentValues) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.BulkCursorNative android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils void cursorLongToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,16 +29,10 @@
     <item name='android.database.DatabaseUtils void appendEscapedSQLString(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.MatrixCursor.RowBuilder android.database.MatrixCursor.RowBuilder add(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.DatabaseUtils void cursorStringToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.MergeCursor java.lang.String[] getColumnNames()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.database.AbstractCursor byte[] getBlob(int)'>
+    <item name='android.database.CursorToBulkCursorAdaptor android.database.BulkCursorDescriptor getBulkCursorDescriptor()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void readExceptionWithFileNotFoundExceptionFromParcel(android.os.Parcel) 0'>
@@ -44,6 +41,9 @@
     <item name='android.database.CursorJoiner CursorJoiner(android.database.Cursor, java.lang.String[], android.database.Cursor, java.lang.String[]) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.Cursor byte[] getBlob(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils void cursorIntToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -68,13 +68,10 @@
     <item name='android.database.DatabaseUtils void cursorLongToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorToBulkCursorAdaptor android.database.BulkCursorDescriptor getBulkCursorDescriptor()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.DatabaseUtils void dumpCurrentRow(android.database.Cursor, java.lang.StringBuilder) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorWrapper java.lang.String[] getColumnNames()'>
+    <item name='android.database.AbstractWindowedCursor java.lang.String getString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils java.lang.String stringForQuery(android.database.sqlite.SQLiteStatement, java.lang.String[]) 0'>
@@ -92,24 +89,33 @@
     <item name='android.database.Observable void registerObserver(T) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.MatrixCursor java.lang.String[] getColumnNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.CursorJoiner.Result android.database.CursorJoiner.Result valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.MergeCursor MergeCursor(android.database.Cursor[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void cursorStringToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.CursorWindow java.lang.String getString(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils void cursorIntToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorJoiner.Result android.database.CursorJoiner.Result valueOf(java.lang.String)'>
+    <item name='android.database.AbstractWindowedCursor byte[] getBlob(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.DatabaseUtils java.lang.String dumpCursorToString(android.database.Cursor)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void cursorLongToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.AbstractWindowedCursor java.lang.String getString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.MatrixCursor MatrixCursor(java.lang.String[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -122,9 +128,6 @@
     <item name='android.database.DatabaseUtils void cursorStringToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.AbstractCursor android.os.Bundle respond(android.os.Bundle)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.DatabaseUtils void cursorLongToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -134,9 +137,6 @@
     <item name='android.database.DatabaseUtils void dumpCurrentRow(android.database.Cursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.Cursor java.lang.String[] getColumnNames()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.AbstractCursor void registerContentObserver(android.database.ContentObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -149,25 +149,25 @@
     <item name='android.database.DatabaseUtils void cursorDoubleToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.DatabaseUtils java.lang.String dumpCurrentRowToString(android.database.Cursor)'>
+    <item name='android.database.CursorWindow java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils java.lang.String[] appendSelectionArgs(java.lang.String[], java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorJoiner CursorJoiner(android.database.Cursor, java.lang.String[], android.database.Cursor, java.lang.String[]) 0'>
+    <item name='android.database.DatabaseUtils java.lang.String getHexCollationKey(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.AbstractWindowedCursor byte[] getBlob(int)'>
+    <item name='android.database.CursorJoiner CursorJoiner(android.database.Cursor, java.lang.String[], android.database.Cursor, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils.InsertHelper long replace(android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.DatabaseUtils void cursorLongToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String) 2'>
+    <item name='android.database.AbstractCursor android.os.Bundle respond(android.os.Bundle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorWindow java.lang.String toString()'>
+    <item name='android.database.DatabaseUtils void cursorLongToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void cursorShortToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 1'>
@@ -185,16 +185,10 @@
     <item name='android.database.DatabaseUtils void cursorIntToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.DatabaseUtils java.lang.String getCollationKey(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.database.DatabaseUtils void appendEscapedSQLString(java.lang.StringBuilder, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.AbstractCursor void copyStringToBuffer(int, android.database.CharArrayBuffer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.DatabaseUtils java.lang.String[] appendSelectionArgs(java.lang.String[], java.lang.String[])'>
+    <item name='android.database.DatabaseUtils void appendEscapedSQLString(java.lang.StringBuilder, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void createDbFromSqlStatements(android.content.Context, java.lang.String, int, java.lang.String) 0'>
@@ -203,6 +197,9 @@
     <item name='android.database.DatabaseUtils int findRowIdColumnIndex(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.IContentObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils void appendValueToSql(java.lang.StringBuilder, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -212,6 +209,9 @@
     <item name='android.database.MatrixCursor void addRow(java.lang.Object[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.CursorWrapper void registerContentObserver(android.database.ContentObserver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils long longForQuery(android.database.sqlite.SQLiteStatement, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -233,6 +233,9 @@
     <item name='android.database.DatabaseUtils void writeExceptionToParcel(android.os.Parcel, java.lang.Exception) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.DatabaseUtils java.lang.String[] appendSelectionArgs(java.lang.String[], java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils void cursorShortToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -242,6 +245,12 @@
     <item name='android.database.DatabaseUtils void cursorDoubleToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.BulkCursorNative boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.IContentObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils void dumpCurrentRow(android.database.Cursor, java.io.PrintStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -257,6 +266,9 @@
     <item name='android.database.DatabaseErrorHandler void onCorruption(android.database.sqlite.SQLiteDatabase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.CursorWrapper java.lang.String[] getColumnNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils void cursorDoubleToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -266,13 +278,16 @@
     <item name='android.database.DatabaseUtils long longForQuery(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.Cursor java.lang.String[] getColumnNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.BulkCursorDescriptor void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.DatabaseUtils void cursorStringToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues) 0'>
+    <item name='android.database.MergeCursor byte[] getBlob(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorWindow byte[] getBlob(int, int)'>
+    <item name='android.database.DatabaseUtils void cursorStringToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils android.os.ParcelFileDescriptor blobFileDescriptorForQuery(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String[]) 0'>
@@ -290,15 +305,18 @@
     <item name='android.database.DatabaseUtils void cursorDoubleToCursorValues(android.database.Cursor, java.lang.String, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.MatrixCursor android.database.MatrixCursor.RowBuilder newRow()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.CursorWindow byte[] getBlob(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.CursorJoiner.Result android.database.CursorJoiner.Result valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void cursorShortToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.DatabaseUtils java.lang.String getHexCollationKey(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.DatabaseUtils void dumpCurrentRow(android.database.Cursor, java.io.PrintStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -317,15 +335,15 @@
     <item name='android.database.AbstractCursor void fillWindow(int, android.database.CursorWindow) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.MatrixCursor android.database.MatrixCursor.RowBuilder newRow()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.database.IContentObserver.Stub android.os.IBinder asBinder()'>
+    <item name='android.database.MergeCursor void registerContentObserver(android.database.ContentObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils long longForQuery(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.DatabaseUtils java.lang.String dumpCurrentRowToString(android.database.Cursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils java.lang.String dumpCurrentRowToString(android.database.Cursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -335,19 +353,19 @@
     <item name='android.database.AbstractCursor int getColumnIndex(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.DatabaseUtils java.lang.String dumpCursorToString(android.database.Cursor)'>
+    <item name='android.database.CursorWrapper int getColumnIndex(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorWrapper int getColumnIndex(java.lang.String) 0'>
+    <item name='android.database.AbstractCursor byte[] getBlob(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void cursorStringToInsertHelper(android.database.Cursor, java.lang.String, android.database.DatabaseUtils.InsertHelper, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.DatabaseUtils void readExceptionWithOperationApplicationExceptionFromParcel(android.os.Parcel) 0'>
+    <item name='android.database.IContentObserver.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorWrapper byte[] getBlob(int)'>
+    <item name='android.database.DatabaseUtils void readExceptionWithOperationApplicationExceptionFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void cursorDoubleToCursorValues(android.database.Cursor, java.lang.String, android.content.ContentValues) 2'>
@@ -362,7 +380,7 @@
     <item name='android.database.DatabaseUtils void bindObjectToProgram(android.database.sqlite.SQLiteProgram, int, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.Cursor byte[] getBlob(int)'>
+    <item name='android.database.Cursor void registerContentObserver(android.database.ContentObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.BulkCursorDescriptor void writeToParcel(android.os.Parcel, int) 0'>
@@ -371,10 +389,10 @@
     <item name='android.database.DatabaseUtils java.lang.String sqlEscapeString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.MergeCursor byte[] getBlob(int)'>
+    <item name='android.database.Cursor int getColumnIndex(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.Cursor int getColumnIndex(java.lang.String) 0'>
+    <item name='android.database.MatrixCursor.RowBuilder android.database.MatrixCursor.RowBuilder add(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.CursorWrapper void copyStringToBuffer(int, android.database.CharArrayBuffer) 1'>
@@ -383,27 +401,24 @@
     <item name='android.database.DatabaseUtils void cursorIntToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.DatabaseUtils java.lang.String getCollationKey(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils void cursorLongToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.CursorWindow java.lang.String getString(int, int)'>
+    <item name='android.database.AbstractCursor java.lang.String[] getColumnNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.DatabaseUtils void cursorRowToContentValues(android.database.Cursor, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.DatabaseUtils java.lang.String sqlEscapeString(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.DatabaseUtils void cursorStringToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.AbstractWindowedCursor void copyStringToBuffer(int, android.database.CharArrayBuffer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.BulkCursorNative android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.DatabaseUtils void cursorIntToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -413,21 +428,24 @@
     <item name='android.database.DatabaseUtils void cursorFloatToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.MatrixCursor java.lang.String[] getColumnNames()'>
+    <item name='android.database.Cursor android.os.Bundle respond(android.os.Bundle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.CursorWindow void copyStringToBuffer(int, int, android.database.CharArrayBuffer) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.AbstractCursor java.lang.String[] getColumnNames()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.Observable void unregisterObserver(T) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.DatabaseUtils java.lang.String sqlEscapeString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.ContentObservable void registerObserver(android.database.ContentObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.MergeCursor java.lang.String[] getColumnNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.DatabaseUtils long queryNumEntries(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -443,4 +461,7 @@
     <item name='android.database.CursorWindow void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.CursorJoiner java.util.Iterator&lt;android.database.CursorJoiner.Result&gt; iterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/database/sqlite/annotations.xml b/android-sdk-annotations/android/database/sqlite/annotations.xml
index 8eb4ad425a3..4f3beef3ba1 100644
--- a/android-sdk-annotations/android/database/sqlite/annotations.xml
+++ b/android-sdk-annotations/android/database/sqlite/annotations.xml
@@ -1,4 +1,10 @@
 <root>
+    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase create(android.database.sqlite.SQLiteDatabase.CursorFactory)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.sqlite.SQLiteDebug android.database.sqlite.SQLiteDebug.PagerStats getDatabaseInfo()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set&lt;java.lang.String&gt;, int, java.lang.String, java.lang.String, java.lang.String[], java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -17,7 +23,10 @@
     <item name='android.database.sqlite.SQLiteConnectionPool void dump(android.util.Printer, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteDatabase java.lang.String findEditTable(java.lang.String)'>
+    <item name='android.database.sqlite.SQLiteConnection java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteSession int executeForCursorWindow(java.lang.String, java.lang.Object[], android.database.CursorWindow, int, int, boolean, int, android.os.CancellationSignal) 0'>
@@ -32,9 +41,6 @@
     <item name='android.database.sqlite.SQLiteProgram void bindString(int, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionQuery(java.lang.String[], java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SQLiteConnection int executeForCursorWindow(java.lang.String, java.lang.Object[], android.database.CursorWindow, int, int, boolean, android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -50,24 +56,33 @@
     <item name='android.database.sqlite.SQLiteDatabase java.lang.String findEditTable(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set&lt;java.lang.String&gt;, int, java.lang.String, java.lang.String, java.lang.String[], java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteQueryBuilder android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionQuery(java.lang.String[], java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.sqlite.SQLiteDatabase java.util.Map&lt;java.lang.String,java.lang.String&gt; getSyncedTables()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set&lt;java.lang.String&gt;, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteCursor int getColumnIndex(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildQueryString(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteDatabase android.database.Cursor query(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteSession android.os.ParcelFileDescriptor executeForBlobFileDescriptor(java.lang.String, java.lang.Object[], int, android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteQuery java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SQLiteDebug void dump(android.util.Printer, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -86,31 +101,31 @@
     <item name='android.database.sqlite.SQLiteSession SQLiteSession(android.database.sqlite.SQLiteConnectionPool) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler)'>
+    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildQuery(java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteDatabase void execSQL(java.lang.String, java.lang.Object[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteConnectionPool android.database.sqlite.SQLiteConnection acquireConnection(java.lang.String, int, android.os.CancellationSignal)'>
+    <item name='android.database.sqlite.SQLiteSession java.lang.String executeForString(java.lang.String, java.lang.Object[], int, android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteSession java.lang.String executeForString(java.lang.String, java.lang.Object[], int, android.os.CancellationSignal) 0'>
+    <item name='android.database.sqlite.SQLiteDatabase java.lang.String findEditTable(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionQuery(java.lang.String[], java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteConnectionPool java.lang.String toString()'>
+    <item name='android.database.sqlite.SQLiteDirectCursorDriver java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteQueryBuilder void appendWhere(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteConnection java.lang.String toString()'>
+    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteStatement compileStatement(java.lang.String)'>
+    <item name='android.database.sqlite.SQLiteConnectionPool java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteDatabase void execSQL(java.lang.String) 0'>
@@ -119,30 +134,21 @@
     <item name='android.database.sqlite.SQLiteDatabase android.database.Cursor query(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.os.CancellationSignal) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteConnectionPool android.database.sqlite.SQLiteConnectionPool open(android.database.sqlite.SQLiteDatabaseConfiguration)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SQLiteConnection android.os.ParcelFileDescriptor executeForBlobFileDescriptor(java.lang.String, java.lang.Object[], android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteSession int executeForCursorWindow(java.lang.String, java.lang.Object[], android.database.CursorWindow, int, int, boolean, int, android.os.CancellationSignal) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildQuery(java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.database.sqlite.SQLiteDatabase java.util.Map&lt;java.lang.String,java.lang.String&gt; getSyncedTables()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SQLiteDatabase void addCustomFunction(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CustomFunction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteStatement compileStatement(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteQueryBuilder void appendColumns(java.lang.StringBuilder, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -158,15 +164,15 @@
     <item name='android.database.sqlite.SQLiteConnection long executeForLastInsertedRowId(java.lang.String, java.lang.Object[], android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.sqlite.SQLiteDatabase java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteConnection long executeForLong(java.lang.String, java.lang.Object[], android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteDatabaseConfiguration SQLiteDatabaseConfiguration(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.io.File, android.database.sqlite.SQLiteDatabase.CursorFactory)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SQLiteDatabase android.database.Cursor query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -179,7 +185,10 @@
     <item name='android.database.sqlite.SqliteWrapper void checkSQLiteException(android.content.Context, android.database.sqlite.SQLiteException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildQueryString(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)'>
+    <item name='android.database.sqlite.SQLiteConnectionPool android.database.sqlite.SQLiteConnectionPool open(android.database.sqlite.SQLiteDatabaseConfiguration)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.sqlite.SQLiteOpenHelper void onCreate(android.database.sqlite.SQLiteDatabase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteDatabase void setLocale(java.util.Locale) 0'>
@@ -191,34 +200,52 @@
     <item name='android.database.sqlite.SQLiteSession void execute(java.lang.String, java.lang.Object[], int, android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteDirectCursorDriver java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SQLiteCursor SQLiteCursor(android.database.sqlite.SQLiteCursorDriver, java.lang.String, android.database.sqlite.SQLiteQuery) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteConnection int executeForCursorWindow(java.lang.String, java.lang.Object[], android.database.CursorWindow, int, int, boolean, android.os.CancellationSignal) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set&lt;java.lang.String&gt;, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.io.File, android.database.sqlite.SQLiteDatabase.CursorFactory) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.io.File, android.database.sqlite.SQLiteDatabase.CursorFactory)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteCustomFunction SQLiteCustomFunction(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CustomFunction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.sqlite.SQLiteConnectionPool android.database.sqlite.SQLiteConnection acquireConnection(java.lang.String, int, android.os.CancellationSignal)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set&lt;java.lang.String&gt;, int, java.lang.String, java.lang.String, java.lang.String[], java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteConnection void dump(android.util.Printer, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildQuery(java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set&lt;java.lang.String&gt;, int, java.lang.String, java.lang.String, java.lang.String[], java.lang.String, java.lang.String)'>
+    <item name='android.database.sqlite.SQLiteQueryBuilder android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteQueryBuilder android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String) 0'>
+    <item name='android.database.sqlite.SQLiteQuery java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.database.sqlite.SQLiteStatement java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteSession void prepare(java.lang.String, int, android.os.CancellationSignal, android.database.sqlite.SQLiteStatementInfo) 0'>
@@ -230,7 +257,7 @@
     <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteStatement compileStatement(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory)'>
+    <item name='android.database.sqlite.SQLiteOpenHelper void onUpgrade(android.database.sqlite.SQLiteDatabase, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.database.sqlite.SQLiteConnectionPool void reconfigure(android.database.sqlite.SQLiteDatabaseConfiguration) 0'>
@@ -242,36 +269,15 @@
     <item name='android.database.sqlite.SQLiteDatabase android.database.Cursor queryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteDebug android.database.sqlite.SQLiteDebug.PagerStats getDatabaseInfo()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SQLiteQueryBuilder void appendColumns(java.lang.StringBuilder, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteStatement java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set&lt;java.lang.String&gt;, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase create(android.database.sqlite.SQLiteDatabase.CursorFactory)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.database.sqlite.SQLiteDatabase java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SqliteWrapper void checkSQLiteException(android.content.Context, android.database.sqlite.SQLiteException) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.database.sqlite.SQLiteQueryBuilder java.lang.String buildQuery(java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.database.sqlite.SQLiteSession long executeForLastInsertedRowId(java.lang.String, java.lang.Object[], int, android.os.CancellationSignal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/ddm/annotations.xml b/android-sdk-annotations/android/ddm/annotations.xml
index f7e15d459db..d16cae61aff 100644
--- a/android-sdk-annotations/android/ddm/annotations.xml
+++ b/android-sdk-annotations/android/ddm/annotations.xml
@@ -5,6 +5,9 @@
     <item name='android.ddm.DdmHandleNativeHeap org.apache.harmony.dalvik.ddmc.Chunk handleChunk(org.apache.harmony.dalvik.ddmc.Chunk) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.ddm.DdmHandleHello org.apache.harmony.dalvik.ddmc.Chunk handleChunk(org.apache.harmony.dalvik.ddmc.Chunk)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.ddm.DdmHandleHello org.apache.harmony.dalvik.ddmc.Chunk handleChunk(org.apache.harmony.dalvik.ddmc.Chunk) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -14,10 +17,13 @@
     <item name='android.ddm.DdmHandleViewDebug org.apache.harmony.dalvik.ddmc.Chunk handleChunk(org.apache.harmony.dalvik.ddmc.Chunk) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.ddm.DdmHandleExit org.apache.harmony.dalvik.ddmc.Chunk handleChunk(org.apache.harmony.dalvik.ddmc.Chunk) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.ddm.DdmHandleThread org.apache.harmony.dalvik.ddmc.Chunk handleChunk(org.apache.harmony.dalvik.ddmc.Chunk) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.ddm.DdmHandleHello org.apache.harmony.dalvik.ddmc.Chunk handleChunk(org.apache.harmony.dalvik.ddmc.Chunk)'>
+    <item name='android.ddm.DdmHandleAppName org.apache.harmony.dalvik.ddmc.Chunk handleChunk(org.apache.harmony.dalvik.ddmc.Chunk) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/drm/annotations.xml b/android-sdk-annotations/android/drm/annotations.xml
index 4b7f52727ce..ec25b30b417 100644
--- a/android-sdk-annotations/android/drm/annotations.xml
+++ b/android-sdk-annotations/android/drm/annotations.xml
@@ -14,13 +14,13 @@
     <item name='android.drm.DrmRights DrmRights(java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.drm.DrmUtils android.drm.DrmUtils.ExtendedMetadataParser getExtendedMetadataParser(byte[])'>
+    <item name='android.drm.DrmManagerClient java.lang.String[] getAvailableDrmEngines()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.drm.DrmManagerClient int acquireRights(android.drm.DrmInfoRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.drm.DrmManagerClient java.lang.String[] getAvailableDrmEngines()'>
+    <item name='android.drm.DrmUtils android.drm.DrmUtils.ExtendedMetadataParser getExtendedMetadataParser(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.drm.DrmManagerClient android.drm.DrmConvertedStatus convertData(int, byte[]) 1'>
@@ -38,15 +38,15 @@
     <item name='android.drm.DrmUtils android.drm.DrmUtils.ExtendedMetadataParser getExtendedMetadataParser(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.drm.DrmSupportInfo java.util.Iterator&lt;java.lang.String&gt; getMimeTypeIterator()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.drm.DrmRights DrmRights(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.drm.DrmManagerClient android.content.ContentValues getConstraints(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.drm.DrmSupportInfo java.util.Iterator&lt;java.lang.String&gt; getMimeTypeIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.drm.DrmManagerClient int checkRightsStatus(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/drm/mobile1/annotations.xml b/android-sdk-annotations/android/drm/mobile1/annotations.xml
index 0bc9434820f..12e7369e948 100644
--- a/android-sdk-annotations/android/drm/mobile1/annotations.xml
+++ b/android-sdk-annotations/android/drm/mobile1/annotations.xml
@@ -1,8 +1,8 @@
 <root>
-    <item name='android.drm.mobile1.DrmRawContent java.io.InputStream getContentInputStream(android.drm.mobile1.DrmRights)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.drm.mobile1.DrmRawContent DrmRawContent(java.io.InputStream, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.drm.mobile1.DrmRawContent java.io.InputStream getContentInputStream(android.drm.mobile1.DrmRights)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/filterfw/core/annotations.xml b/android-sdk-annotations/android/filterfw/core/annotations.xml
index 022e367cdd7..aa360e205f7 100644
--- a/android-sdk-annotations/android/filterfw/core/annotations.xml
+++ b/android-sdk-annotations/android/filterfw/core/annotations.xml
@@ -1,29 +1,29 @@
 <root>
-    <item name='android.filterfw.core.FrameFormat java.lang.String metaDataToString(android.filterfw.core.KeyValueMap)'>
+    <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame newFrame(android.filterfw.core.FrameFormat) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame newFrame(android.filterfw.core.FrameFormat) 0'>
+    <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame newFrame(android.filterfw.core.FrameFormat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.NativeFrame java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.GLFrame void setData(java.nio.ByteBuffer, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.ProgramPort java.lang.String toString()'>
+    <item name='android.filterfw.core.Program void process(android.filterfw.core.Frame[], android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FrameFormat java.lang.String dimensionsToString(int[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.core.FinalPort java.lang.String toString()'>
+    <item name='android.filterfw.core.Filter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.NativeFrame void setInts(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.VertexFrame java.lang.String toString()'>
+    <item name='android.filterfw.core.NativeFrame void setDataFromFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.NativeFrame void setDataFromFrame(android.filterfw.core.Frame) 0'>
+    <item name='android.filterfw.core.NativeProgram void process(android.filterfw.core.Frame[], android.filterfw.core.Frame) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.VertexFrame void setDataFromFrame(android.filterfw.core.Frame) 0'>
@@ -35,6 +35,9 @@
     <item name='android.filterfw.core.NativeFrame void setFloats(float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.GLFrame java.nio.ByteBuffer getData()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame releaseFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -44,16 +47,22 @@
     <item name='android.filterfw.core.StreamPort void pushFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FrameFormat int readTargetString(java.lang.String) 0'>
+    <item name='android.filterfw.core.OutputPort java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.ShaderProgram android.filterfw.core.ShaderProgram createIdentity(android.filterfw.core.FilterContext)'>
+    <item name='android.filterfw.core.FinalPort java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameFormat int readTargetString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.Filter void addFieldPort(java.lang.String, java.lang.reflect.Field, boolean, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FilterFactory android.filterfw.core.Filter createFilterByClassName(java.lang.String, java.lang.String)'>
+    <item name='android.filterfw.core.Frame void setInts(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.KeyValueMap java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.FieldPort void setFieldFrame(android.filterfw.core.Frame, boolean) 0'>
@@ -65,37 +74,43 @@
     <item name='android.filterfw.core.Filter void pushOutput(java.lang.String, android.filterfw.core.Frame) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.Filter android.filterfw.core.InputPort getInputPort(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame duplicateFrameToTarget(android.filterfw.core.Frame, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame retainFrame(android.filterfw.core.Frame)'>
+    <item name='android.filterfw.core.Program void setHostValue(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.ShaderProgram void setTargetRegion(android.filterfw.geometry.Quad) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FilterFactory android.filterfw.core.Filter createFilterByClass(java.lang.Class, java.lang.String) 0'>
+    <item name='android.filterfw.core.NativeBuffer android.filterfw.core.NativeBuffer retain()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.ShaderProgram void process(android.filterfw.core.Frame[], android.filterfw.core.Frame) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.ProgramPort java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FilterFactory android.filterfw.core.Filter createFilterByClass(java.lang.Class, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.StreamPort void setFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.KeyValueMap java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.core.SimpleFrame java.lang.String toString()'>
+    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame newBoundFrame(android.filterfw.core.FrameFormat, int, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame retainFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.Filter java.lang.String getFilterClassName()'>
+    <item name='android.filterfw.core.StreamPort void assignFrame(android.filterfw.core.Frame, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.StreamPort void assignFrame(android.filterfw.core.Frame, boolean) 0'>
+    <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame newBoundFrame(android.filterfw.core.FrameFormat, int, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.SyncRunner SyncRunner(android.filterfw.core.FilterContext, android.filterfw.core.FilterGraph, java.lang.Class) 2'>
@@ -104,46 +119,67 @@
     <item name='android.filterfw.core.Frame android.graphics.Bitmap convertBitmapToRGBA(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FilterFactory android.filterfw.core.Filter createFilterByClass(java.lang.Class, java.lang.String)'>
+    <item name='android.filterfw.core.Filter android.filterfw.core.OutputPort getOutputPort(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame duplicateFrameToTarget(android.filterfw.core.Frame, int)'>
+    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame newFrame(android.filterfw.core.FrameFormat) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.SerializedFrame java.lang.String toString()'>
+    <item name='android.filterfw.core.NativeFrame android.graphics.Bitmap getBitmap()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.SimpleFrame void setInts(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.VertexFrame void setInts(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame retainFrame(android.filterfw.core.Frame)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FieldPort java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.AsyncRunner void setGraph(android.filterfw.core.FilterGraph) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.FilterContext void setFrameManager(android.filterfw.core.FrameManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.Frame void reset(android.filterfw.core.FrameFormat) 0'>
+    <item name='android.filterfw.core.FrameFormat java.lang.String dimensionsToString(int[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame releaseFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.Frame void reset(android.filterfw.core.FrameFormat) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.GLEnvironment int registerSurfaceTexture(android.graphics.SurfaceTexture, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.FinalPort void setFieldFrame(android.filterfw.core.Frame, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.Filter android.filterfw.core.OutputPort getOutputPort(java.lang.String)'>
+    <item name='android.filterfw.core.GLFrame void setFloats(float[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameFormat java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.Filter void addProgramPort(java.lang.String, java.lang.String, java.lang.reflect.Field, java.lang.Class, boolean) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame retainFrame(android.filterfw.core.Frame)'>
+    <item name='android.filterfw.core.OutputPort void setFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.OutputPort java.lang.String toString()'>
+    <item name='android.filterfw.core.FrameFormat java.lang.String baseTypeToString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.SerializedFrame void setBitmap(android.graphics.Bitmap) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.OutputPort void pushFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame newBoundFrame(android.filterfw.core.FrameFormat, int, long) 0'>
@@ -155,31 +191,49 @@
     <item name='android.filterfw.core.ShaderProgram void setSourceRegion(android.filterfw.geometry.Quad) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.Frame android.graphics.Bitmap convertBitmapToRGBA(android.graphics.Bitmap)'>
+    <item name='android.filterfw.core.Filter void open(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.KeyValueMap android.filterfw.core.KeyValueMap fromKeyValues(java.lang.Object...)'>
+    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame retainFrame(android.filterfw.core.Frame)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame releaseFrame(android.filterfw.core.Frame) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame retainFrame(android.filterfw.core.Frame) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.Frame void setFloats(float[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.Filter void prepare(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.NativeProgram void process(android.filterfw.core.Frame[], android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.FilterPort java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.Filter void addProgramPort(java.lang.String, java.lang.String, java.lang.reflect.Field, java.lang.Class, boolean) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FrameFormat java.lang.String targetToString(int)'>
+    <item name='android.filterfw.core.VertexFrame void setFloats(float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.Frame void setDataFromFrame(android.filterfw.core.Frame) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame newBoundFrame(android.filterfw.core.FrameFormat, int, long)'>
+    <item name='android.filterfw.core.SimpleFrame java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.SimpleFrame void setData(java.nio.ByteBuffer, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FrameFormat java.lang.String baseTypeToString(int)'>
+    <item name='android.filterfw.core.Frame void setDataFromFrame(android.filterfw.core.Frame) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame newFrame(android.filterfw.core.FrameFormat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.SerializedFrame void setInts(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.SerializedFrame void setData(java.nio.ByteBuffer, int, int) 0'>
@@ -188,46 +242,91 @@
     <item name='android.filterfw.core.FilterSurfaceView FilterSurfaceView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame duplicateFrame(android.filterfw.core.Frame)'>
+    <item name='android.filterfw.core.FrameFormat android.filterfw.core.MutableFrameFormat mutableCopy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.NativeBuffer android.filterfw.core.NativeBuffer retain()'>
+    <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame newBoundFrame(android.filterfw.core.FrameFormat, int, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameFormat android.filterfw.core.FrameFormat unspecified()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.GLFrame void setViewport(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.GLFrame java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame duplicateFrame(android.filterfw.core.Frame)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.NativeProgram void setHostValue(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.FilterSurfaceView void surfaceChanged(android.view.SurfaceHolder, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameFormat java.lang.String targetToString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.FieldPort void pushFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.VertexFrame void setData(java.nio.ByteBuffer, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.GLFrame java.lang.Object getObjectValue()'>
+    <item name='android.filterfw.core.VertexFrame void setBitmap(android.graphics.Bitmap) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.GLFrame void setInts(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.SerializedFrame void setGenericObjectValue(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.ShaderProgram android.filterfw.core.ShaderProgram createIdentity(android.filterfw.core.FilterContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.ShaderProgram void setHostValue(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FilterPort void pushFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.FrameFormat boolean mayBeCompatibleWith(android.filterfw.core.FrameFormat) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.Filter java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.core.Filter android.filterfw.core.InputPort getInputPort(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.core.FrameFormat android.filterfw.core.MutableFrameFormat mutableCopy()'>
+    <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame newBoundFrame(android.filterfw.core.FrameFormat, int, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.NativeFrame void setData(java.nio.ByteBuffer, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.VertexFrame java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.Frame void setBitmap(android.graphics.Bitmap) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameFormat java.lang.String metaDataToString(android.filterfw.core.KeyValueMap)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame retainFrame(android.filterfw.core.Frame)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.Filter java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.Frame void setGenericObjectValue(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.GLFrame void setBitmap(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.NativeFrame android.graphics.Bitmap getBitmap()'>
+    <item name='android.filterfw.core.FilterFactory android.filterfw.core.Filter createFilterByClassName(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame newBoundFrame(android.filterfw.core.FrameFormat, int, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.KeyValueMap void setKeyValues(java.lang.Object...) 0'>
@@ -239,28 +338,49 @@
     <item name='android.filterfw.core.NativeFrame void setBitmap(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.FilterFactory android.filterfw.core.Filter createFilterByClass(java.lang.Class, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.StreamPort java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.SyncRunner void processFilterNode(android.filterfw.core.Filter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FilterPort void checkFrameManager(android.filterfw.core.Frame, android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame newFrame(android.filterfw.core.FrameFormat) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.ShaderProgram void process(android.filterfw.core.Frame[], android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.FilterPort void checkFrameManager(android.filterfw.core.Frame, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.Frame void setData(java.nio.ByteBuffer, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame retainFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FieldPort void setFrame(android.filterfw.core.Frame) 0'>
+    <item name='android.filterfw.core.FilterSurfaceView void surfaceCreated(android.view.SurfaceHolder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.SimpleFrame void setFloats(float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.FieldPort void setFrame(android.filterfw.core.Frame) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.Filter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame newFrame(android.filterfw.core.FrameFormat)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FieldPort java.lang.String toString()'>
+    <item name='android.filterfw.core.Filter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.SerializedFrame java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.FilterContext void storeFrame(java.lang.String, android.filterfw.core.Frame) 1'>
@@ -269,31 +389,31 @@
     <item name='android.filterfw.core.KeyValueMap android.filterfw.core.KeyValueMap fromKeyValues(java.lang.Object...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FilterSurfaceView void bindToListener(android.view.SurfaceHolder.Callback, android.filterfw.core.GLEnvironment) 0'>
+    <item name='android.filterfw.core.Program void process(android.filterfw.core.Frame[], android.filterfw.core.Frame) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.GLFrame java.nio.ByteBuffer getData()'>
+    <item name='android.filterfw.core.KeyValueMap android.filterfw.core.KeyValueMap fromKeyValues(java.lang.Object...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.SerializedFrame void setFloats(float[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.FilterSurfaceView void bindToListener(android.view.SurfaceHolder.Callback, android.filterfw.core.GLEnvironment) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.GLFrame void setDataFromFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.StreamPort java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterfw.core.FilterSurfaceView FilterSurfaceView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.CachedFrameManager android.filterfw.core.Frame newFrame(android.filterfw.core.FrameFormat)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterfw.core.Frame void setData(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.FilterFunction android.filterfw.core.Frame execute(android.filterfw.core.KeyValueMap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.SimpleFrameManager android.filterfw.core.Frame newBoundFrame(android.filterfw.core.FrameFormat, int, long)'>
+    <item name='android.filterfw.core.FilterPort void setFrame(android.filterfw.core.Frame) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.FilterGraph void connect(android.filterfw.core.Filter, java.lang.String, android.filterfw.core.Filter, java.lang.String) 2'>
@@ -302,31 +422,22 @@
     <item name='android.filterfw.core.Filter void initWithValueMap(android.filterfw.core.KeyValueMap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.Filter void initWithAssignmentList(java.lang.Object...) 0'>
+    <item name='android.filterfw.core.Filter java.lang.String getFilterClassName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.NativeFrame java.lang.String toString()'>
+    <item name='android.filterfw.core.Filter void initWithAssignmentList(java.lang.Object...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.Frame void setData(java.nio.ByteBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.GLFrame java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.core.FilterPort java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterfw.core.GLFrame void reset(android.filterfw.core.FrameFormat) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.FrameFormat java.lang.String toString()'>
+    <item name='android.filterfw.core.FrameManager android.filterfw.core.Frame duplicateFrameToTarget(android.filterfw.core.Frame, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.NativeBuffer android.filterfw.core.NativeBuffer mutableCopy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.core.FrameFormat android.filterfw.core.FrameFormat unspecified()'>
+    <item name='android.filterfw.core.Frame android.graphics.Bitmap convertBitmapToRGBA(android.graphics.Bitmap)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.FrameFormat boolean isCompatibleWith(android.filterfw.core.FrameFormat) 0'>
@@ -335,10 +446,16 @@
     <item name='android.filterfw.core.FilterSurfaceView FilterSurfaceView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.core.Frame void setFormat(android.filterfw.core.FrameFormat) 0'>
+    <item name='android.filterfw.core.NativeBuffer android.filterfw.core.NativeBuffer mutableCopy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.core.SimpleFrame void setBitmap(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.core.Frame void setFormat(android.filterfw.core.FrameFormat) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.core.GLFrame java.lang.Object getObjectValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/filterfw/format/annotations.xml b/android-sdk-annotations/android/filterfw/format/annotations.xml
index 7965dddf389..2705b3f3442 100644
--- a/android-sdk-annotations/android/filterfw/format/annotations.xml
+++ b/android-sdk-annotations/android/filterfw/format/annotations.xml
@@ -1,62 +1,62 @@
 <root>
-    <item name='android.filterfw.format.ImageFormat android.filterfw.core.MutableFrameFormat create(int, int, int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.format.ImageFormat android.filterfw.core.MutableFrameFormat create(int, int)'>
+    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createByteFormat(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createInt16Format(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createDoubleFormat(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromObject(java.lang.Object, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.format.ImageFormat android.filterfw.core.MutableFrameFormat create(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createInt32Format(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createInt32Format(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createDoubleFormat(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.format.ImageFormat android.filterfw.core.MutableFrameFormat create(int, int, int, int)'>
+    <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromClass(java.lang.Class, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromObject(java.lang.Object, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createByteFormat(int, int)'>
+    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createInt32Format(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromClass(java.lang.Class, int) 0'>
+    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createDoubleFormat(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createInt32Format(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createFloatFormat(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createFloatFormat(int, int)'>
+    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createDoubleFormat(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromClass(java.lang.Class, int)'>
+    <item name='android.filterfw.format.ImageFormat android.filterfw.core.MutableFrameFormat create(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createByteFormat(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromClass(java.lang.Class, int, int) 0'>
+    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createInt16Format(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createInt16Format(int, int)'>
+    <item name='android.filterfw.format.ImageFormat android.filterfw.core.MutableFrameFormat create(int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromClass(java.lang.Class, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromObject(java.lang.Object, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.format.ImageFormat android.filterfw.core.MutableFrameFormat create(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.format.ImageFormat android.filterfw.core.MutableFrameFormat create(int, int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromClass(java.lang.Class, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.format.ObjectFormat android.filterfw.core.MutableFrameFormat fromClass(java.lang.Class, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.format.PrimitiveFormat android.filterfw.core.MutableFrameFormat createFloatFormat(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/filterfw/geometry/annotations.xml b/android-sdk-annotations/android/filterfw/geometry/annotations.xml
index e422f0a01c9..549f8a8573c 100644
--- a/android-sdk-annotations/android/filterfw/geometry/annotations.xml
+++ b/android-sdk-annotations/android/filterfw/geometry/annotations.xml
@@ -1,44 +1,53 @@
 <root>
+    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle scaled(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point rotatedAround(android.filterfw.geometry.Point, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point minus(android.filterfw.geometry.Point)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Rectangle boundingBox()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point plus(float, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point rotatedAround(android.filterfw.geometry.Point, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle fromCenterVerticalAxis(android.filterfw.geometry.Point, android.filterfw.geometry.Point, android.filterfw.geometry.Point) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point plus(android.filterfw.geometry.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point normalize()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterfw.geometry.Point float distanceTo(android.filterfw.geometry.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Quad scaled(float, float)'>
+    <item name='android.filterfw.geometry.Point java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle fromRotatedRect(android.filterfw.geometry.Point, android.filterfw.geometry.Point, float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point plus(float, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point times(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle scaled(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Quad scaled(float)'>
+    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point plus(android.filterfw.geometry.Point)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Quad translated(android.filterfw.geometry.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point rotatedAround(android.filterfw.geometry.Point, float)'>
+    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle scaled(float, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle scaled(float, float)'>
+    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle fromCenterVerticalAxis(android.filterfw.geometry.Point, android.filterfw.geometry.Point, android.filterfw.geometry.Point)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point mult(float, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Quad translated(float, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point rotated90(int)'>
@@ -50,64 +59,55 @@
     <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point minus(android.filterfw.geometry.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Quad translated(android.filterfw.geometry.Point)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.geometry.Rectangle Rectangle(android.filterfw.geometry.Point, android.filterfw.geometry.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle fromRotatedRect(android.filterfw.geometry.Point, android.filterfw.geometry.Point, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point scaledTo(float)'>
+    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point normalize()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point mult(float, float)'>
+    <item name='android.filterfw.geometry.Quad java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point minus(float, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point times(float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle fromCenterVerticalAxis(android.filterfw.geometry.Point, android.filterfw.geometry.Point, android.filterfw.geometry.Point) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Quad scaled(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle fromRotatedRect(android.filterfw.geometry.Point, android.filterfw.geometry.Point, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle fromCenterVerticalAxis(android.filterfw.geometry.Point, android.filterfw.geometry.Point, android.filterfw.geometry.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point minus(android.filterfw.geometry.Point)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Rectangle boundingBox()'>
+    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Quad scaled(float, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point rotated(float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Quad translated(android.filterfw.geometry.Point)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Quad translated(float, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point plus(android.filterfw.geometry.Point)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Quad java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Point java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Quad scaled(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Rectangle fromCenterVerticalAxis(android.filterfw.geometry.Point, android.filterfw.geometry.Point, android.filterfw.geometry.Point)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Quad scaled(float, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Point center()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point minus(float, float)'>
+    <item name='android.filterfw.geometry.Point android.filterfw.geometry.Point scaledTo(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.geometry.Quad android.filterfw.geometry.Quad scaled(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.geometry.Rectangle android.filterfw.geometry.Quad scaled(float, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/filterfw/io/annotations.xml b/android-sdk-annotations/android/filterfw/io/annotations.xml
index 0e5cec29c8b..a34f6043ff0 100644
--- a/android-sdk-annotations/android/filterfw/io/annotations.xml
+++ b/android-sdk-annotations/android/filterfw/io/annotations.xml
@@ -1,5 +1,11 @@
 <root>
-    <item name='android.filterfw.io.TextGraphReader android.filterfw.core.KeyValueMap readKeyValueAssignments(java.lang.String)'>
+    <item name='android.filterfw.io.PatternScanner java.lang.String unexpectedTokenMessage(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.io.GraphReader android.filterfw.core.FilterGraph readGraphString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterfw.io.GraphReader android.filterfw.core.KeyValueMap readKeyValueAssignments(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.io.PatternScanner java.lang.String tryEat(java.util.regex.Pattern) 0'>
@@ -8,22 +14,22 @@
     <item name='android.filterfw.io.PatternScanner boolean peek(java.util.regex.Pattern) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterfw.io.TextGraphReader android.filterfw.core.FilterGraph readGraphString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterfw.io.GraphReader android.filterfw.core.FilterGraph readGraphResource(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.io.GraphReader void addReferencesByKeysAndValues(java.lang.Object...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.io.TextGraphReader android.filterfw.core.FilterGraph readGraphString(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterfw.io.PatternScanner java.lang.String eat(java.util.regex.Pattern, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.io.PatternScanner java.lang.String eat(java.util.regex.Pattern, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterfw.io.PatternScanner java.lang.String unexpectedTokenMessage(java.lang.String)'>
+    <item name='android.filterfw.io.TextGraphReader android.filterfw.core.KeyValueMap readKeyValueAssignments(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterfw.io.PatternScanner void skip(java.util.regex.Pattern) 0'>
diff --git a/android-sdk-annotations/android/filterpacks/base/annotations.xml b/android-sdk-annotations/android/filterpacks/base/annotations.xml
index 07ac428bfdb..6f9a0c710b8 100644
--- a/android-sdk-annotations/android/filterpacks/base/annotations.xml
+++ b/android-sdk-annotations/android/filterpacks/base/annotations.xml
@@ -1,5 +1,5 @@
 <root>
-    <item name='android.filterpacks.base.RetargetFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+    <item name='android.filterpacks.base.FrameBranch android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.base.InputStreamSource void process(android.filterfw.core.FilterContext) 0'>
@@ -8,19 +8,49 @@
     <item name='android.filterpacks.base.ObjectSource void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.base.FrameBranch void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.base.RetargetFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.base.GLTextureTarget void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.base.RetargetFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.base.FrameSource void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.base.OutputStreamTarget void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.base.RetargetFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.base.CallbackFilter void prepare(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.base.NullFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.base.CallbackFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.base.GLTextureSource void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.base.FrameFetch void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.base.FrameStore void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.base.ObjectSource void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.base.GLTextureSource void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/filterpacks/imageproc/annotations.xml b/android-sdk-annotations/android/filterpacks/imageproc/annotations.xml
index 270557e567b..48dcd9e4773 100644
--- a/android-sdk-annotations/android/filterpacks/imageproc/annotations.xml
+++ b/android-sdk-annotations/android/filterpacks/imageproc/annotations.xml
@@ -1,17 +1,20 @@
 <root>
+    <item name='android.filterpacks.imageproc.FlipFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.imageproc.ResizeFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.ImageSlicer void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.ToPackedGrayFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+    <item name='android.filterpacks.imageproc.SimpleImageFilter android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.DrawRectFilter void process(android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterpacks.imageproc.BlackWhiteFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.ToRGBFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+    <item name='android.filterpacks.imageproc.DrawRectFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.TintFilter void process(android.filterfw.core.FilterContext) 0'>
@@ -26,75 +29,78 @@
     <item name='android.filterpacks.imageproc.FillLightFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.ToRGBFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterpacks.imageproc.ToRGBAFilter android.filterfw.core.FrameFormat getConvertedFormat(android.filterfw.core.FrameFormat) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.ToGrayFilter android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
+    <item name='android.filterpacks.imageproc.DrawOverlayFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.CropFilter void createProgram(android.filterfw.core.FilterContext, android.filterfw.core.FrameFormat) 1'>
+    <item name='android.filterpacks.imageproc.Invert android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ResizeFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.DrawOverlayFilter void prepare(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.VignetteFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.StraightenFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.CropFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.ToPackedGrayFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+    <item name='android.filterpacks.imageproc.BrightnessFilter android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.BitmapSource void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterpacks.imageproc.BrightnessFilter android.filterfw.core.Program getNativeProgram(android.filterfw.core.FilterContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterpacks.imageproc.ResizeFilter void createProgram(android.filterfw.core.FilterContext, android.filterfw.core.FrameFormat) 1'>
+    <item name='android.filterpacks.imageproc.RotateFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.ColorTemperatureFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.ContrastFilter android.filterfw.core.Program getNativeProgram(android.filterfw.core.FilterContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterpacks.imageproc.CrossProcessFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.NegativeFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.imageproc.GrainFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.FixedRotationFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.SharpenFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.imageproc.FisheyeFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.imageproc.SaturateFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.LomoishFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.VignetteFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.imageproc.ToRGBAFilter android.filterfw.core.FrameFormat getConvertedFormat(android.filterfw.core.FrameFormat)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.StraightenFilter void process(android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterpacks.imageproc.Invert android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterpacks.imageproc.DuotoneFilter void process(android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterpacks.imageproc.BitmapSource void loadImage(android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterpacks.imageproc.TintFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.FlipFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.BrightnessFilter android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterpacks.imageproc.SimpleImageFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.RedEyeFilter void process(android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterpacks.imageproc.AutoFixFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -104,46 +110,40 @@
     <item name='android.filterpacks.imageproc.CropRectFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.CropFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+    <item name='android.filterpacks.imageproc.AutoFixFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.SepiaFilter void process(android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterpacks.imageproc.ToPackedGrayFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.PosterizeFilter void process(android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterpacks.imageproc.ImageCombineFilter android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.VignetteFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.BlackWhiteFilter void process(android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterpacks.imageproc.DrawRectFilter void prepare(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.BitmapOverlayFilter void process(android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterpacks.imageproc.DocumentaryFilter void process(android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterpacks.imageproc.GrainFilter void process(android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterpacks.imageproc.ToRGBFilter void createProgram(android.filterfw.core.FilterContext, android.filterfw.core.FrameFormat) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.filterpacks.imageproc.SharpenFilter void process(android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterpacks.imageproc.RedEyeFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.BlendFilter android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.AutoFixFilter void prepare(android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterpacks.imageproc.GrainFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.SepiaFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ColorTemperatureFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.AlphaBlendFilter android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.ToRGBFilter android.filterfw.core.FrameFormat getConvertedFormat(android.filterfw.core.FrameFormat)'>
+    <item name='android.filterpacks.imageproc.RedEyeFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.ToRGBAFilter void createProgram(android.filterfw.core.FilterContext, android.filterfw.core.FrameFormat) 1'>
@@ -152,34 +152,193 @@
     <item name='android.filterpacks.imageproc.ImageCombineFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.ToPackedGrayFilter void process(android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterpacks.imageproc.PosterizeFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ImageStitcher android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.LomoishFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.Invert android.filterfw.core.Program getNativeProgram(android.filterfw.core.FilterContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterpacks.imageproc.DrawOverlayFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.RotateFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.ToRGBAFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+    <item name='android.filterpacks.imageproc.FisheyeFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.SharpenFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.CropFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.imageproc.SaturateFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.FisheyeFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.SimpleImageFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.SaturateFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ToRGBAFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.DrawRectFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.FillLightFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ImageSlicer android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.AutoFixFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ImageEncoder void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.TintFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ToRGBFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.CrossProcessFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ContrastFilter android.filterfw.core.Program getNativeProgram(android.filterfw.core.FilterContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ToRGBFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.CropFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.DocumentaryFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.CropFilter void createProgram(android.filterfw.core.FilterContext, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ToPackedGrayFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.BitmapSource void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ResizeFilter void createProgram(android.filterfw.core.FilterContext, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.FixedRotationFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.SimpleImageFilter android.filterfw.core.Program getNativeProgram(android.filterfw.core.FilterContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.BitmapOverlayFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.StraightenFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.BitmapSource void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.DuotoneFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.Invert android.filterfw.core.Program getNativeProgram(android.filterfw.core.FilterContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.BitmapSource void loadImage(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ToGrayFilter android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.RedEyeFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ColorTemperatureFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.SepiaFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.DuotoneFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ImageCombineFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.CropRectFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.PosterizeFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.NegativeFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.imageproc.ContrastFilter android.filterfw.core.Program getShaderProgram(android.filterfw.core.FilterContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.imageproc.SaturateFilter void process(android.filterfw.core.FilterContext) 0'>
+    <item name='android.filterpacks.imageproc.BlackWhiteFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ToRGBFilter android.filterfw.core.FrameFormat getConvertedFormat(android.filterfw.core.FrameFormat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.GrainFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.BitmapOverlayFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.DocumentaryFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.FlipFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ToRGBFilter void createProgram(android.filterfw.core.FilterContext, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.SharpenFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.FillLightFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.AutoFixFilter void prepare(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ToPackedGrayFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.BrightnessFilter android.filterfw.core.Program getNativeProgram(android.filterfw.core.FilterContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ToPackedGrayFilter void prepare(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.imageproc.ImageStitcher void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.imageproc.ToRGBAFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.imageproc.BlackWhiteFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/filterpacks/numeric/annotations.xml b/android-sdk-annotations/android/filterpacks/numeric/annotations.xml
index 8b4892e9fa0..ca2ab36f42e 100644
--- a/android-sdk-annotations/android/filterpacks/numeric/annotations.xml
+++ b/android-sdk-annotations/android/filterpacks/numeric/annotations.xml
@@ -2,4 +2,7 @@
     <item name='android.filterpacks.numeric.SinWaveFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.numeric.SinWaveFilter void open(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/filterpacks/performance/annotations.xml b/android-sdk-annotations/android/filterpacks/performance/annotations.xml
index 64a7288d320..d212f9da45d 100644
--- a/android-sdk-annotations/android/filterpacks/performance/annotations.xml
+++ b/android-sdk-annotations/android/filterpacks/performance/annotations.xml
@@ -2,4 +2,13 @@
     <item name='android.filterpacks.performance.Throughput java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.performance.ThroughputFilter void open(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.performance.ThroughputFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.performance.ThroughputFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/filterpacks/text/annotations.xml b/android-sdk-annotations/android/filterpacks/text/annotations.xml
index cf9c5c7b95b..4c52b7aee28 100644
--- a/android-sdk-annotations/android/filterpacks/text/annotations.xml
+++ b/android-sdk-annotations/android/filterpacks/text/annotations.xml
@@ -5,4 +5,7 @@
     <item name='android.filterpacks.text.StringSource void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.text.StringLogger void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/filterpacks/ui/annotations.xml b/android-sdk-annotations/android/filterpacks/ui/annotations.xml
index b4e625ead3b..35e59e22456 100644
--- a/android-sdk-annotations/android/filterpacks/ui/annotations.xml
+++ b/android-sdk-annotations/android/filterpacks/ui/annotations.xml
@@ -1,11 +1,32 @@
 <root>
+    <item name='android.filterpacks.ui.SurfaceRenderFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.ui.SurfaceTargetFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.ui.SurfaceRenderFilter void prepare(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.ui.SurfaceRenderFilter void open(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.ui.SurfaceRenderFilter void surfaceCreated(android.view.SurfaceHolder) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.ui.SurfaceTargetFilter void open(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.ui.SurfaceTargetFilter void prepare(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.ui.SurfaceRenderFilter void surfaceChanged(android.view.SurfaceHolder, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.ui.SurfaceRenderFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.ui.SurfaceTargetFilter void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/filterpacks/videoproc/annotations.xml b/android-sdk-annotations/android/filterpacks/videoproc/annotations.xml
index 770bd8ed83f..0ae82fca65b 100644
--- a/android-sdk-annotations/android/filterpacks/videoproc/annotations.xml
+++ b/android-sdk-annotations/android/filterpacks/videoproc/annotations.xml
@@ -1,11 +1,17 @@
 <root>
+    <item name='android.filterpacks.videoproc.BackDropperFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.videoproc.BackDropperFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.videoproc.BackDropperFilter void prepare(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.videoproc.BackDropperFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.videoproc.BackDropperFilter android.filterfw.core.FrameFormat getOutputFormat(java.lang.String, android.filterfw.core.FrameFormat)'>
+    <item name='android.filterpacks.videoproc.BackDropperFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/filterpacks/videosink/annotations.xml b/android-sdk-annotations/android/filterpacks/videosink/annotations.xml
index 8ecb768ad94..c9f5e5a8894 100644
--- a/android-sdk-annotations/android/filterpacks/videosink/annotations.xml
+++ b/android-sdk-annotations/android/filterpacks/videosink/annotations.xml
@@ -2,6 +2,12 @@
     <item name='android.filterpacks.videosink.MediaEncoderFilter void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.videosink.MediaEncoderFilter void open(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosink.MediaEncoderFilter void prepare(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.videosink.MediaEncoderFilter void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/filterpacks/videosrc/annotations.xml b/android-sdk-annotations/android/filterpacks/videosrc/annotations.xml
index fb2822c7027..c3bef76891b 100644
--- a/android-sdk-annotations/android/filterpacks/videosrc/annotations.xml
+++ b/android-sdk-annotations/android/filterpacks/videosrc/annotations.xml
@@ -2,30 +2,51 @@
     <item name='android.filterpacks.videosrc.SurfaceTextureSource void prepare(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.videosrc.CameraSource void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterpacks.videosrc.MediaSource void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.videosrc.CameraSource void setCameraParameters(android.hardware.Camera.Parameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.filterpacks.videosrc.MediaSource void prepare(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosrc.SurfaceTextureSource void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosrc.CameraSource void prepare(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosrc.SurfaceTextureTarget void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosrc.SurfaceTextureTarget void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosrc.SurfaceTextureTarget void open(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosrc.MediaSource void process(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosrc.SurfaceTextureTarget void prepare(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosrc.CameraSource void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.filterpacks.videosrc.SurfaceTextureSource void open(android.filterfw.core.FilterContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.filterpacks.videosrc.CameraSource void process(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.filterpacks.videosrc.MediaSource void open(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.videosrc.SurfaceTextureTarget void open(android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterpacks.videosrc.SurfaceTextureSource void fieldPortValueUpdated(java.lang.String, android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.filterpacks.videosrc.SurfaceTextureTarget void prepare(android.filterfw.core.FilterContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.filterpacks.videosrc.CameraSource void open(android.filterfw.core.FilterContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/gesture/annotations.xml b/android-sdk-annotations/android/gesture/annotations.xml
index 0b699c833e1..27f1b84699f 100644
--- a/android-sdk-annotations/android/gesture/annotations.xml
+++ b/android-sdk-annotations/android/gesture/annotations.xml
@@ -2,15 +2,21 @@
     <item name='android.gesture.GestureOverlayView void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.Gesture android.graphics.Path toPath(android.graphics.Path, int, int, int, int)'>
+    <item name='android.gesture.GestureStore java.util.Set&lt;java.lang.String&gt; getGestureEntries()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromFile(java.lang.String)'>
+    <item name='android.gesture.Gesture android.graphics.RectF getBoundingBox()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.OrientedBoundingBox android.graphics.Path toPath()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromFile(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.gesture.Gesture java.util.ArrayList&lt;android.gesture.GestureStroke&gt; getStrokes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.gesture.GestureOverlayView GestureOverlayView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,37 +26,34 @@
     <item name='android.gesture.Gesture void addStroke(android.gesture.GestureStroke) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.gesture.Gesture android.graphics.Path toPath(android.graphics.Path)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.gesture.GestureStore void addGesture(java.lang.String, android.gesture.Gesture) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureStore java.util.Set&lt;java.lang.String&gt; getGestureEntries()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.gesture.GestureUtils float[] spatialSampling(android.gesture.Gesture, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromPrivateFile(android.content.Context, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.gesture.GestureUtils float[] spatialSampling(android.gesture.Gesture, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.gesture.Gesture java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureOverlayView android.graphics.Paint getGesturePaint()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.GestureStroke java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.gesture.GestureStore java.util.ArrayList&lt;android.gesture.Prediction&gt; recognize(android.gesture.Gesture) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.gesture.GestureLibrary java.util.ArrayList&lt;android.gesture.Prediction&gt; recognize(android.gesture.Gesture) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.Gesture android.graphics.RectF getBoundingBox()'>
+    <item name='android.gesture.Gesture android.graphics.Path toPath(android.graphics.Path, int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureStroke java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureOverlayView java.util.ArrayList&lt;android.gesture.GesturePoint&gt; getCurrentStroke()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.gesture.GestureLibrary void removeGesture(java.lang.String, android.gesture.Gesture) 1'>
@@ -62,16 +65,10 @@
     <item name='android.gesture.GestureLibrary void addGesture(java.lang.String, android.gesture.Gesture) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureUtils float[] spatialSampling(android.gesture.Gesture, int, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.gesture.GestureOverlayView GestureOverlayView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureOverlayView java.util.ArrayList&lt;android.gesture.GesturePoint&gt; getCurrentStroke()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.GestureStroke android.gesture.OrientedBoundingBox computeOrientedBoundingBox()'>
+    <item name='android.gesture.GestureOverlayView android.graphics.Paint getGesturePaint()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.gesture.GestureUtils float[] spatialSampling(android.gesture.Gesture, int) 0'>
@@ -80,34 +77,64 @@
     <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromPrivateFile(android.content.Context, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.gesture.Gesture android.graphics.Bitmap toBitmap(int, int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.gesture.GestureStore void removeGesture(java.lang.String, android.gesture.Gesture) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureStroke GestureStroke(java.util.ArrayList&lt;android.gesture.GesturePoint&gt;) 0'>
+    <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromFile(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromFile(java.io.File)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.Gesture android.graphics.Path toPath(android.graphics.Path)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.Gesture android.graphics.Path toPath()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.Gesture android.graphics.Bitmap toBitmap(int, int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.Gesture android.graphics.Path toPath(int, int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.GestureOverlayView GestureOverlayView(android.content.Context) 0'>
+    <item name='android.gesture.GestureLibrary java.util.Set&lt;java.lang.String&gt; getGestureEntries()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.gesture.GestureOverlayView android.graphics.Path getGesturePath()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureLibrary java.util.Set&lt;java.lang.String&gt; getGestureEntries()'>
+    <item name='android.gesture.GestureStroke GestureStroke(java.util.ArrayList&lt;android.gesture.GesturePoint&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureUtils android.gesture.OrientedBoundingBox computeOrientedBoundingBox(float[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromRawResource(android.content.Context, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromFile(java.io.File)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.Gesture android.graphics.Path toPath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.Gesture android.graphics.Path toPath(int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.Gesture android.graphics.Bitmap toBitmap(int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureOverlayView android.graphics.Path getGesturePath(android.graphics.Path)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromPrivateFile(android.content.Context, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GesturePoint java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureUtils float[] temporalSampling(android.gesture.GestureStroke, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureUtils android.gesture.OrientedBoundingBox computeOrientedBoundingBox(java.util.ArrayList&lt;android.gesture.GesturePoint&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureUtils float[] spatialSampling(android.gesture.Gesture, int, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureOverlayView GestureOverlayView(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.gesture.GestureStroke android.gesture.OrientedBoundingBox computeOrientedBoundingBox()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.gesture.GestureOverlayView boolean dispatchTouchEvent(android.view.MotionEvent) 0'>
@@ -119,12 +146,6 @@
     <item name='android.gesture.GestureUtils android.gesture.OrientedBoundingBox computeOrientedBoundingBox(java.util.ArrayList&lt;android.gesture.GesturePoint&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureUtils float[] temporalSampling(android.gesture.GestureStroke, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.GestureUtils android.gesture.OrientedBoundingBox computeOrientedBoundingBox(float[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.gesture.GestureUtils float[] temporalSampling(android.gesture.GestureStroke, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -137,34 +158,13 @@
     <item name='android.gesture.GestureStore void save(java.io.OutputStream, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureUtils android.gesture.OrientedBoundingBox computeOrientedBoundingBox(java.util.ArrayList&lt;android.gesture.GesturePoint&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.GesturePoint java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.gesture.GestureStore void save(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.Gesture java.util.ArrayList&lt;android.gesture.GestureStroke&gt; getStrokes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.gesture.GestureStore void load(java.io.InputStream, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.OrientedBoundingBox android.graphics.Path toPath()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.GestureLibraries android.gesture.GestureLibrary fromRawResource(android.content.Context, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.gesture.GestureOverlayView GestureOverlayView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.gesture.GestureOverlayView android.graphics.Path getGesturePath(android.graphics.Path)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.gesture.Gesture android.graphics.Bitmap toBitmap(int, int, int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/graphics/annotations.xml b/android-sdk-annotations/android/graphics/annotations.xml
index e56c238792e..7ba489e81e0 100644
--- a/android-sdk-annotations/android/graphics/annotations.xml
+++ b/android-sdk-annotations/android/graphics/annotations.xml
@@ -2,9 +2,15 @@
     <item name='android.graphics.RadialGradient RadialGradient(float, float, float, int[], float[], android.graphics.Shader.TileMode) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Typeface android.graphics.Typeface createFromFile(java.io.File)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.util.DisplayMetrics, int[], int, int, int, int, android.graphics.Bitmap.Config) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Matrix java.lang.String toShortString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.SweepGradient SweepGradient(float, float, int[], float[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,25 +29,28 @@
     <item name='android.graphics.Path void addRoundRect(android.graphics.RectF, float[], android.graphics.Path.Direction) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Bitmap android.graphics.Bitmap createScaledBitmap(android.graphics.Bitmap, int, int, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.graphics.Bitmap, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Canvas boolean clipRect(android.graphics.RectF, android.graphics.Region.Op) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Interpolator.Result android.graphics.Interpolator.Result valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Color void colorToHSV(int, float[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Bitmap int getScaledWidth(android.util.DisplayMetrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Interpolator android.graphics.Interpolator.Result timeToValues(int, float[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Matrix boolean setConcat(android.graphics.Matrix, android.graphics.Matrix) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Interpolator.Result android.graphics.Interpolator.Result valueOf(java.lang.String)'>
+    <item name='android.graphics.Canvas boolean clipRect(android.graphics.RectF) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Color void RGBToHSV(int, int, int, float[]) 3'>
@@ -53,9 +62,6 @@
     <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.util.DisplayMetrics, int, int, android.graphics.Bitmap.Config) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Paint android.graphics.Paint.FontMetricsInt getFontMetricsInt()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Matrix boolean mapRect(android.graphics.RectF, android.graphics.RectF) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -68,6 +74,9 @@
     <item name='android.graphics.Canvas void drawPosText(java.lang.String, float[], android.graphics.Paint) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Interpolator android.graphics.Interpolator.Result timeToValues(int, float[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.RectF void union(android.graphics.RectF) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,6 +89,9 @@
     <item name='android.graphics.Matrix boolean mapRect(android.graphics.RectF, android.graphics.RectF) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Bitmap.Config android.graphics.Bitmap.Config valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(int[], int, int, android.graphics.Bitmap.Config) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -89,6 +101,12 @@
     <item name='android.graphics.NinePatch void draw(android.graphics.Canvas, android.graphics.RectF) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.TableMaskFilter android.graphics.TableMaskFilter CreateGammaTable(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Rect java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Path void transform(android.graphics.Matrix, android.graphics.Path) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -107,15 +125,9 @@
     <item name='android.graphics.ColorMatrix void setConcat(android.graphics.ColorMatrix, android.graphics.ColorMatrix) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Insets android.graphics.Insets of(android.graphics.Rect)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Canvas void drawPaint(android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Bitmap android.graphics.Bitmap createScaledBitmap(android.graphics.Bitmap, int, int, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Canvas boolean clipRect(android.graphics.Rect, android.graphics.Region.Op) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -170,24 +182,24 @@
     <item name='android.graphics.Region boolean op(android.graphics.Region, android.graphics.Region.Op) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Interpolator android.graphics.Interpolator.Result timeToValues(float[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Matrix boolean setConcat(android.graphics.Matrix, android.graphics.Matrix) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Path void addRect(android.graphics.RectF, android.graphics.Path.Direction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.graphics.Bitmap, int, int, int, int, android.graphics.Matrix, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Paint void setTextAlign(android.graphics.Paint.Align) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Matrix.ScaleToFit android.graphics.Matrix.ScaleToFit valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Canvas void drawRect(android.graphics.Rect, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Rect java.lang.String toShortString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Region boolean op(android.graphics.Rect, android.graphics.Region, android.graphics.Region.Op) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -197,12 +209,24 @@
     <item name='android.graphics.Canvas void drawText(java.lang.String, float, float, android.graphics.Paint) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Picture android.graphics.Picture createFromStream(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Canvas void drawRect(android.graphics.RectF, android.graphics.Paint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Matrix boolean invert(android.graphics.Matrix) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Typeface android.graphics.Typeface create(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Region boolean op(android.graphics.Region, android.graphics.Region.Op) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Canvas void drawPatch(android.graphics.Bitmap, byte[], android.graphics.RectF, android.graphics.Paint) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Paint.Cap android.graphics.Paint.Cap valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -230,15 +254,24 @@
     <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(int[], int, int, android.graphics.Bitmap.Config) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Paint.Style android.graphics.Paint.Style valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.SumPathEffect SumPathEffect(android.graphics.PathEffect, android.graphics.PathEffect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Canvas android.graphics.Matrix getMatrix()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.PorterDuff.Mode android.graphics.PorterDuff.Mode valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Canvas void drawRect(android.graphics.RectF, android.graphics.Paint) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Canvas boolean quickReject(android.graphics.RectF, android.graphics.Canvas.EdgeType) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Canvas boolean clipRect(android.graphics.Rect, android.graphics.Region.Op) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -251,6 +284,9 @@
     <item name='android.graphics.DashPathEffect DashPathEffect(float[], float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Bitmap android.graphics.Bitmap extractAlpha(android.graphics.Paint, int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.util.DisplayMetrics, int[], int, int, android.graphics.Bitmap.Config) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -263,10 +299,10 @@
     <item name='android.graphics.Camera void applyToCanvas(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Paint float measureText(char[], int, int) 0'>
+    <item name='android.graphics.YuvImage YuvImage(byte[], int, int, int, int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.YuvImage YuvImage(byte[], int, int, int, int[]) 0'>
+    <item name='android.graphics.Paint float measureText(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Paint void getTextBounds(char[], int, int, android.graphics.Rect) 0'>
@@ -281,18 +317,18 @@
     <item name='android.graphics.Paint float getTextRunAdvances(java.lang.String, int, int, int, int, int, float[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.graphics.Bitmap, int, int, int, int, android.graphics.Matrix, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.RectF java.lang.String toShortString(java.lang.StringBuilder)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.PointF void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Region android.graphics.Region obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Matrix void mapVectors(float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Canvas android.graphics.Rect getClipBounds()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Rect boolean intersects(android.graphics.Rect, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -305,18 +341,24 @@
     <item name='android.graphics.SurfaceTexture void getTransformMatrix(float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Rect java.lang.String flattenToString()'>
+    <item name='android.graphics.RectF java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Region android.graphics.Rect getBounds()'>
+    <item name='android.graphics.Path.FillType android.graphics.Path.FillType valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Path.Direction android.graphics.Path.Direction valueOf(java.lang.String)'>
+    <item name='android.graphics.Canvas.EdgeType android.graphics.Canvas.EdgeType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Point java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.LinearGradient LinearGradient(float, float, float, float, int[], float[], android.graphics.Shader.TileMode) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.RectF java.lang.String toShortString(java.lang.StringBuilder)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Region boolean setPath(android.graphics.Path, android.graphics.Region) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -332,7 +374,13 @@
     <item name='android.graphics.Canvas void drawVertices(android.graphics.Canvas.VertexMode, int, float[], int, float[], int, int[], int, short[], int, int, android.graphics.Paint) 11'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Paint.Align android.graphics.Paint.Align valueOf(java.lang.String)'>
+    <item name='android.graphics.PathDashPathEffect.Style android.graphics.PathDashPathEffect.Style valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Typeface android.graphics.Typeface create(android.graphics.Typeface, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Typeface android.graphics.Typeface createFromFile(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Canvas void drawText(char[], int, int, float, float, android.graphics.Paint) 0'>
@@ -353,9 +401,6 @@
     <item name='android.graphics.Region boolean setPath(android.graphics.Path, android.graphics.Region) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Bitmap android.graphics.Bitmap extractAlpha()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Paint int getTextWidths(char[], int, int, float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -392,6 +437,9 @@
     <item name='android.graphics.Region boolean union(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.graphics.Bitmap)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Canvas void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -404,6 +452,9 @@
     <item name='android.graphics.Canvas void drawColor(int, android.graphics.PorterDuff.Mode) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Canvas.VertexMode android.graphics.Canvas.VertexMode valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Picture void writeToStream(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -419,6 +470,9 @@
     <item name='android.graphics.Color int HSVToColor(int, float[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.AvoidXfermode.Mode android.graphics.AvoidXfermode.Mode valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.ColorMatrixColorFilter ColorMatrixColorFilter(float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -428,6 +482,9 @@
     <item name='android.graphics.Bitmap boolean compress(android.graphics.Bitmap.CompressFormat, int, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Paint.Join android.graphics.Paint.Join valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.TableMaskFilter TableMaskFilter(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -440,18 +497,6 @@
     <item name='android.graphics.ColorMatrix void set(android.graphics.ColorMatrix) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Typeface android.graphics.Typeface create(android.graphics.Typeface, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.Bitmap.Config android.graphics.Bitmap.Config valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.Typeface android.graphics.Typeface create(java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.Typeface android.graphics.Typeface createFromFile(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Canvas void drawTextRun(char[], int, int, int, int, float, float, int, android.graphics.Paint) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -464,7 +509,7 @@
     <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Matrix java.lang.String toString()'>
+    <item name='android.graphics.Bitmap android.graphics.Bitmap extractAlpha()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Canvas void drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint) 0'>
@@ -494,18 +539,18 @@
     <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.graphics.Bitmap, int, int, int, int, android.graphics.Matrix, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Matrix java.lang.String toShortString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.PorterDuff.Mode android.graphics.PorterDuff.Mode valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Canvas void drawRect(float, float, float, float, android.graphics.Paint) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Region android.graphics.Rect getBounds()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Region boolean quickContains(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Typeface android.graphics.Typeface createFromAsset(android.content.res.AssetManager, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Matrix void mapPoints(float[], float[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -539,10 +584,10 @@
     <item name='android.graphics.Paint float getTextRunAdvances(char[], int, int, int, int, int, float[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Paint.Join android.graphics.Paint.Join valueOf(java.lang.String) 0'>
+    <item name='android.graphics.TemporaryBuffer char[] obtain(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.TableMaskFilter android.graphics.TableMaskFilter CreateGammaTable(float)'>
+    <item name='android.graphics.Paint.Join android.graphics.Paint.Join valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.YuvImage boolean compressToJpeg(android.graphics.Rect, int, java.io.OutputStream) 2'>
@@ -551,7 +596,10 @@
     <item name='android.graphics.Canvas void drawText(char[], int, int, float, float, android.graphics.Paint) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Bitmap.CompressFormat android.graphics.Bitmap.CompressFormat valueOf(java.lang.String)'>
+    <item name='android.graphics.Shader.TileMode android.graphics.Shader.TileMode valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.PointF java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Matrix.ScaleToFit android.graphics.Matrix.ScaleToFit valueOf(java.lang.String) 0'>
@@ -572,15 +620,15 @@
     <item name='android.graphics.Canvas void drawLines(float[], android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Region android.graphics.Region obtain()'>
+    <item name='android.graphics.Rect java.lang.String toShortString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Paint android.graphics.Paint.FontMetrics getFontMetrics()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Matrix boolean preConcat(android.graphics.Matrix) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Canvas android.graphics.Matrix getMatrix()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Canvas boolean clipRect(float, float, float, float, android.graphics.Region.Op) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -593,15 +641,9 @@
     <item name='android.graphics.Canvas boolean quickReject(android.graphics.Path, android.graphics.Canvas.EdgeType) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Paint.FontMetricsInt java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Canvas void drawTextOnPath(java.lang.String, android.graphics.Path, float, float, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.AvoidXfermode.Mode android.graphics.AvoidXfermode.Mode valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Matrix void mapPoints(float[], float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -641,9 +683,15 @@
     <item name='android.graphics.BlurMaskFilter.Blur android.graphics.BlurMaskFilter.Blur valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Matrix.ScaleToFit android.graphics.Matrix.ScaleToFit valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Rect boolean setIntersect(android.graphics.Rect, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Region android.graphics.Path getBoundaryPath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.PointF PointF(android.graphics.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -653,12 +701,6 @@
     <item name='android.graphics.Canvas void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Insets java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.Insets android.graphics.Insets of(int, int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.ComposePathEffect ComposePathEffect(android.graphics.PathEffect, android.graphics.PathEffect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -683,21 +725,24 @@
     <item name='android.graphics.Matrix boolean mapRect(android.graphics.RectF) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Bitmap.CompressFormat android.graphics.Bitmap.CompressFormat valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Rect boolean setIntersect(android.graphics.Rect, android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Canvas void drawPicture(android.graphics.Picture) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.RectF java.lang.String toShortString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.ComposePathEffect ComposePathEffect(android.graphics.PathEffect, android.graphics.PathEffect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Region boolean op(int, int, int, int, android.graphics.Region.Op) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Paint.Align android.graphics.Paint.Align valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Canvas void drawTextRun(java.lang.CharSequence, int, int, int, int, float, float, int, android.graphics.Paint) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -713,10 +758,13 @@
     <item name='android.graphics.BitmapRegionDecoder android.graphics.BitmapRegionDecoder newInstance(java.io.InputStream, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.graphics.Bitmap, int, int, int, int)'>
+    <item name='android.graphics.Color int getHtmlColor(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Color int getHtmlColor(java.lang.String) 0'>
+    <item name='android.graphics.Paint android.graphics.Paint.FontMetricsInt getFontMetricsInt()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Paint.FontMetricsInt java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Color int HSVToColor(float[]) 0'>
@@ -728,9 +776,6 @@
     <item name='android.graphics.Paint int getTextWidths(java.lang.CharSequence, int, int, float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.RectF java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Paint int getTextWidths(java.lang.String, float[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -743,21 +788,18 @@
     <item name='android.graphics.Point void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Paint.Cap android.graphics.Paint.Cap valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Region android.graphics.Region obtain(android.graphics.Region)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Typeface android.graphics.Typeface createFromFile(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Region android.graphics.Path getBoundaryPath()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Canvas void drawPosText(char[], int, int, float[], android.graphics.Paint) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Rect java.lang.String toShortString(java.lang.StringBuilder)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Bitmap void copyPixelsToBuffer(java.nio.Buffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -767,9 +809,6 @@
     <item name='android.graphics.Paint int getTextWidths(java.lang.String, float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.PathDashPathEffect.Style android.graphics.PathDashPathEffect.Style valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.NinePatch void draw(android.graphics.Canvas, android.graphics.Rect, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -779,10 +818,10 @@
     <item name='android.graphics.PorterDuffXfermode PorterDuffXfermode(android.graphics.PorterDuff.Mode) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.PointF void readFromParcel(android.os.Parcel) 0'>
+    <item name='android.graphics.BlurMaskFilter.Blur android.graphics.BlurMaskFilter.Blur valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Bitmap android.graphics.Bitmap extractAlpha(android.graphics.Paint, int[])'>
+    <item name='android.graphics.PointF void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Canvas void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint) 0'>
@@ -791,24 +830,15 @@
     <item name='android.graphics.Canvas void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Rect java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.Picture android.graphics.Picture createFromStream(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Region.Op android.graphics.Region.Op valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Shader.TileMode android.graphics.Shader.TileMode valueOf(java.lang.String)'>
+    <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.graphics.Bitmap, int, int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Rect void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.PointF java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Rect android.graphics.Rect unflattenFromString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -821,6 +851,9 @@
     <item name='android.graphics.Bitmap void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Path.Direction android.graphics.Path.Direction valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Bitmap android.graphics.Bitmap createScaledBitmap(android.graphics.Bitmap, int, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -839,18 +872,9 @@
     <item name='android.graphics.Canvas void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.graphics.Bitmap)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.Typeface android.graphics.Typeface createFromFile(java.io.File)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Paint int getTextWidths(java.lang.CharSequence, int, int, float[]) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.TemporaryBuffer char[] obtain(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.RegionIterator RegionIterator(android.graphics.Region) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -860,6 +884,9 @@
     <item name='android.graphics.Canvas void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Matrix java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Rect void printShortString(java.io.PrintWriter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -875,6 +902,9 @@
     <item name='android.graphics.BitmapFactory android.graphics.Bitmap decodeByteArray(byte[], int, int, android.graphics.BitmapFactory.Options) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Canvas void drawBitmapMesh(android.graphics.Bitmap, int, int, float[], int, int[], int, android.graphics.Paint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Bitmap void copyPixelsFromBuffer(java.nio.Buffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -896,6 +926,12 @@
     <item name='android.graphics.RectF boolean setIntersect(android.graphics.RectF, android.graphics.RectF) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Canvas boolean clipRect(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Canvas void setBitmap(android.graphics.Bitmap) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Canvas boolean clipRegion(android.graphics.Region, android.graphics.Region.Op) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -923,9 +959,15 @@
     <item name='android.graphics.LayerRasterizer void addLayer(android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Canvas void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.NinePatch NinePatch(android.graphics.NinePatch) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Rect java.lang.String flattenToString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.AvoidXfermode AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -947,9 +989,6 @@
     <item name='android.graphics.RectF void printShortString(java.io.PrintWriter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Point java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.BitmapFactory android.graphics.Bitmap decodeByteArray(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -959,10 +998,10 @@
     <item name='android.graphics.Canvas void drawPicture(android.graphics.Picture, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Path.FillType android.graphics.Path.FillType valueOf(java.lang.String)'>
+    <item name='android.graphics.RectF java.lang.String toShortString(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.RectF java.lang.String toShortString(java.lang.StringBuilder) 0'>
+    <item name='android.graphics.ColorMatrix float[] getArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Paint void getTextPath(java.lang.String, int, int, float, float, android.graphics.Path) 5'>
@@ -983,6 +1022,9 @@
     <item name='android.graphics.Bitmap android.graphics.Bitmap createBitmap(android.util.DisplayMetrics, int[], int, int, int, int, android.graphics.Bitmap.Config) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.Canvas void drawPatch(android.graphics.Bitmap, byte[], android.graphics.RectF, android.graphics.Paint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Canvas void drawOval(android.graphics.RectF, android.graphics.Paint) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -992,16 +1034,22 @@
     <item name='android.graphics.RectF void set(android.graphics.RectF) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.RectF java.lang.String toShortString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Insets java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Paint void getTextPath(char[], int, int, float, float, android.graphics.Path) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Path void transform(android.graphics.Matrix) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Typeface android.graphics.Typeface createFromAsset(android.content.res.AssetManager, java.lang.String)'>
+    <item name='android.graphics.Paint void setStrokeCap(android.graphics.Paint.Cap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Paint void setStrokeCap(android.graphics.Paint.Cap) 0'>
+    <item name='android.graphics.Rect java.lang.String toShortString(java.lang.StringBuilder)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Color int parseColor(java.lang.String) 0'>
@@ -1031,15 +1079,15 @@
     <item name='android.graphics.Paint int getTextWidths(java.lang.String, int, int, float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.PorterDuff.Mode android.graphics.PorterDuff.Mode valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Canvas void drawVertices(android.graphics.Canvas.VertexMode, int, float[], int, float[], int, int[], int, short[], int, int, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Bitmap int getScaledWidth(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Paint.Join android.graphics.Paint.Join valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Matrix boolean setPolyToPoly(float[], int, float[], int, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1055,9 +1103,6 @@
     <item name='android.graphics.Paint.Align android.graphics.Paint.Align valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Region.Op android.graphics.Region.Op valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Paint boolean getFillPath(android.graphics.Path, android.graphics.Path) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1067,16 +1112,16 @@
     <item name='android.graphics.Canvas void drawPath(android.graphics.Path, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Paint.Cap android.graphics.Paint.Cap valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Region void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Paint.Style android.graphics.Paint.Style valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.BlurMaskFilter.Blur android.graphics.BlurMaskFilter.Blur valueOf(java.lang.String)'>
+    <item name='android.graphics.Insets android.graphics.Insets of(android.graphics.Rect)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.Region.Op android.graphics.Region.Op valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Interpolator void setKeyFrame(int, int, float[], float[]) 2'>
@@ -1091,43 +1136,34 @@
     <item name='android.graphics.Canvas void drawPath(android.graphics.Path, android.graphics.Paint) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Matrix boolean setPolyToPoly(float[], int, float[], int, int) 0'>
+    <item name='android.graphics.BlurMaskFilter BlurMaskFilter(float, android.graphics.BlurMaskFilter.Blur) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.BlurMaskFilter BlurMaskFilter(float, android.graphics.BlurMaskFilter.Blur) 1'>
+    <item name='android.graphics.Matrix boolean setPolyToPoly(float[], int, float[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Rect void set(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.ColorMatrix float[] getArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.Canvas android.graphics.Rect getClipBounds()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.Canvas void drawPosText(char[], int, int, float[], android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.TemporaryBuffer void recycle(char[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.Canvas boolean clipPath(android.graphics.Path, android.graphics.Region.Op) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.RectF void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.TemporaryBuffer void recycle(char[]) 0'>
+    <item name='android.graphics.Insets android.graphics.Insets of(int, int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.ColorMatrix void preConcat(android.graphics.ColorMatrix) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Canvas.VertexMode android.graphics.Canvas.VertexMode valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.Paint.Style android.graphics.Paint.Style valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.Interpolator android.graphics.Interpolator.Result timeToValues(float[])'>
+    <item name='android.graphics.TableMaskFilter android.graphics.TableMaskFilter CreateClipTable(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.Matrix void mapPoints(float[], int, float[], int, int) 0'>
@@ -1139,18 +1175,9 @@
     <item name='android.graphics.ComposeShader ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Paint android.graphics.Paint.FontMetrics getFontMetrics()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.TableMaskFilter android.graphics.TableMaskFilter CreateClipTable(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.RadialGradient RadialGradient(float, float, float, int[], float[], android.graphics.Shader.TileMode) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.Canvas.EdgeType android.graphics.Canvas.EdgeType valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.RectF boolean intersect(android.graphics.RectF) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/graphics/drawable/annotations.xml b/android-sdk-annotations/android/graphics/drawable/annotations.xml
index b584ef3f4b8..3ab2bee1399 100644
--- a/android-sdk-annotations/android/graphics/drawable/annotations.xml
+++ b/android-sdk-annotations/android/graphics/drawable/annotations.xml
@@ -2,16 +2,16 @@
     <item name='android.graphics.drawable.LayerDrawable LayerDrawable(android.graphics.drawable.Drawable[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.RotateDrawable android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.InsetDrawable boolean onStateChange(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.AnimatedRotateDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.Drawable android.graphics.Rect copyBounds()'>
+    <item name='android.graphics.drawable.RotateDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.RotateDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
+    <item name='android.graphics.drawable.Drawable android.graphics.Rect copyBounds()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.NinePatchDrawable void setTargetDensity(android.graphics.Canvas) 0'>
@@ -26,15 +26,36 @@
     <item name='android.graphics.drawable.AnimatedRotateDrawable boolean getPadding(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.StateListDrawable boolean onStateChange(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.DrawableContainer android.graphics.Insets getOpticalInsets()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.TransitionDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.RotateDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.ColorDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.InsetDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.Drawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.Drawable void setColorFilter(int, android.graphics.PorterDuff.Mode) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.Drawable void onBoundsChange(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.NinePatchDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.ClipDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -44,12 +65,21 @@
     <item name='android.graphics.drawable.ScaleDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.LayerDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.AnimatedRotateDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.LayerDrawable void onBoundsChange(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.RotateDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.GradientDrawable void onBoundsChange(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.TransitionDrawable TransitionDrawable(android.graphics.drawable.Drawable[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -74,9 +104,21 @@
     <item name='android.graphics.drawable.Drawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.Drawable.ConstantState android.graphics.drawable.Drawable newDrawable()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.Drawable boolean onStateChange(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.LevelListDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.ScaleDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.Drawable android.graphics.Insets getOpticalInsets()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.ShapeDrawable void onDraw(android.graphics.drawable.shapes.Shape, android.graphics.Canvas, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -101,7 +143,13 @@
     <item name='android.graphics.drawable.AnimatedRotateDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.InsetDrawable android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.AnimatedRotateDrawable void invalidateDrawable(android.graphics.drawable.Drawable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.AnimationDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.GradientDrawable android.graphics.drawable.Drawable mutate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.LayerDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
@@ -113,10 +161,10 @@
     <item name='android.graphics.drawable.BitmapDrawable void setTargetDensity(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.GradientDrawable boolean getPadding(android.graphics.Rect) 0'>
+    <item name='android.graphics.drawable.PictureDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.PictureDrawable void draw(android.graphics.Canvas) 0'>
+    <item name='android.graphics.drawable.GradientDrawable boolean getPadding(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.Drawable.Callback void invalidateDrawable(android.graphics.drawable.Drawable) 0'>
@@ -125,7 +173,7 @@
     <item name='android.graphics.drawable.LevelListDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.GradientDrawable.Orientation android.graphics.drawable.GradientDrawable.Orientation valueOf(java.lang.String)'>
+    <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable createFromXmlInner(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.Drawable void setBounds(android.graphics.Rect) 0'>
@@ -146,13 +194,19 @@
     <item name='android.graphics.drawable.GradientDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.LayerDrawable boolean onStateChange(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.GradientDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.BitmapDrawable void onBoundsChange(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.InsetDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.DrawableContainer android.graphics.Insets getOpticalInsets()'>
+    <item name='android.graphics.drawable.DrawableContainer void onBoundsChange(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.DrawableContainer void draw(android.graphics.Canvas) 0'>
@@ -164,19 +218,19 @@
     <item name='android.graphics.drawable.Drawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.ColorDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
+    <item name='android.graphics.drawable.InsetDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.StateListDrawable android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.MipmapDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.ColorDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.BitmapDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.ColorDrawable android.graphics.drawable.Drawable mutate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable createFromXmlInner(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet)'>
+    <item name='android.graphics.drawable.LevelListDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.ScaleDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
@@ -194,13 +248,22 @@
     <item name='android.graphics.drawable.BitmapDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.AnimatedRotateDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.ScaleDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.GradientDrawable.Orientation android.graphics.drawable.GradientDrawable.Orientation valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.DrawableContainer boolean getPadding(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.InsetDrawable void onBoundsChange(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable getCurrent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.AnimationDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
@@ -209,31 +272,40 @@
     <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable createFromXmlInner(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.MipmapDrawable android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.StateListDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.StateListDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
+    <item name='android.graphics.drawable.ShapeDrawable boolean inflateTag(java.lang.String, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.InsetDrawable void invalidateDrawable(android.graphics.drawable.Drawable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.ClipDrawable boolean onStateChange(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.NinePatchDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.AnimatedRotateDrawable void onBoundsChange(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.Drawable android.graphics.Insets getOpticalInsets()'>
+    <item name='android.graphics.drawable.BitmapDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.Drawable boolean getPadding(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.DrawableContainer android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.RotateDrawable void invalidateDrawable(android.graphics.drawable.Drawable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.AnimationDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.GradientDrawable android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.Drawable.ConstantState android.graphics.drawable.Drawable newDrawable(android.content.res.Resources)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) 0'>
@@ -242,7 +314,10 @@
     <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable createFromXmlInner(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.ScaleDrawable android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.StateListDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.DrawableContainer boolean onStateChange(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.NinePatchDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
@@ -251,10 +326,10 @@
     <item name='android.graphics.drawable.NinePatchDrawable boolean getPadding(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.LayerDrawable boolean getPadding(android.graphics.Rect) 0'>
+    <item name='android.graphics.drawable.MipmapDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.NinePatchDrawable android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.LayerDrawable boolean getPadding(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.InsetDrawable boolean getPadding(android.graphics.Rect) 0'>
@@ -269,13 +344,13 @@
     <item name='android.graphics.drawable.MipmapDrawable void onBoundsChange(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.DrawableContainer android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.RotateDrawable boolean getPadding(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.ColorDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.RotateDrawable boolean getPadding(android.graphics.Rect) 0'>
+    <item name='android.graphics.drawable.InsetDrawable android.graphics.drawable.Drawable mutate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.RotateDrawable void onBoundsChange(android.graphics.Rect) 0'>
@@ -284,9 +359,15 @@
     <item name='android.graphics.drawable.PaintDrawable boolean inflateTag(java.lang.String, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.BitmapDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.ScaleDrawable void onBoundsChange(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.LevelListDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.AnimationDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -296,64 +377,61 @@
     <item name='android.graphics.drawable.MipmapDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.RotateDrawable boolean onStateChange(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.ClipDrawable void invalidateDrawable(android.graphics.drawable.Drawable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.ShapeDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.AnimatedRotateDrawable android.graphics.drawable.Drawable mutate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.drawable.LayerDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.AnimationDrawable android.graphics.drawable.Drawable mutate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.drawable.StateListDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.ClipDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser)'>
+    <item name='android.graphics.drawable.ScaleDrawable boolean onStateChange(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.Drawable void copyBounds(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.ColorDrawable android.graphics.drawable.Drawable mutate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.DrawableContainer void invalidateDrawable(android.graphics.drawable.Drawable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.AnimatedRotateDrawable void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.NinePatchDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.drawable.NinePatchDrawable void setTargetDensity(android.util.DisplayMetrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.Drawable android.graphics.drawable.Drawable getCurrent()'>
+    <item name='android.graphics.drawable.NinePatchDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.ShapeDrawable void onBoundsChange(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.LayerDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.LevelListDrawable android.graphics.drawable.Drawable mutate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.drawable.BitmapDrawable android.graphics.drawable.Drawable mutate()'>
+    <item name='android.graphics.drawable.MipmapDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.StateListDrawable void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.LayerDrawable android.graphics.drawable.Drawable mutate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/graphics/drawable/shapes/annotations.xml b/android-sdk-annotations/android/graphics/drawable/shapes/annotations.xml
index 3e8bad2173f..045f189f918 100644
--- a/android-sdk-annotations/android/graphics/drawable/shapes/annotations.xml
+++ b/android-sdk-annotations/android/graphics/drawable/shapes/annotations.xml
@@ -2,49 +2,58 @@
     <item name='android.graphics.drawable.shapes.RoundRectShape void draw(android.graphics.Canvas, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.shapes.RoundRectShape android.graphics.drawable.shapes.RectShape clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.drawable.shapes.ArcShape void draw(android.graphics.Canvas, android.graphics.Paint) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.drawable.shapes.RoundRectShape android.graphics.drawable.shapes.Shape clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.drawable.shapes.PathShape java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.drawable.shapes.OvalShape void draw(android.graphics.Canvas, android.graphics.Paint) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.drawable.shapes.RectShape void draw(android.graphics.Canvas, android.graphics.Paint) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.drawable.shapes.PathShape android.graphics.drawable.shapes.PathShape clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.graphics.drawable.shapes.RectShape java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.graphics.drawable.shapes.RoundRectShape java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.shapes.RectShape void draw(android.graphics.Canvas, android.graphics.Paint) 1'>
+    <item name='android.graphics.drawable.shapes.ArcShape void draw(android.graphics.Canvas, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.shapes.RectShape android.graphics.drawable.shapes.RectShape clone()'>
+    <item name='android.graphics.drawable.shapes.OvalShape void draw(android.graphics.Canvas, android.graphics.Paint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.RoundRectShape android.graphics.drawable.shapes.Shape clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.shapes.RoundRectShape android.graphics.drawable.shapes.RoundRectShape clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.shapes.RectShape android.graphics.drawable.shapes.RectShape clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.RectShape void draw(android.graphics.Canvas, android.graphics.Paint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.Shape void draw(android.graphics.Canvas, android.graphics.Paint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.Shape void draw(android.graphics.Canvas, android.graphics.Paint) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.RectShape void draw(android.graphics.Canvas, android.graphics.Paint) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.RectShape java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.Shape java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.RoundRectShape android.graphics.drawable.shapes.RectShape clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.Shape android.graphics.drawable.shapes.Shape clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.graphics.drawable.shapes.PathShape android.graphics.drawable.shapes.PathShape clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.graphics.drawable.shapes.PathShape void draw(android.graphics.Canvas, android.graphics.Paint) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.shapes.RectShape android.graphics.drawable.shapes.Shape clone()'>
+    <item name='android.graphics.drawable.shapes.PathShape android.graphics.drawable.shapes.Shape clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.graphics.drawable.shapes.PathShape android.graphics.drawable.shapes.Shape clone()'>
+    <item name='android.graphics.drawable.shapes.RectShape android.graphics.drawable.shapes.Shape clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.graphics.drawable.shapes.OvalShape void draw(android.graphics.Canvas, android.graphics.Paint) 1'>
@@ -59,4 +68,7 @@
     <item name='android.graphics.drawable.shapes.ArcShape void draw(android.graphics.Canvas, android.graphics.Paint) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.graphics.drawable.shapes.PathShape java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/hardware/annotations.xml b/android-sdk-annotations/android/hardware/annotations.xml
index c55b9a49545..12d74f148d4 100644
--- a/android-sdk-annotations/android/hardware/annotations.xml
+++ b/android-sdk-annotations/android/hardware/annotations.xml
@@ -1,26 +1,86 @@
 <root>
-    <item name='android.hardware.Sensor java.lang.String toString()'>
+    <item name='android.hardware.SensorManager float[] getOrientation(float[], float[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.SerialPort void open(android.os.ParcelFileDescriptor, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.Camera void setParameters(android.hardware.Camera.Parameters) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.SystemSensorManager boolean registerListenerImpl(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.hardware.Camera.Parameters android.hardware.Camera.Size getJpegThumbnailSize()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.SensorManager float[] getOrientation(float[], float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.SystemSensorManager boolean requestTriggerSensorImpl(android.hardware.TriggerEventListener, android.hardware.Sensor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera void getCameraInfo(int, android.hardware.Camera.CameraInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera android.hardware.Camera.Parameters getParameters()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SensorManager boolean getRotationMatrix(float[], float[], float[], float[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera.Parameters void set(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SensorManager void getRotationMatrixFromVector(float[], float[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SensorManager java.util.List&lt;android.hardware.Sensor&gt; getSensorList(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera.Parameters void getPreviewFpsRange(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera.Parameters java.util.List&lt;java.lang.Integer&gt; getSupportedPictureFormats()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera.Parameters void setFlashMode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SensorEventListener void onSensorChanged(android.hardware.SensorEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.ISerialManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SensorManager float[] getOrientation(float[], float[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SensorManager boolean registerListenerImpl(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SensorManager void getAngleChange(float[], float[], float[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera android.hardware.Camera.Parameters getEmptyParameters()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SerialPort int read(java.nio.ByteBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera.Parameters void set(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SensorManager void getQuaternionFromVector(float[], float[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera.Parameters void setGpsProcessingMethod(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.Camera void setParameters(android.hardware.Camera.Parameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.SystemSensorManager boolean registerListenerImpl(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.SensorManager void getRotationMatrixFromVector(float[], float[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.SystemSensorManager boolean requestTriggerSensorImpl(android.hardware.TriggerEventListener, android.hardware.Sensor) 1'>
+    <item name='android.hardware.SensorManager boolean requestTriggerSensorImpl(android.hardware.TriggerEventListener, android.hardware.Sensor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.SensorManager void getAngleChange(float[], float[], float[]) 1'>
@@ -29,49 +89,28 @@
     <item name='android.hardware.SerialPort void write(java.nio.ByteBuffer, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.Camera void getCameraInfo(int, android.hardware.Camera.CameraInfo) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.ISerialManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.SensorManager boolean getRotationMatrix(float[], float[], float[], float[]) 2'>
+    <item name='android.hardware.ISerialManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.SensorManager void getQuaternionFromVector(float[], float[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.SensorManager java.util.List&lt;android.hardware.Sensor&gt; getSensorList(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.Camera.Parameters void set(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.hardware.SensorManager boolean remapCoordinateSystem(float[], int, int, float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.SystemSensorManager java.util.List&lt;android.hardware.Sensor&gt; getFullSensorList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.Camera.Parameters java.lang.String flatten()'>
+    <item name='android.hardware.Camera android.hardware.Camera open(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.SensorManager void getRotationMatrixFromVector(float[], float[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.Camera.Parameters void setColorEffect(java.lang.String) 0'>
+    <item name='android.hardware.SensorManager java.util.List&lt;android.hardware.Sensor&gt; getFullSensorList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.Camera.Parameters java.util.List&lt;java.lang.Integer&gt; getSupportedPreviewFormats()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.Camera.Parameters void getPreviewFpsRange(int[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.Camera.Parameters void setFlashMode(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.SensorManager float[] getOrientation(float[], float[]) 1'>
+    <item name='android.hardware.Camera.Parameters void setColorEffect(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.SensorManager float getInclination(float[]) 0'>
@@ -80,27 +119,21 @@
     <item name='android.hardware.SensorManager void getAngleChange(float[], float[], float[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.Camera android.hardware.Camera.Parameters getParameters()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.hardware.Camera.Parameters void setAntibanding(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.Camera android.hardware.Camera.Parameters getEmptyParameters()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.Camera.Parameters void setSceneMode(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.hardware.ISerialManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.SystemSensorManager SystemSensorManager(android.content.Context, android.os.Looper) 0'>
+    <item name='android.hardware.Camera.Parameters void setSceneMode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.Camera.Parameters void setWhiteBalance(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.SystemSensorManager SystemSensorManager(android.content.Context, android.os.Looper) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.SensorManager boolean getRotationMatrix(float[], float[], float[], float[]) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -110,31 +143,13 @@
     <item name='android.hardware.Camera.Parameters void getFocusDistances(float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.SensorManager void getAngleChange(float[], float[], float[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.Camera android.hardware.Camera open(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.SerialPort int read(java.nio.ByteBuffer) 0'>
+    <item name='android.hardware.Sensor java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.Camera.Parameters void setFocusMode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.SensorManager float[] getOrientation(float[], float[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.Camera.Parameters void set(java.lang.String, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.SensorManager void getQuaternionFromVector(float[], float[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.Camera.Parameters java.util.List&lt;java.lang.Integer&gt; getSupportedPictureFormats()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.Camera.Parameters void setGpsProcessingMethod(java.lang.String) 0'>
+    <item name='android.hardware.Camera.Parameters java.lang.String flatten()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/hardware/display/annotations.xml b/android-sdk-annotations/android/hardware/display/annotations.xml
index 18c49195d51..6ecff457476 100644
--- a/android-sdk-annotations/android/hardware/display/annotations.xml
+++ b/android-sdk-annotations/android/hardware/display/annotations.xml
@@ -8,13 +8,19 @@
     <item name='android.hardware.display.DisplayManager void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.display.IDisplayManagerCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.display.WifiDisplay WifiDisplay(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.display.DisplayManager android.view.Display[] getDisplays()'>
+    <item name='android.hardware.display.WifiDisplay java.lang.String getDeviceName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.display.DisplayManager android.view.Display[] getDisplays(java.lang.String)'>
+    <item name='android.hardware.display.WifiDisplay java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.display.IDisplayManagerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.display.WifiDisplayStatus WifiDisplayStatus(int, int, int, android.hardware.display.WifiDisplay, android.hardware.display.WifiDisplay[], android.hardware.display.WifiDisplay[]) 5'>
@@ -23,10 +29,7 @@
     <item name='android.hardware.display.DisplayManager void forgetWifiDisplay(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.display.IDisplayManagerCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.display.WifiDisplay java.lang.String getDeviceAddress()'>
+    <item name='android.hardware.display.IDisplayManager void forgetWifiDisplay(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.display.DisplayManagerGlobal void registerDisplayListener(android.hardware.display.DisplayManager.DisplayListener, android.os.Handler) 0'>
@@ -35,48 +38,66 @@
     <item name='android.hardware.display.DisplayManagerGlobal void forgetWifiDisplay(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.display.IDisplayManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.hardware.display.IDisplayManager void registerCallback(android.hardware.display.IDisplayManagerCallback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.display.WifiDisplay java.lang.String toString()'>
+    <item name='android.hardware.display.IDisplayManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.display.IDisplayManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.display.DisplayManager android.view.Display[] getDisplays(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.display.WifiDisplay WifiDisplay(java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.display.WifiDisplay void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.display.WifiDisplayStatus android.hardware.display.WifiDisplay[] getRememberedDisplays()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.display.WifiDisplayStatus java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.display.WifiDisplay java.lang.String getDeviceAddress()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.display.DisplayManager void connectWifiDisplay(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.display.WifiDisplayStatus void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.display.IDisplayManagerCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.display.WifiDisplayStatus WifiDisplayStatus(int, int, int, android.hardware.display.WifiDisplay, android.hardware.display.WifiDisplay[], android.hardware.display.WifiDisplay[]) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.display.WifiDisplayStatus android.hardware.display.WifiDisplay[] getAvailableDisplays()'>
+    <item name='android.hardware.display.IDisplayManager void connectWifiDisplay(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.display.WifiDisplayStatus android.hardware.display.WifiDisplay[] getRememberedDisplays()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.display.WifiDisplay java.lang.String getDeviceName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.display.WifiDisplayStatus java.lang.String toString()'>
+    <item name='android.hardware.display.IDisplayManager.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.display.DisplayManagerGlobal void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.display.WifiDisplayStatus android.hardware.display.WifiDisplay[] getAvailableDisplays()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.display.DisplayManager void renameWifiDisplay(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.display.IDisplayManager void renameWifiDisplay(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.display.DisplayManager android.view.Display[] getDisplays()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.display.DisplayManager void registerDisplayListener(android.hardware.display.DisplayManager.DisplayListener, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/hardware/input/annotations.xml b/android-sdk-annotations/android/hardware/input/annotations.xml
index a5416283935..594af21d828 100644
--- a/android-sdk-annotations/android/hardware/input/annotations.xml
+++ b/android-sdk-annotations/android/hardware/input/annotations.xml
@@ -5,34 +5,28 @@
     <item name='android.hardware.input.KeyboardLayout int compareTo(android.hardware.input.KeyboardLayout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.input.InputManager void addKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 1'>
+    <item name='android.hardware.input.IInputManager void removeKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.input.InputManager void unregisterInputDeviceListener(android.hardware.input.InputManager.InputDeviceListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.input.InputManager void setPointerSpeed(android.content.Context, int) 0'>
+    <item name='android.hardware.input.IInputManager android.hardware.input.KeyboardLayout getKeyboardLayout(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.input.IInputManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.input.InputManager void registerInputDeviceListener(android.hardware.input.InputManager.InputDeviceListener, android.os.Handler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.input.IInputDevicesChangedListener.Stub android.os.IBinder asBinder()'>
+    <item name='android.hardware.input.IInputDevicesChangedListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.input.InputManager java.lang.String getCurrentKeyboardLayoutForInputDevice(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.input.IInputManager void setCurrentKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.input.InputManager android.hardware.input.KeyboardLayout getKeyboardLayout(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.input.InputManager boolean injectInputEvent(android.view.InputEvent, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.input.InputManager android.os.Vibrator getInputDeviceVibrator(int)'>
+    <item name='android.hardware.input.IInputManager void registerInputDevicesChangedListener(android.hardware.input.IInputDevicesChangedListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.input.InputManager boolean[] deviceHasKeys(int[])'>
@@ -41,34 +35,94 @@
     <item name='android.hardware.input.IInputManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.input.InputManager android.view.InputDevice getInputDeviceByDescriptor(java.lang.String) 0'>
+    <item name='android.hardware.input.IInputManager boolean hasKeys(int, int, int[], boolean[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.input.InputManager boolean[] deviceHasKeys(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.input.KeyboardLayout int compareTo(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.hardware.input.InputManager java.lang.String[] getKeyboardLayoutsForInputDevice(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.input.InputManager void setCurrentKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.hardware.input.InputManager void removeKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.input.InputManager void setCurrentKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.input.InputManager void removeKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 0'>
+    <item name='android.hardware.input.InputManager android.os.Vibrator getInputDeviceVibrator(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputDevicesChangedListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.input.InputManager void addKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.input.InputManager void addKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.InputManager void setPointerSpeed(android.content.Context, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager void removeKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.InputManager void registerInputDeviceListener(android.hardware.input.InputManager.InputDeviceListener, android.os.Handler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager void vibrate(int, long[], int, android.os.IBinder) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager void addKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager void setCurrentKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.InputManager boolean injectInputEvent(android.view.InputEvent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.input.InputManager int[] getInputDeviceIds()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.input.InputManager android.view.InputDevice getInputDeviceByDescriptor(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputDevicesChangedListener void onInputDevicesChanged(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager void addKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.KeyboardLayout int compareTo(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.InputManager void setCurrentKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager boolean hasKeys(int, int, int[], boolean[]) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputDevicesChangedListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager boolean injectInputEvent(android.view.InputEvent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.InputManager void removeKeyboardLayoutForInputDevice(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager java.lang.String[] getKeyboardLayoutsForInputDevice(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.input.IInputManager java.lang.String getCurrentKeyboardLayoutForInputDevice(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/hardware/location/annotations.xml b/android-sdk-annotations/android/hardware/location/annotations.xml
index 7b7dbb24f01..8fbfe81bddd 100644
--- a/android-sdk-annotations/android/hardware/location/annotations.xml
+++ b/android-sdk-annotations/android/hardware/location/annotations.xml
@@ -1,20 +1,38 @@
 <root>
-    <item name='android.hardware.location.IGeofenceHardware.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.location.GeofenceHardwareImpl int[] getMonitoringTypes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.location.GeofenceHardwareRequest android.hardware.location.GeofenceHardwareRequest createCircularGeofence(double, double, double)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.location.IGeofenceHardwareMonitorCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.location.IGeofenceHardware.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.hardware.location.IGeofenceHardwareCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.location.IGeofenceHardwareCallback.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.location.GeofenceHardwareImpl int[] getMonitoringTypes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.location.IGeofenceHardwareMonitorCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.location.IGeofenceHardware.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.location.IGeofenceHardwareMonitorCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.location.GeofenceHardwareService android.os.IBinder onBind(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.location.IGeofenceHardware.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.location.GeofenceHardwareRequest android.hardware.location.GeofenceHardwareRequest createCircularGeofence(double, double, double)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.location.IGeofenceHardwareMonitorCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.location.IGeofenceHardwareCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.location.IGeofenceHardware.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/hardware/usb/annotations.xml b/android-sdk-annotations/android/hardware/usb/annotations.xml
index e02ff64aba3..a7311ff27d0 100644
--- a/android-sdk-annotations/android/hardware/usb/annotations.xml
+++ b/android-sdk-annotations/android/hardware/usb/annotations.xml
@@ -2,34 +2,49 @@
     <item name='android.hardware.usb.UsbDevice void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.usb.UsbManager java.lang.String getDefaultFunction()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.usb.UsbDeviceConnection byte[] getRawDescriptors()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.usb.UsbDeviceConnection boolean releaseInterface(android.hardware.usb.UsbInterface) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.usb.UsbDevice java.lang.String getDeviceName(int)'>
+    <item name='android.hardware.usb.UsbInterface android.hardware.usb.UsbEndpoint getEndpoint(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.usb.UsbAccessory void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.usb.UsbAccessory java.lang.String toString()'>
+    <item name='android.hardware.usb.IUsbManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.usb.UsbManager boolean isFunctionEnabled(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.usb.UsbInterface android.hardware.usb.UsbEndpoint getEndpoint(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.usb.UsbInterface java.lang.String toString()'>
+    <item name='android.hardware.usb.UsbDevice java.lang.String getDeviceName(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.usb.UsbDeviceConnection boolean claimInterface(android.hardware.usb.UsbInterface, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.hardware.usb.UsbDeviceConnection int bulkTransfer(android.hardware.usb.UsbEndpoint, byte[], int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.usb.UsbDeviceConnection java.lang.String getSerial()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.usb.IUsbManager void grantDevicePermission(android.hardware.usb.UsbDevice, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.hardware.usb.UsbDevice java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.usb.UsbEndpoint java.lang.String toString()'>
+    <item name='android.hardware.usb.UsbManager boolean isFunctionEnabled(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.usb.UsbAccessory java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.usb.IUsbManager void setAccessoryPackage(android.hardware.usb.UsbAccessory, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.usb.IUsbManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
@@ -41,37 +56,34 @@
     <item name='android.hardware.usb.UsbRequest boolean queue(java.nio.ByteBuffer, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.usb.IUsbManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.hardware.usb.UsbDeviceConnection int bulkTransfer(android.hardware.usb.UsbEndpoint, byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.usb.UsbDeviceConnection byte[] getRawDescriptors()'>
+    <item name='android.hardware.usb.UsbEndpoint java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.usb.UsbAccessory UsbAccessory(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.usb.UsbDeviceConnection java.lang.String getSerial()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.usb.UsbRequest boolean initialize(android.hardware.usb.UsbDeviceConnection, android.hardware.usb.UsbEndpoint) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.hardware.usb.UsbManager java.lang.String getDefaultFunction()'>
+    <item name='android.hardware.usb.IUsbManager.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.usb.UsbDevice android.hardware.usb.UsbInterface getInterface(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.usb.UsbInterface void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.hardware.usb.UsbRequest boolean initialize(android.hardware.usb.UsbDeviceConnection, android.hardware.usb.UsbEndpoint) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.usb.IUsbManager void setDevicePackage(android.hardware.usb.UsbDevice, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.hardware.usb.UsbInterface java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.hardware.usb.UsbEndpoint void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.hardware.usb.UsbDeviceConnection int bulkTransfer(android.hardware.usb.UsbEndpoint, byte[], int, int, int) 0'>
+    <item name='android.hardware.usb.UsbInterface void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/inputmethodservice/annotations.xml b/android-sdk-annotations/android/inputmethodservice/annotations.xml
index 60e8c1b5c9c..9024d7e3102 100644
--- a/android-sdk-annotations/android/inputmethodservice/annotations.xml
+++ b/android-sdk-annotations/android/inputmethodservice/annotations.xml
@@ -14,9 +14,6 @@
     <item name='android.inputmethodservice.InputMethodService void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Row createRowFromXml(android.content.res.Resources, android.content.res.XmlResourceParser)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.inputmethodservice.ExtractEditLayout ExtractEditLayout(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -29,9 +26,6 @@
     <item name='android.inputmethodservice.InputMethodService.InputMethodImpl void changeInputMethodSubtype(android.view.inputmethod.InputMethodSubtype) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Key createKeyFromXml(android.content.res.Resources, android.inputmethodservice.Keyboard.Row, int, int, android.content.res.XmlResourceParser)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.inputmethodservice.ExtractEditText ExtractEditText(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -59,18 +53,12 @@
     <item name='android.inputmethodservice.KeyboardView KeyboardView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.InputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface()'>
+    <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.InputMethodService void onUpdateExtractingVisibility(android.view.inputmethod.EditorInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.Keyboard.Key int[] getCurrentDrawableState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.inputmethodservice.Keyboard.Key Key(android.inputmethodservice.Keyboard.Row) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -89,7 +77,7 @@
     <item name='android.inputmethodservice.KeyboardView boolean onLongPress(android.inputmethodservice.Keyboard.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.AbstractInputMethodService android.os.IBinder onBind(android.content.Intent)'>
+    <item name='android.inputmethodservice.ExtractEditText void replaceText_internal(int, int, java.lang.CharSequence) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.InputMethodService boolean onGenericMotionEvent(android.view.MotionEvent) 0'>
@@ -101,9 +89,15 @@
     <item name='android.inputmethodservice.ExtractEditLayout ExtractEditLayout(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.InputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl onCreateInputMethodInterface()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.InputMethodService void onUpdateExtractingViews(android.view.inputmethod.EditorInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.InputMethodService boolean onTrackballEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl void dispatchKeyEvent(int, android.view.KeyEvent, android.view.inputmethod.InputMethodSession.EventCallback) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -119,9 +113,6 @@
     <item name='android.inputmethodservice.KeyboardView KeyboardView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.AbstractInputMethodService android.view.KeyEvent.DispatcherState getKeyDispatcherState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.inputmethodservice.ExtractEditText ExtractEditText(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -131,6 +122,9 @@
     <item name='android.inputmethodservice.KeyboardView KeyboardView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Key createKeyFromXml(android.content.res.Resources, android.inputmethodservice.Keyboard.Row, int, int, android.content.res.XmlResourceParser)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Key createKeyFromXml(android.content.res.Resources, android.inputmethodservice.Keyboard.Row, int, int, android.content.res.XmlResourceParser) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -143,6 +137,9 @@
     <item name='android.inputmethodservice.AbstractInputMethodService android.os.IBinder onBind(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.AbstractInputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.InputMethodService.InputMethodImpl void bindInput(android.view.inputmethod.InputBinding) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -155,39 +152,57 @@
     <item name='android.inputmethodservice.AbstractInputMethodService boolean onGenericMotionEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.InputMethodService boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
+    <item name='android.inputmethodservice.AbstractInputMethodService android.view.KeyEvent.DispatcherState getKeyDispatcherState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.inputmethodservice.InputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.Keyboard.Row Row(android.content.res.Resources, android.inputmethodservice.Keyboard, android.content.res.XmlResourceParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.InputMethodService boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.ExtractEditText ExtractEditText(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.InputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl onCreateInputMethodInterface()'>
+    <item name='android.inputmethodservice.Keyboard android.inputmethodservice.Keyboard.Row createRowFromXml(android.content.res.Resources, android.content.res.XmlResourceParser)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.inputmethodservice.AbstractInputMethodService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.KeyboardView KeyboardView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.AbstractInputMethodService android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface()'>
+    <item name='android.inputmethodservice.AbstractInputMethodService boolean onTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.Keyboard.Row Row(android.content.res.Resources, android.inputmethodservice.Keyboard, android.content.res.XmlResourceParser) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.InputMethodService void setInputView(android.view.View) 0'>
+    <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, int, int, int) 0'>
+    <item name='android.inputmethodservice.AbstractInputMethodService android.os.IBinder onBind(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.inputmethodservice.InputMethodService void setInputView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl void createSession(android.view.inputmethod.InputMethod.SessionCallback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.InputMethodService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.Keyboard Keyboard(android.content.Context, int, java.lang.CharSequence, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.inputmethodservice.Keyboard.Key int[] getCurrentDrawableState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.inputmethodservice.InputMethodService void onCurrentInputMethodSubtypeChanged(android.view.inputmethod.InputMethodSubtype) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/location/annotations.xml b/android-sdk-annotations/android/location/annotations.xml
index e27705f36c6..da77654a897 100644
--- a/android-sdk-annotations/android/location/annotations.xml
+++ b/android-sdk-annotations/android/location/annotations.xml
@@ -2,13 +2,19 @@
     <item name='android.location.Location void distanceBetween(double, double, double, double, float[]) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest setProvider(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.location.Location double convert(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.INetInitiatedListener.Stub android.os.IBinder asBinder()'>
+    <item name='android.location.Location java.lang.String convert(double, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.Criteria java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.LocationManager android.location.GpsStatus getGpsStatus(android.location.GpsStatus)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void requestSingleUpdate(android.location.Criteria, android.app.PendingIntent) 1'>
@@ -20,19 +26,16 @@
     <item name='android.location.Geocoder Geocoder(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.ICountryDetector.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager void requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener, android.os.Looper) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest createFromDeprecatedCriteria(android.location.Criteria, long, float, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.location.LocationManager void requestLocationUpdates(android.location.LocationRequest, android.location.LocationListener, android.os.Looper) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest setSmallestDisplacement(float)'>
+    <item name='android.location.LocationRequest android.location.LocationRequest create()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.Geocoder Geocoder(android.content.Context, java.util.Locale) 0'>
@@ -41,7 +44,7 @@
     <item name='android.location.Geocoder java.util.List&lt;android.location.Address&gt; getFromLocationName(java.lang.String, int, double, double, double, double) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest setQuality(int)'>
+    <item name='android.location.LocationRequest android.location.LocationRequest setProvider(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.GeocoderParams void writeToParcel(android.os.Parcel, int) 0'>
@@ -53,96 +56,141 @@
     <item name='android.location.LocationManager void requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.IGpsGeofenceHardware.Stub android.os.IBinder asBinder()'>
+    <item name='android.location.ICountryDetector void addCountryListener(android.location.ICountryListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.LocationRequest android.location.LocationRequest setExpireIn(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.Criteria void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.LocationManager void requestSingleUpdate(java.lang.String, android.app.PendingIntent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.Country Country(android.location.Country) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationManager void requestSingleUpdate(java.lang.String, android.app.PendingIntent) 1'>
+    <item name='android.location.IGpsGeofenceHardware.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.Geocoder Geocoder(android.content.Context, java.util.Locale) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.LocationRequest java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.Geofence java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager java.lang.String getBestProvider(android.location.Criteria, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.LocationRequest android.location.LocationRequest setInterval(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager void removeUpdates(android.location.ILocationListener, android.app.PendingIntent, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager void removeGeofence(android.location.Geofence, android.app.PendingIntent, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager void requestGeofence(android.location.LocationRequest, android.location.Geofence, android.app.PendingIntent, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager android.location.LocationProvider getProvider(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void removeProximityAlert(android.app.PendingIntent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.LocationManager void requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.Country Country(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void addTestProvider(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationManager void requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.location.ICountryListener.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.location.LocationManager void addGeofence(android.location.LocationRequest, android.location.Geofence, android.app.PendingIntent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.Criteria java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.location.LocationManager boolean isProviderEnabled(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.Country java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.location.LocationManager void requestSingleUpdate(java.lang.String, android.app.PendingIntent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest setFastestInterval(long)'>
+    <item name='android.location.IGeocodeProvider.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationRequest LocationRequest(android.location.LocationRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.IGeofenceProvider.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager void reportLocation(android.location.Location, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ICountryListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager void removeUpdates(android.location.LocationListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.ILocationListener.Stub android.os.IBinder asBinder()'>
+    <item name='android.location.IGpsStatusListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.IGeocodeProvider java.lang.String getFromLocation(double, double, int, android.location.GeocoderParams, java.util.List&lt;android.location.Address&gt;) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void requestSingleUpdate(java.lang.String, android.location.LocationListener, android.os.Looper) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.IGpsStatusListener.Stub android.os.IBinder asBinder()'>
+    <item name='android.location.IGeocodeProvider.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest setExpireIn(long)'>
+    <item name='android.location.ILocationManager void requestGeofence(android.location.LocationRequest, android.location.Geofence, android.app.PendingIntent, java.lang.String) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager android.location.Location getLastLocation(android.location.LocationRequest, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.IGeocodeProvider.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.ILocationManager void requestLocationUpdates(android.location.LocationRequest, android.location.ILocationListener, android.app.PendingIntent, java.lang.String) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.LocationRequest android.location.LocationRequest setFastestInterval(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager void setTestProviderLocation(java.lang.String, android.location.Location) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationRequest android.location.LocationRequest createFromDeprecatedCriteria(android.location.Criteria, long, float, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.Geofence android.location.Geofence createCircle(double, double, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.IGpsStatusListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.Location Location(android.location.Location) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.IGeocodeProvider.Stub android.os.IBinder asBinder()'>
+    <item name='android.location.LocationManager void requestLocationUpdates(java.lang.String, long, float, android.app.PendingIntent) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void removeUpdates(android.app.PendingIntent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationManager void requestLocationUpdates(java.lang.String, long, float, android.app.PendingIntent) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.location.Geofence void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -152,16 +200,16 @@
     <item name='android.location.Location void dump(android.util.Printer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.Location java.lang.String convert(double, int)'>
+    <item name='android.location.INetInitiatedListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void removeGeofence(android.location.Geofence, android.app.PendingIntent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.Geofence java.lang.String toString()'>
+    <item name='android.location.Country java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.ILocationManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.location.ILocationListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void requestSingleUpdate(java.lang.String, android.location.LocationListener, android.os.Looper) 0'>
@@ -170,6 +218,9 @@
     <item name='android.location.LocationRequest android.location.LocationRequest createFromDeprecatedProvider(java.lang.String, long, float, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.IGpsStatusProvider void removeGpsStatusListener(android.location.IGpsStatusListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager void requestLocationUpdates(java.lang.String, long, float, android.app.PendingIntent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -179,40 +230,76 @@
     <item name='android.location.ICountryDetector.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.ILocationListener void onLocationChanged(android.location.Location) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ICountryListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager void requestLocationUpdates(android.location.LocationRequest, android.app.PendingIntent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.Location float bearingTo(android.location.Location) 0'>
+    <item name='android.location.LocationRequest android.location.LocationRequest createFromDeprecatedProvider(java.lang.String, long, float, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationProvider LocationProvider(java.lang.String, com.android.internal.location.ProviderProperties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.Location float bearingTo(android.location.Location) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationRequest android.location.LocationRequest setProvider(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest setNumUpdates(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.location.Address java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.location.LocationRequest void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void requestSingleUpdate(android.location.Criteria, android.location.LocationListener, android.os.Looper) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.LocationListener void onLocationChanged(android.location.Location) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager java.lang.String getFromLocation(double, double, int, android.location.GeocoderParams, java.util.List&lt;android.location.Address&gt;) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager void addGeofence(android.location.LocationRequest, android.location.Geofence, android.app.PendingIntent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.ICountryDetector.Stub android.os.IBinder asBinder()'>
+    <item name='android.location.ILocationManager boolean sendExtraCommand(java.lang.String, java.lang.String, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest java.lang.String toString()'>
+    <item name='android.location.ICountryDetector void removeCountryListener(android.location.ICountryListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest setExpireAt(long)'>
+    <item name='android.location.ILocationListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager void removeGpsStatusListener(android.location.IGpsStatusListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.LocationProvider java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager java.lang.String getFromLocationName(java.lang.String, double, double, double, double, int, android.location.GeocoderParams, java.util.List&lt;android.location.Address&gt;) 7'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ICountryDetector.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.Location java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.IGpsStatusProvider void addGpsStatusListener(android.location.IGpsStatusListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.IGpsStatusListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.INetInitiatedListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager void addTestProvider(java.lang.String, com.android.internal.location.ProviderProperties) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.Location void set(android.location.Location) 0'>
@@ -221,33 +308,42 @@
     <item name='android.location.Country void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.Address java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ILocationManager void removeGeofence(android.location.Geofence, android.app.PendingIntent, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.Location float distanceTo(android.location.Location) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void requestLocationUpdates(long, float, android.location.Criteria, android.location.LocationListener, android.os.Looper) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationManager void requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener, android.os.Looper) 0'>
+    <item name='android.location.ILocationListener.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.Location java.lang.String toString()'>
+    <item name='android.location.LocationManager void requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener, android.os.Looper) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.IGpsStatusProvider.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.IGeofenceProvider.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.GeocoderParams GeocoderParams(android.content.Context, java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.Geofence android.location.Geofence createCircle(double, double, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.location.LocationManager android.location.GpsStatus getGpsStatus(android.location.GpsStatus)'>
+    <item name='android.location.LocationRequest android.location.LocationRequest setExpireAt(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.Geocoder java.util.List&lt;android.location.Address&gt; getFromLocationName(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.LocationRequest android.location.LocationRequest setQuality(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager android.location.Location getLastKnownLocation(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -260,51 +356,63 @@
     <item name='android.location.LocationManager void removeGeofence(android.location.Geofence, android.app.PendingIntent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.LocationRequest android.location.LocationRequest createFromDeprecatedCriteria(android.location.Criteria, long, float, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.INetInitiatedListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void requestLocationUpdates(long, float, android.location.Criteria, android.location.LocationListener, android.os.Looper) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.IGpsStatusProvider.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager void setTestProviderLocation(java.lang.String, android.location.Location) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.IGpsGeofenceHardware.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.LocationManager void addProximityAlert(double, double, float, long, android.app.PendingIntent) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest java.lang.String qualityToString(int)'>
+    <item name='android.location.LocationRequest android.location.LocationRequest setSmallestDisplacement(float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.IGeofenceProvider.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest setInterval(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.location.IGpsGeofenceHardware.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.IGpsStatusProvider.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.location.IGeofenceProvider.Stub android.os.IBinder asBinder()'>
+    <item name='android.location.LocationRequest android.location.LocationRequest setNumUpdates(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void requestSingleUpdate(android.location.Criteria, android.location.LocationListener, android.os.Looper) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationRequest android.location.LocationRequest createFromDeprecatedProvider(java.lang.String, long, float, boolean)'>
+    <item name='android.location.ILocationManager void locationCallbackFinished(android.location.ILocationListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.ICountryListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.location.LocationProvider java.lang.String getName()'>
+    <item name='android.location.IGeocodeProvider java.lang.String getFromLocationName(java.lang.String, double, double, double, double, int, android.location.GeocoderParams, java.util.List&lt;android.location.Address&gt;) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.location.LocationManager void requestSingleUpdate(android.location.Criteria, android.app.PendingIntent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.location.IGpsStatusProvider.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.location.LocationRequest java.lang.String qualityToString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.location.Location void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/media/annotations.xml b/android-sdk-annotations/android/media/annotations.xml
index a0a02267c94..dfeec822d8d 100644
--- a/android-sdk-annotations/android/media/annotations.xml
+++ b/android-sdk-annotations/android/media/annotations.xml
@@ -2,22 +2,16 @@
     <item name='android.media.ResampleInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.IAudioRoutesObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.MediaScanner MediaScanner(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.AsyncPlayer void setUsesWakeLock(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.RemoteControlClient.MetadataEditor android.media.RemoteControlClient.MetadataEditor putLong(int, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.MediaPlayer void setDataSource(android.content.Context, android.net.Uri, java.util.Map&lt;java.lang.String,java.lang.String&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.RemoteDisplay android.media.RemoteDisplay listen(java.lang.String, android.media.RemoteDisplay.Listener, android.os.Handler)'>
+    <item name='android.media.MediaFormat android.media.MediaFormat createVideoFormat(java.lang.String, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.ExifInterface ExifInterface(java.lang.String) 0'>
@@ -26,19 +20,16 @@
     <item name='android.media.MediaMuxer void writeSampleData(int, java.nio.ByteBuffer, android.media.MediaCodec.BufferInfo) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.IRemoteVolumeObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.MediaCrypto boolean isCryptoSchemeSupported(java.util.UUID) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaCodec android.media.MediaFormat getOutputFormat()'>
+    <item name='android.media.MediaCodecList android.media.MediaCodecInfo getCodecInfoAt(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.AudioSystem java.lang.String getDeviceName(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.MediaFile java.lang.String getFileTitle(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.MediaCodec android.media.MediaCodecInfo getCodecInfo()'>
+    <item name='android.media.IMediaScannerService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.TimedText TimedText(android.os.Parcel) 0'>
@@ -47,22 +38,25 @@
     <item name='android.media.MediaPlayer int setMetadataFilter(java.util.Set&lt;java.lang.Integer&gt;, java.util.Set&lt;java.lang.Integer&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.RemoteControlClient.MetadataEditor android.media.RemoteControlClient.MetadataEditor putString(int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.RemoteControlClient android.media.RemoteControlClient.MetadataEditor editMetadata(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.MediaFormat android.media.MediaFormat createVideoFormat(java.lang.String, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.AudioService.VolumeStreamState void setAllIndexes(android.media.AudioService.VolumeStreamState) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.DecoderCapabilities.AudioDecoder android.media.DecoderCapabilities.AudioDecoder valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.MediaPlayer void setDataSource(java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaDrm android.media.MediaDrm.CryptoSession getCryptoSession(byte[], java.lang.String, java.lang.String)'>
+    <item name='android.media.IAudioService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaScannerClient void handleStringTag(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaRouter android.media.MediaRouter.RouteCategory getSystemCategory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaCodec android.media.MediaCodec createEncoderByType(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaMuxer int addTrack(android.media.MediaFormat) 0'>
@@ -71,34 +65,25 @@
     <item name='android.media.RemoteDisplay android.media.RemoteDisplay listen(java.lang.String, android.media.RemoteDisplay.Listener, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.MediaCodec android.media.MediaFormat getOutputFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaPlayer.OnSeekCompleteListener void onSeekComplete(android.media.MediaPlayer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.MediaMuxer void writeSampleData(int, java.nio.ByteBuffer, android.media.MediaCodec.BufferInfo) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.IMediaScannerService.Stub android.os.IBinder asBinder()'>
+    <item name='android.media.MediaPlayer android.os.Parcel getParcelParameter(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaCodec.CryptoInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.IRemoteVolumeObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.DecoderCapabilities java.util.List&lt;android.media.DecoderCapabilities.VideoDecoder&gt; getVideoDecoders()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.IMediaScannerListener.Stub android.os.IBinder asBinder()'>
+    <item name='android.media.RemoteControlClient android.media.IRemoteControlClient getIRemoteControlClient()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaRouter.RouteInfo java.lang.CharSequence getName(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaPlayer android.os.Parcel newRequest()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.IAudioFocusDispatcher.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.MediaFormat java.lang.String toString()'>
+    <item name='android.media.IAudioRoutesObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.ThumbnailUtils android.graphics.Bitmap createImageThumbnail(java.lang.String, int) 0'>
@@ -110,19 +95,34 @@
     <item name='android.media.IMediaScannerService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.IRemoteVolumeObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.MediaCodec void configure(android.media.MediaFormat, android.view.Surface, android.media.MediaCrypto, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.Metadata byte[] getByteArray(int)'>
+    <item name='android.media.IAudioService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaRouter android.media.MediaRouter.RouteCategory createRouteCategory(int, boolean)'>
+    <item name='android.media.MediaRouter android.media.MediaRouter.RouteCategory createRouteCategory(java.lang.CharSequence, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaRouter.RouteCategory java.util.List&lt;android.media.MediaRouter.RouteInfo&gt; getRoutes(java.util.List&lt;android.media.MediaRouter.RouteInfo&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IMediaScannerListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.AudioManager void handleKeyUp(android.view.KeyEvent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaRouter android.media.MediaRouter.RouteCategory getSystemCategory()'>
+    <item name='android.media.RemoteControlClient.MetadataEditor android.media.RemoteControlClient.MetadataEditor putLong(int, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.DecoderCapabilities.VideoDecoder android.media.DecoderCapabilities.VideoDecoder valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IAudioRoutesObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.FaceDetector.Face void getMidPoint(android.graphics.PointF) 0'>
@@ -131,10 +131,10 @@
     <item name='android.media.MediaMetadataRetriever void setDataSource(java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaCodecList android.media.MediaCodecInfo getCodecInfoAt(int)'>
+    <item name='android.media.MediaSyncEvent android.media.MediaSyncEvent setAudioSessionId(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaCodec android.media.MediaCodec createEncoderByType(java.lang.String)'>
+    <item name='android.media.IRemoteControlDisplay.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaFile java.lang.String getMimeTypeForFile(java.lang.String) 0'>
@@ -143,10 +143,25 @@
     <item name='android.media.SoundPool int load(android.content.Context, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.DecoderCapabilities java.util.List&lt;android.media.DecoderCapabilities.AudioDecoder&gt; getAudioDecoders()'>
+    <item name='android.media.IAudioService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaExtractor android.media.MediaFormat getTrackFormat(int)'>
+    <item name='android.media.IMediaScannerListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IAudioService int requestAudioFocus(int, int, android.os.IBinder, android.media.IAudioFocusDispatcher, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IAudioService android.media.AudioRoutesInfo startWatchingRoutes(android.media.IAudioRoutesObserver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IMediaScannerListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaPlayer android.os.Parcel newRequest()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IMediaScannerService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.AudioManager void handleKeyDown(android.view.KeyEvent, int) 0'>
@@ -155,31 +170,46 @@
     <item name='android.media.MediaMetadataRetriever void setDataSource(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaRouter.RouteGroup java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.MediaFile java.lang.String getFileTitle(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaRouter.RouteCategory java.util.List&lt;android.media.MediaRouter.RouteInfo&gt; getRoutes(java.util.List&lt;android.media.MediaRouter.RouteInfo&gt;)'>
+    <item name='android.media.MediaFormat android.media.MediaFormat createAudioFormat(java.lang.String, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.RemoteControlClient RemoteControlClient(android.app.PendingIntent, android.os.Looper) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.IRemoteControlDisplay.Stub android.os.IBinder asBinder()'>
+    <item name='android.media.IRemoteControlDisplay.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaPlayer.TrackInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.RemoteControlClient.MetadataEditor android.media.RemoteControlClient.MetadataEditor putString(int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.AudioSystem java.lang.String getDeviceName(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.MediaPlayer void invoke(android.os.Parcel, android.os.Parcel) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.MiniThumbFile android.media.MiniThumbFile instance(android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IRemoteControlClient.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaRouter.RouteCategory java.lang.CharSequence getName(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.AudioService android.media.AudioRoutesInfo startWatchingRoutes(android.media.IAudioRoutesObserver)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.DecoderCapabilities.VideoDecoder android.media.DecoderCapabilities.VideoDecoder valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaRouter.RouteCategory java.lang.CharSequence getName(android.content.Context) 0'>
+    <item name='android.media.RemoteControlClient android.media.RemoteControlClient.MetadataEditor editMetadata(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaScanner void scanMtpFile(java.lang.String, java.lang.String, int, int) 0'>
@@ -188,22 +218,22 @@
     <item name='android.media.MediaRouter.RouteGroup void addRoute(android.media.MediaRouter.RouteInfo, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.MediaPlayer.OnVideoSizeChangedListener void onVideoSizeChanged(android.media.MediaPlayer, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.MediaScanner void scanMtpFile(java.lang.String, java.lang.String, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaPlayer void setDataSource(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.AudioService int requestAudioFocus(int, int, android.os.IBinder, android.media.IAudioFocusDispatcher, java.lang.String, java.lang.String) 2'>
+    <item name='android.media.MediaRouter.RouteCategory java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaPlayer void setWakeMode(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaCodec android.media.MediaCodec createByCodecName(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.RemoteControlClient android.media.IRemoteControlClient getIRemoteControlClient()'>
+    <item name='android.media.AudioService int requestAudioFocus(int, int, android.os.IBinder, android.media.IAudioFocusDispatcher, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.AudioService AudioService(android.content.Context) 0'>
@@ -212,25 +242,31 @@
     <item name='android.media.MediaPlayer void addTimedTextSource(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.IRemoteControlClient.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.DecoderCapabilities java.util.List&lt;android.media.DecoderCapabilities.VideoDecoder&gt; getVideoDecoders()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaCodec android.media.MediaCodecInfo getCodecInfo()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.MediaRouter void addRouteInt(android.media.MediaRouter.RouteInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MiniThumbFile android.media.MiniThumbFile instance(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.AudioService android.media.AudioRoutesInfo startWatchingRoutes(android.media.IAudioRoutesObserver)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.MediaRouter android.media.MediaRouter.RouteCategory createRouteCategory(java.lang.CharSequence, boolean)'>
+    <item name='android.media.MediaRouter.RouteGroup java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaRouter.RouteGroup void removeRoute(android.media.MediaRouter.RouteInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.AudioRoutesInfo void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.media.IAudioFocusDispatcher.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaCodec android.media.MediaCodec createDecoderByType(java.lang.String)'>
+    <item name='android.media.AudioRoutesInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.AudioService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
@@ -239,25 +275,22 @@
     <item name='android.media.AudioService android.media.AudioRoutesInfo startWatchingRoutes(android.media.IAudioRoutesObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.DecoderCapabilities.AudioDecoder android.media.DecoderCapabilities.AudioDecoder valueOf(java.lang.String)'>
+    <item name='android.media.RemoteDisplay android.media.RemoteDisplay listen(java.lang.String, android.media.RemoteDisplay.Listener, android.os.Handler)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaRouter.RouteInfo java.lang.String toString()'>
+    <item name='android.media.IRemoteControlClient.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaPlayer android.os.Parcel getParcelParameter(int)'>
+    <item name='android.media.MediaCodec.CryptoInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.Metadata boolean parse(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.IRingtonePlayer.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.MediaInserter void insert(android.net.Uri, android.content.ContentValues) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaSyncEvent android.media.MediaSyncEvent createEvent(int)'>
+    <item name='android.media.MediaPlayer.OnPreparedListener void onPrepared(android.media.MediaPlayer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaInserter void insertwithPriority(android.net.Uri, android.content.ContentValues) 1'>
@@ -269,10 +302,25 @@
     <item name='android.media.MediaCrypto MediaCrypto(java.util.UUID, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.IAudioService.Stub android.os.IBinder asBinder()'>
+    <item name='android.media.MediaSyncEvent android.media.MediaSyncEvent createEvent(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaRouter.RouteCategory java.lang.String toString()'>
+    <item name='android.media.IAudioFocusDispatcher.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.AudioService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.Metadata byte[] getByteArray(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaRouter android.media.MediaRouter.UserRouteInfo createUserRoute(android.media.MediaRouter.RouteCategory)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IRingtonePlayer.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaRouter.RouteInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaFile android.media.MediaFile.MediaFileType getFileType(java.lang.String) 0'>
@@ -287,10 +335,16 @@
     <item name='android.media.MediaExtractor void setDataSource(android.content.Context, android.net.Uri, java.util.Map&lt;java.lang.String,java.lang.String&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.IRemoteControlClient.Stub android.os.IBinder asBinder()'>
+    <item name='android.media.Metadata java.util.Set&lt;java.lang.Integer&gt; keySet()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaFormat android.media.MediaFormat createAudioFormat(java.lang.String, int, int)'>
+    <item name='android.media.IRemoteVolumeObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.Metadata java.util.Date getDate(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaFile java.lang.String getFileTitle(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.JetPlayer boolean loadJetFile(android.content.res.AssetFileDescriptor) 0'>
@@ -299,10 +353,19 @@
     <item name='android.media.MediaRouter void addUserRoute(android.media.MediaRouter.UserRouteInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.MediaRouter.RouteGroup void addRoute(android.media.MediaRouter.RouteInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaDrm android.media.MediaDrm.CryptoSession getCryptoSession(byte[], java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.MediaMuxer MediaMuxer(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaRouter.RouteGroup void addRoute(android.media.MediaRouter.RouteInfo) 0'>
+    <item name='android.media.MediaExtractor android.media.MediaFormat getTrackFormat(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IRingtonePlayer.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaDrm boolean isCryptoSchemeSupported(java.util.UUID) 0'>
@@ -314,27 +377,18 @@
     <item name='android.media.AudioManager void preDispatchKeyEvent(android.view.KeyEvent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.RemoteControlClient.MetadataEditor android.media.RemoteControlClient.MetadataEditor putBitmap(int, android.graphics.Bitmap)'>
+    <item name='android.media.IRingtonePlayer.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.IRingtonePlayer.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.media.RemoteControlClient.MetadataEditor android.media.RemoteControlClient.MetadataEditor putBitmap(int, android.graphics.Bitmap)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.AudioRoutesInfo AudioRoutesInfo(android.media.AudioRoutesInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MiniThumbFile android.media.MiniThumbFile instance(android.net.Uri)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.Metadata java.util.Set&lt;java.lang.Integer&gt; keySet()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.SoundPool int load(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.Metadata java.util.Date getDate(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.MediaPlayer void setDataSource(android.content.Context, android.net.Uri) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -347,25 +401,46 @@
     <item name='android.media.AmrInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.DecoderCapabilities java.util.List&lt;android.media.DecoderCapabilities.AudioDecoder&gt; getAudioDecoders()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaCodec android.media.MediaCodec createByCodecName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.JetPlayer boolean setMuteArray(boolean[], boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaSyncEvent android.media.MediaSyncEvent setAudioSessionId(int)'>
+    <item name='android.media.ResampleInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.AudioRecord void startRecording(android.media.MediaSyncEvent) 0'>
+    <item name='android.media.MediaRouter android.media.MediaRouter.RouteCategory createRouteCategory(int, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.MediaRecorder void setProfile(android.media.CamcorderProfile) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.DecoderCapabilities.VideoDecoder android.media.DecoderCapabilities.VideoDecoder valueOf(java.lang.String)'>
+    <item name='android.media.AudioRecord void startRecording(android.media.MediaSyncEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IRemoteControlDisplay.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.AmrInputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.IAudioFocusDispatcher.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaCodec android.media.MediaCodec createDecoderByType(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.RemoteDisplay android.media.RemoteDisplay listen(java.lang.String, android.media.RemoteDisplay.Listener, android.os.Handler) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.MediaRouter android.media.MediaRouter.UserRouteInfo createUserRoute(android.media.MediaRouter.RouteCategory)'>
+    <item name='android.media.IAudioRoutesObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.MediaFormat java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/media/audiofx/annotations.xml b/android-sdk-annotations/android/media/audiofx/annotations.xml
index ebd4c4690f0..71bb49617dc 100644
--- a/android-sdk-annotations/android/media/audiofx/annotations.xml
+++ b/android-sdk-annotations/android/media/audiofx/annotations.xml
@@ -1,13 +1,4 @@
 <root>
-    <item name='android.media.audiofx.BassBoost android.media.audiofx.BassBoost.Settings getProperties()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.audiofx.EnvironmentalReverb android.media.audiofx.EnvironmentalReverb.Settings getProperties()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.audiofx.BassBoost.Settings java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.audiofx.BassBoost.Settings Settings(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,9 +11,6 @@
     <item name='android.media.audiofx.Virtualizer void setProperties(android.media.audiofx.Virtualizer.Settings) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.AudioEffect byte[] concatArrays(byte[]...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.audiofx.AudioEffect AudioEffect(java.util.UUID, java.util.UUID, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -35,22 +23,25 @@
     <item name='android.media.audiofx.AudioEffect int byteArrayToInt(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.audiofx.Virtualizer.Settings java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.audiofx.AudioEffect int byteArrayToInt(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.audiofx.AudioEffect AudioEffect(java.util.UUID, java.util.UUID, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.Virtualizer.Settings java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.audiofx.Virtualizer.Settings Settings(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.audiofx.PresetReverb void setProperties(android.media.audiofx.PresetReverb.Settings) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.EnvironmentalReverb.Settings java.lang.String toString()'>
+    <item name='android.media.audiofx.Equalizer android.media.audiofx.Equalizer.Settings getProperties()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.audiofx.AudioEffect byte[] concatArrays(byte[]...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.audiofx.AudioEffect int setParameter(byte[], byte[]) 0'>
@@ -59,9 +50,6 @@
     <item name='android.media.audiofx.Equalizer.Settings Settings(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.PresetReverb android.media.audiofx.PresetReverb.Settings getProperties()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.audiofx.EnvironmentalReverb.Settings Settings(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,16 +68,22 @@
     <item name='android.media.audiofx.AudioEffect int getParameter(int, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.audiofx.Equalizer short[] getBandLevelRange()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.audiofx.AudioEffect int getParameter(byte[], byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.audiofx.EnvironmentalReverb.Settings java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.audiofx.AudioEffect int getParameter(int, int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.PresetReverb.Settings java.lang.String toString()'>
+    <item name='android.media.audiofx.AudioEffect int setParameter(int[], int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.AudioEffect int setParameter(int[], int[]) 0'>
+    <item name='android.media.audiofx.Equalizer.Settings java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.audiofx.AudioEffect byte[] concatArrays(byte[]...) 0'>
@@ -98,34 +92,37 @@
     <item name='android.media.audiofx.AudioEffect short byteArrayToShort(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.Virtualizer android.media.audiofx.Virtualizer.Settings getProperties()'>
+    <item name='android.media.audiofx.AudioEffect int getParameter(int[], byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.AudioEffect int getParameter(int[], byte[]) 0'>
+    <item name='android.media.audiofx.PresetReverb android.media.audiofx.PresetReverb.Settings getProperties()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.audiofx.AudioEffect int setParameter(int, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.AudioEffect int setParameter(int[], byte[]) 0'>
+    <item name='android.media.audiofx.Virtualizer android.media.audiofx.Virtualizer.Settings getProperties()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.Equalizer int[] getBandFreqRange(short)'>
+    <item name='android.media.audiofx.EnvironmentalReverb android.media.audiofx.EnvironmentalReverb.Settings getProperties()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.audiofx.AudioEffect int setParameter(int[], byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.audiofx.EnvironmentalReverb void setProperties(android.media.audiofx.EnvironmentalReverb.Settings) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.Equalizer short[] getBandLevelRange()'>
+    <item name='android.media.audiofx.PresetReverb.Settings java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.audiofx.AudioEffect int command(int, byte[], byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.Equalizer android.media.audiofx.Equalizer.Settings getProperties()'>
+    <item name='android.media.audiofx.Equalizer int[] getBandFreqRange(short)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.audiofx.Equalizer.Settings java.lang.String toString()'>
+    <item name='android.media.audiofx.BassBoost.Settings java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.audiofx.AudioEffect int getParameter(int, short[]) 1'>
@@ -134,6 +131,9 @@
     <item name='android.media.audiofx.AudioEffect int getParameter(int[], short[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.audiofx.BassBoost android.media.audiofx.BassBoost.Settings getProperties()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.audiofx.AudioEffect short byteArrayToShort(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/media/effect/annotations.xml b/android-sdk-annotations/android/media/effect/annotations.xml
index c8a94c15dd9..8b9c13eff2e 100644
--- a/android-sdk-annotations/android/media/effect/annotations.xml
+++ b/android-sdk-annotations/android/media/effect/annotations.xml
@@ -1,20 +1,38 @@
 <root>
-    <item name='android.media.effect.FilterEffect android.filterfw.core.Frame frameFromTexture(int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.effect.SizeChangeEffect SizeChangeEffect(android.media.effect.EffectContext, java.lang.String, java.lang.Class, java.lang.String, java.lang.String, java.lang.Object...) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.effect.SingleFilterEffect SingleFilterEffect(android.media.effect.EffectContext, java.lang.String, java.lang.Class, java.lang.String, java.lang.String, java.lang.Object...) 2'>
+    <item name='android.media.effect.FilterEffect android.filterfw.core.Frame frameFromTexture(int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.effect.FilterGraphEffect void setParameter(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.effect.EffectContext android.media.effect.EffectContext createWithCurrentGlContext()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.effect.Effect void setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.effect.SingleFilterEffect void setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.effect.SingleFilterEffect SingleFilterEffect(android.media.effect.EffectContext, java.lang.String, java.lang.Class, java.lang.String, java.lang.String, java.lang.Object...) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.effect.SizeChangeEffect SizeChangeEffect(android.media.effect.EffectContext, java.lang.String, java.lang.Class, java.lang.String, java.lang.String, java.lang.Object...) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.effect.SingleFilterEffect SingleFilterEffect(android.media.effect.EffectContext, java.lang.String, java.lang.Class, java.lang.String, java.lang.String, java.lang.Object...) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.effect.SingleFilterEffect void setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.effect.FilterGraphEffect void setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.effect.Effect void setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/media/effect/effects/annotations.xml b/android-sdk-annotations/android/media/effect/effects/annotations.xml
index 129f3d4cc70..5384ffa1c91 100644
--- a/android-sdk-annotations/android/media/effect/effects/annotations.xml
+++ b/android-sdk-annotations/android/media/effect/effects/annotations.xml
@@ -1,5 +1,14 @@
 <root>
+    <item name='android.media.effect.effects.IdentityEffect void setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.effect.effects.BackDropperEffect void setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.effect.effects.BackDropperEffect void setParameter(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.effect.effects.IdentityEffect void setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/media/videoeditor/annotations.xml b/android-sdk-annotations/android/media/videoeditor/annotations.xml
index 1122c76723b..1bec82a8ae0 100644
--- a/android-sdk-annotations/android/media/videoeditor/annotations.xml
+++ b/android-sdk-annotations/android/media/videoeditor/annotations.xml
@@ -1,7 +1,13 @@
 <root>
+    <item name='android.media.videoeditor.VideoEditorImpl android.media.videoeditor.Transition removeTransition(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.videoeditor.VideoEditorImpl java.util.List&lt;android.media.videoeditor.AudioTrack&gt; getAllAudioTracks()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.videoeditor.Overlay java.util.Map&lt;java.lang.String,java.lang.String&gt; getUserAttributes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.videoeditor.MediaItem void addOverlay(android.media.videoeditor.Overlay) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -14,48 +20,69 @@
     <item name='android.media.videoeditor.EffectKenBurns EffectKenBurns(android.media.videoeditor.MediaItem, java.lang.String, android.graphics.Rect, android.graphics.Rect, long, long) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.MediaItem java.lang.String getFilename()'>
+    <item name='android.media.videoeditor.VideoEditorImpl java.util.List&lt;android.media.videoeditor.Transition&gt; getAllTransitions()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditor void startPreview(android.view.SurfaceHolder, long, long, boolean, int, android.media.videoeditor.VideoEditor.PreviewProgressListener) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.AudioTrack AudioTrack(android.media.videoeditor.VideoEditor, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.MediaProperties int[] getAllSupportedAspectRatios()'>
+    <item name='android.media.videoeditor.VideoEditor void export(java.lang.String, int, int, int, int, android.media.videoeditor.VideoEditor.ExportProgressListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.TransitionAlpha java.lang.String getMaskFilename()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditor void export(java.lang.String, int, int, android.media.videoeditor.VideoEditor.ExportProgressListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditorFactory android.media.videoeditor.VideoEditor create(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.MediaVideoItem void addEffect(android.media.videoeditor.Effect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.VideoEditorImpl java.util.List&lt;android.media.videoeditor.MediaItem&gt; getAllMediaItems()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.videoeditor.VideoEditorImpl void startPreview(android.view.SurfaceHolder, long, long, boolean, int, android.media.videoeditor.VideoEditor.PreviewProgressListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.VideoEditorFactory android.media.videoeditor.VideoEditor load(java.lang.String, boolean)'>
+    <item name='android.media.videoeditor.MediaArtistNativeHelper.Version android.media.videoeditor.MediaArtistNativeHelper.Version getVersion()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.VideoEditorImpl android.media.videoeditor.AudioTrack removeAudioTrack(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.videoeditor.OverlayFrame OverlayFrame(android.media.videoeditor.MediaItem, java.lang.String, android.graphics.Bitmap, long, long) 0'>
+    <item name='android.media.videoeditor.Overlay android.media.videoeditor.MediaItem getMediaItem()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.MediaProperties android.util.Pair&lt;java.lang.Integer,java.lang.Integer&gt;[] getSupportedResolutions(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.videoeditor.OverlayFrame OverlayFrame(android.media.videoeditor.MediaItem, java.lang.String, android.graphics.Bitmap, long, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.videoeditor.Overlay Overlay(android.media.videoeditor.MediaItem, java.lang.String, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.MediaProperties int[] getSupportedVideoCodecs()'>
+    <item name='android.media.videoeditor.MediaItem android.graphics.Bitmap[] getThumbnailList(int, int, long, long, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.AudioTrack java.lang.String getFilename()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditorImpl java.util.List&lt;android.media.videoeditor.MediaItem&gt; getAllMediaItems()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditor java.util.List&lt;android.media.videoeditor.AudioTrack&gt; getAllAudioTracks()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.MediaProperties int[] getSupportedAudioCodecs()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.MediaItem java.lang.String getFilename()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.EffectKenBurns EffectKenBurns(android.media.videoeditor.MediaItem, java.lang.String, android.graphics.Rect, android.graphics.Rect, long, long) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.MediaArtistNativeHelper.Version android.media.videoeditor.MediaArtistNativeHelper.Version getVersion()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.videoeditor.VideoEditorImpl void startPreview(android.view.SurfaceHolder, long, long, boolean, int, android.media.videoeditor.VideoEditor.PreviewProgressListener) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -65,25 +92,19 @@
     <item name='android.media.videoeditor.MediaItem MediaItem(android.media.videoeditor.VideoEditor, java.lang.String, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.VideoEditorFactory android.media.videoeditor.VideoEditor create(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.videoeditor.AudioTrack AudioTrack(android.media.videoeditor.VideoEditor, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.TransitionAlpha TransitionAlpha(java.lang.String, android.media.videoeditor.MediaItem, android.media.videoeditor.MediaItem, long, int, java.lang.String, int, boolean) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.MediaItem android.graphics.Bitmap[] getThumbnailList(int, int, long, long, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.media.videoeditor.MediaImageItem MediaImageItem(android.media.videoeditor.VideoEditor, java.lang.String, java.lang.String, long, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.MediaVideoItem MediaVideoItem(android.media.videoeditor.VideoEditor, java.lang.String, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.MediaProperties int[] getSupportedVideoFileFormat()'>
+    <item name='android.media.videoeditor.MediaProperties int[] getAllSupportedAspectRatios()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.EffectColor EffectColor(android.media.videoeditor.MediaItem, java.lang.String, long, long, int, int) 0'>
@@ -92,34 +113,46 @@
     <item name='android.media.videoeditor.MediaVideoItem long renderFrame(android.view.SurfaceHolder, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.Overlay java.util.Map&lt;java.lang.String,java.lang.String&gt; getUserAttributes()'>
+    <item name='android.media.videoeditor.VideoEditor void startPreview(android.view.SurfaceHolder, long, long, boolean, int, android.media.videoeditor.VideoEditor.PreviewProgressListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditor long renderPreviewFrame(android.view.SurfaceHolder, long, android.media.videoeditor.VideoEditor.OverlayData) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.MediaProperties int[] getSupportedVideoFileFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.VideoEditorFactory android.media.videoeditor.VideoEditor create(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.VideoEditorImpl java.util.List&lt;android.media.videoeditor.Transition&gt; getAllTransitions()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.videoeditor.EffectKenBurns EffectKenBurns(android.media.videoeditor.MediaItem, java.lang.String, android.graphics.Rect, android.graphics.Rect, long, long) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.videoeditor.MediaItem java.util.List&lt;android.media.videoeditor.Effect&gt; getAllEffects()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.media.videoeditor.TransitionAlpha java.lang.String getMaskFilename()'>
+    <item name='android.media.videoeditor.VideoEditor void addAudioTrack(android.media.videoeditor.AudioTrack) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.MediaItem java.util.List&lt;android.media.videoeditor.Overlay&gt; getAllOverlays()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.media.videoeditor.EffectKenBurns EffectKenBurns(android.media.videoeditor.MediaItem, java.lang.String, android.graphics.Rect, android.graphics.Rect, long, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditor android.media.videoeditor.Transition removeTransition(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditor void clearSurface(android.view.SurfaceHolder) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditor java.util.List&lt;android.media.videoeditor.Transition&gt; getAllTransitions()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.media.videoeditor.Effect Effect(android.media.videoeditor.MediaItem, java.lang.String, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.MediaProperties int[] getSupportedAudioCodecs()'>
+    <item name='android.media.videoeditor.MediaItem java.util.List&lt;android.media.videoeditor.Effect&gt; getAllEffects()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.Overlay android.media.videoeditor.MediaItem getMediaItem()'>
+    <item name='android.media.videoeditor.VideoEditor void addTransition(android.media.videoeditor.Transition) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.MediaProperties int[] getSupportedVideoCodecs()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.MediaItem MediaItem(android.media.videoeditor.VideoEditor, java.lang.String, java.lang.String, int) 2'>
@@ -134,13 +167,22 @@
     <item name='android.media.videoeditor.VideoEditorImpl void addTransition(android.media.videoeditor.Transition) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.AudioTrack java.lang.String getFilename()'>
+    <item name='android.media.videoeditor.VideoEditorImpl android.media.videoeditor.AudioTrack removeAudioTrack(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.MediaImageItem MediaImageItem(android.media.videoeditor.VideoEditor, java.lang.String, java.lang.String, long, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.VideoEditorImpl android.media.videoeditor.Transition removeTransition(java.lang.String)'>
+    <item name='android.media.videoeditor.VideoEditor void addMediaItem(android.media.videoeditor.MediaItem) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditorFactory android.media.videoeditor.VideoEditor load(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.MediaProperties int[] getSupportedVideoBitrates()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.media.videoeditor.VideoEditor android.media.videoeditor.AudioTrack removeAudioTrack(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.media.videoeditor.VideoEditorImpl void clearSurface(android.view.SurfaceHolder) 0'>
@@ -152,7 +194,7 @@
     <item name='android.media.videoeditor.MediaVideoItem MediaVideoItem(android.media.videoeditor.VideoEditor, java.lang.String, java.lang.String, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.media.videoeditor.MediaProperties int[] getSupportedVideoBitrates()'>
+    <item name='android.media.videoeditor.VideoEditor java.util.List&lt;android.media.videoeditor.MediaItem&gt; getAllMediaItems()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/mtp/annotations.xml b/android-sdk-annotations/android/mtp/annotations.xml
index 5e471cc07b4..6635932cb9b 100644
--- a/android-sdk-annotations/android/mtp/annotations.xml
+++ b/android-sdk-annotations/android/mtp/annotations.xml
@@ -5,12 +5,6 @@
     <item name='android.mtp.MtpDevice boolean open(android.hardware.usb.UsbDeviceConnection) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.mtp.MtpStorage java.lang.String getDescription()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.mtp.MtpStorage java.lang.String getPath()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.mtp.MtpStorage MtpStorage(android.os.storage.StorageVolume, android.content.Context) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,10 +14,16 @@
     <item name='android.mtp.MtpServer void removeStorage(android.mtp.MtpStorage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.mtp.MtpStorage java.lang.String getDescription()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.mtp.MtpDatabase void addStorage(android.mtp.MtpStorage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.mtp.MtpDatabase MtpDatabase(android.content.Context, java.lang.String, java.lang.String, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.mtp.MtpStorage java.lang.String getPath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/net/annotations.xml b/android-sdk-annotations/android/net/annotations.xml
index e6b69e245cc..d03f1619a00 100644
--- a/android-sdk-annotations/android/net/annotations.xml
+++ b/android-sdk-annotations/android/net/annotations.xml
@@ -1,59 +1,80 @@
 <root>
-    <item name='android.net.CaptivePortalTracker android.net.CaptivePortalTracker makeCaptivePortalTracker(android.content.Context, android.net.IConnectivityManager) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats subtract(android.net.NetworkStats, android.net.NetworkStats, android.net.NetworkStats.NonMonotonicObserver&lt;C&gt;, C) 0'>
+    <item name='android.net.MailTo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkUtils java.net.InetAddress numericToInetAddress(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.CaptivePortalTracker android.net.CaptivePortalTracker makeCaptivePortalTracker(android.content.Context, android.net.IConnectivityManager) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.INetworkPolicyManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats android.net.NetworkStats subtract(android.net.NetworkStats, android.net.NetworkStats, android.net.NetworkStats.NonMonotonicObserver&lt;C&gt;, C) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.INetworkManagementEventObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.INetworkPolicyManager void setNetworkPolicies(android.net.NetworkPolicy[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.NetworkStatsHistory.ParcelUtils long[] readLongArray(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkSocket android.net.LinkCapabilities getCapabilities(java.util.Set&lt;java.lang.Integer&gt;)'>
+    <item name='android.net.NetworkStateTracker android.net.LinkProperties getLinkProperties()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.SSLCertificateSocketFactory void setSoWriteTimeout(java.net.Socket, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder path(java.lang.String)'>
+    <item name='android.net.WebAddress java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStatsHistory android.net.NetworkStatsHistory.Entry getValues(int, android.net.NetworkStatsHistory.Entry)'>
+    <item name='android.net.INetworkPolicyManager.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.SSLCertificateSocketFactory javax.net.ssl.SSLSocketFactory getDefault(int, android.net.SSLSessionCache)'>
+    <item name='android.net.DhcpInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkPolicy java.lang.String toString()'>
+    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getTotal(android.net.NetworkStats.Entry)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.MailTo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder setMtu(int)'>
+    <item name='android.net.LinkAddress java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkStats android.net.NetworkStats subtract(android.net.NetworkStats) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.EthernetDataTracker android.net.LinkCapabilities getLinkCapabilities()'>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder setMtu(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.RouteInfo android.net.LinkAddress getDestination()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.INetworkPolicyManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats addValues(android.net.NetworkStats.Entry)'>
+    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAllButNulAndAngleBracketsLegal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats int[] getUniqueUids()'>
+    <item name='android.net.INetworkManagementEventObserver void interfaceRemoved(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.BaseNetworkStateTracker android.net.LinkProperties getLinkProperties()'>
+    <item name='android.net.NetworkPolicy java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder path(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.INetworkPolicyListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats android.net.NetworkStats clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.INetworkStatsSession.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.SSLCertificateSocketFactory void setHostname(java.net.Socket, java.lang.String) 0'>
@@ -62,31 +83,46 @@
     <item name='android.net.NetworkStatsHistory.DataStreamUtils void writeVarLong(java.io.DataOutputStream, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder appendEncodedPath(java.lang.String)'>
+    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getUrlLegal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LocalSocketAddress.Namespace android.net.LocalSocketAddress.Namespace valueOf(java.lang.String) 0'>
+    <item name='android.net.Uri java.util.Set&lt;java.lang.String&gt; getQueryParameterNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.DhcpResults void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties java.util.Collection&lt;android.net.LinkProperties&gt; getStackedLinks()'>
+    <item name='android.net.LinkSocket java.util.Set&lt;java.lang.Integer&gt; getTrackedCapabilities()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.net.InetAddress, int)'>
+    <item name='android.net.LocalSocketAddress.Namespace android.net.LocalSocketAddress.Namespace valueOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.BaseNetworkStateTracker android.net.LinkProperties getLinkProperties()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.LinkProperties boolean isIdenticalRoutes(android.net.LinkProperties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateWifi(java.lang.String)'>
+    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateEthernet()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkIdentity java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkPolicy NetworkPolicy(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder scheme(java.lang.String)'>
+    <item name='android.net.Uri android.net.Uri withAppendedPath(android.net.Uri, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkPolicy int compareTo(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats android.net.NetworkStats subtract(android.net.NetworkStats, android.net.NetworkStats, android.net.NetworkStats.NonMonotonicObserver&lt;C&gt;, C)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkIdentity android.net.NetworkIdentity buildNetworkIdentity(android.content.Context, android.net.NetworkState) 1'>
@@ -95,10 +131,10 @@
     <item name='android.net.NetworkStatsHistory NetworkStatsHistory(java.io.DataInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats subtract(android.net.NetworkStats)'>
+    <item name='android.net.NetworkStats android.net.NetworkStats combineValues(java.lang.String, int, int, long, long, long, long, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addRoute(java.lang.String, int)'>
+    <item name='android.net.NetworkStats java.lang.String tagToString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.Uri void writeToParcel(android.os.Parcel, android.net.Uri) 0'>
@@ -107,61 +143,52 @@
     <item name='android.net.INetworkStatsSession.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties java.util.Collection&lt;java.net.InetAddress&gt; getDnses()'>
+    <item name='android.net.INetworkPolicyListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.DummyDataStateTracker java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.VpnService boolean protect(java.net.DatagramSocket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties java.util.Collection&lt;android.net.RouteInfo&gt; getAllRoutes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.VpnService android.content.Intent prepare(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.DnsPinger java.util.List&lt;java.net.InetAddress&gt; getDnsList()'>
+    <item name='android.net.NetworkUtils java.net.InetAddress getNetworkPart(java.net.InetAddress, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.BaseNetworkStateTracker android.net.LinkCapabilities getLinkCapabilities()'>
+    <item name='android.net.NetworkStats android.net.NetworkStats combineValues(java.lang.String, int, int, int, long, long, long, long, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getUrlAndSpaceLegal()'>
+    <item name='android.net.LinkProperties java.util.Collection&lt;java.net.InetAddress&gt; getDnses()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder setSession(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.RouteInfo java.net.InetAddress getGateway()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.DummyDataStateTracker android.net.LinkProperties getLinkProperties()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.Uri android.net.Uri parse(java.lang.String)'>
+    <item name='android.net.LinkProperties android.net.LinkProperties.CompareResult&lt;java.net.InetAddress&gt; compareDnses(android.net.LinkProperties)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.BaseNetworkStateTracker void startMonitoring(android.content.Context, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Proxy java.net.Proxy getProxy(android.content.Context, java.lang.String)'>
+    <item name='android.net.LocalSocket java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAllIllegal()'>
+    <item name='android.net.InterfaceConfiguration java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.Proxy int getPort(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAllButNulLegal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.Uri.Builder android.net.Uri.Builder opaquePart(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats.Entry java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedFragment(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.WebAddress java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.Proxy int getPort(android.content.Context) 0'>
+    <item name='android.net.INetworkManagementEventObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.TrafficStats void tagSocket(java.net.Socket) 0'>
@@ -170,10 +197,10 @@
     <item name='android.net.NetworkStats android.net.NetworkStats subtract(android.net.NetworkStats, android.net.NetworkStats, android.net.NetworkStats.NonMonotonicObserver&lt;C&gt;, C) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri boolean getBooleanQueryParameter(java.lang.String, boolean) 0'>
+    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.CaptivePortalTracker android.net.CaptivePortalTracker makeCaptivePortalTracker(android.content.Context, android.net.IConnectivityManager)'>
+    <item name='android.net.Uri boolean getBooleanQueryParameter(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkStats NetworkStats(android.os.Parcel) 0'>
@@ -182,7 +209,7 @@
     <item name='android.net.NetworkStatsHistory.DataStreamUtils long[] readVarLongArray(java.io.DataInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.RouteInfo java.lang.String toString()'>
+    <item name='android.net.LinkProperties java.util.Collection&lt;java.net.InetAddress&gt; getAddresses()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.UrlQuerySanitizer void registerParameters(java.lang.String[], android.net.UrlQuerySanitizer.ValueSanitizer) 0'>
@@ -191,67 +218,100 @@
     <item name='android.net.Proxy void validate(java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.LocalSocket android.net.LocalSocketAddress getRemoteSocketAddress()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.NetworkStats void combineAllValues(android.net.NetworkStats) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.LinkProperties java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.BaseNetworkStateTracker void startMonitoring(android.content.Context, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.SSLCertificateSocketFactory void setAlpnProtocols(byte[][]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.BaseNetworkStateTracker android.net.LinkCapabilities getLinkCapabilities()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getUrlAndSpaceLegal()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.NetworkTemplate void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.DummyDataStateTracker android.net.LinkCapabilities getLinkCapabilities()'>
+    <item name='android.net.LinkProperties android.net.LinkProperties.CompareResult&lt;android.net.RouteInfo&gt; compareRoutes(android.net.LinkProperties)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri java.util.List&lt;java.lang.String&gt; getQueryParameters(java.lang.String)'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder scheme(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.LinkProperties boolean isIdenticalAddresses(android.net.LinkProperties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri java.util.Set&lt;java.lang.String&gt; getQueryParameterNames()'>
+    <item name='android.net.LinkProperties java.util.Collection&lt;java.lang.String&gt; getAllInterfaceNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getUrlLegal()'>
+    <item name='android.net.SSLCertificateSocketFactory org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.Uri android.net.Uri fromFile(java.io.File)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStatsHistory.DataStreamUtils long[] readFullLongArray(java.io.DataInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkUtils java.net.InetAddress intToInetAddress(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkStatsHistory.ParcelUtils void writeLongArray(android.os.Parcel, long[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedOpaquePart(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getTotal(android.net.NetworkStats.Entry, java.util.HashSet&lt;java.lang.String&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.UrlQuerySanitizer java.util.Set&lt;java.lang.String&gt; getParameterSet()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateMobileAll(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.VpnService.Builder Builder(android.net.VpnService) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LocalSocket android.net.LocalSocketAddress getRemoteSocketAddress()'>
+    <item name='android.net.BaseNetworkStateTracker android.net.NetworkInfo getNetworkInfo()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStatsHistory android.net.NetworkStatsHistory.Entry getValues(long, long, android.net.NetworkStatsHistory.Entry)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.Uri android.net.Uri normalizeScheme()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedQuery(java.lang.String)'>
+    <item name='android.net.EthernetDataTracker void startMonitoring(android.content.Context, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkPolicy NetworkPolicy(android.net.NetworkTemplate, int, java.lang.String, long, long, boolean) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties java.util.Collection&lt;java.net.InetAddress&gt; getAddresses()'>
+    <item name='android.net.RouteInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder appendQueryParameter(java.lang.String, java.lang.String)'>
+    <item name='android.net.INetworkPolicyListener void onMeteredIfacesChanged(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.LinkProperties boolean isIdenticalStackedLinks(android.net.LinkProperties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri android.net.Uri fromParts(java.lang.String, java.lang.String, java.lang.String)'>
+    <item name='android.net.LinkProperties.CompareResult java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.DummyDataStateTracker java.lang.String toString()'>
+    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAllButWhitespaceLegal()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.DummyDataStateTracker android.net.LinkCapabilities getLinkCapabilities()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.UrlQuerySanitizer void parseEntry(java.lang.String, java.lang.String) 0'>
@@ -260,34 +320,13 @@
     <item name='android.net.Uri int compareTo(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties.CompareResult java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.DhcpInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.INetworkStatsSession.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.LocalSocketAddress.Namespace android.net.LocalSocketAddress.Namespace valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateMobile4g(java.lang.String)'>
+    <item name='android.net.Uri android.net.Uri getCanonicalUri()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.VpnService.Builder android.net.VpnService.Builder addRoute(java.net.InetAddress, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder query(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.LocalSocket java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.LocalServerSocket android.net.LocalSocket accept()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats combineValues(android.net.NetworkStats.Entry)'>
+    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAllIllegal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkPolicy NetworkPolicy(android.net.NetworkTemplate, int, java.lang.String, long, long, long, long, boolean, boolean) 0'>
@@ -296,7 +335,7 @@
     <item name='android.net.LinkAddress void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkInfo.State android.net.NetworkInfo.State valueOf(java.lang.String)'>
+    <item name='android.net.LinkCapabilities java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.RouteInfo void writeToParcel(android.os.Parcel, int) 0'>
@@ -305,19 +344,16 @@
     <item name='android.net.SSLCertificateSocketFactory void setUseSessionTickets(java.net.Socket, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties java.util.Collection&lt;java.lang.String&gt; getAllInterfaceNames()'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedPath(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int)'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedAuthority(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats withoutUids(int[])'>
+    <item name='android.net.NetworkStateTracker android.net.NetworkInfo getNetworkInfo()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addDnsServer(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.NetworkInfo java.lang.String toString()'>
+    <item name='android.net.INetworkPolicyManager boolean isNetworkMetered(android.net.NetworkState) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkStatsHistory.DataStreamUtils void writeVarLongArray(java.io.DataOutputStream, long[], int) 0'>
@@ -329,43 +365,67 @@
     <item name='android.net.UrlQuerySanitizer void parseEntry(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.Uri java.util.List&lt;java.lang.String&gt; getPathSegments()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.NetworkInfo.State android.net.NetworkInfo.State valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.LinkAddress LinkAddress(java.net.InterfaceAddress) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder setConfigureIntent(android.app.PendingIntent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.Uri android.net.Uri fromParts(java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.Uri int compareTo(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.EthernetDataTracker java.lang.String getTcpBufferSizesPropName()'>
+    <item name='android.net.Uri android.net.Uri parse(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.SSLCertificateSocketFactory javax.net.SocketFactory getDefault(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.LinkSocket void connect(java.net.SocketAddress) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkUtils java.net.InetAddress hexToInet6Address(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.UrlQuerySanitizer java.util.Set&lt;java.lang.String&gt; getParameterSet()'>
+    <item name='android.net.EthernetDataTracker java.lang.String getTcpBufferSizesPropName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkTemplate java.lang.String toString()'>
+    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.InterfaceConfiguration void clearFlag(java.lang.String) 0'>
+    <item name='android.net.DhcpStateMachine android.net.DhcpStateMachine makeDhcpStateMachine(android.content.Context, com.android.internal.util.StateMachine, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats android.net.NetworkStats groupedByUid()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkTemplate boolean matches(android.net.NetworkIdentity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.MobileDataStateTracker android.net.LinkProperties getLinkProperties()'>
+    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateWifiWildcard()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.InterfaceConfiguration void clearFlag(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.ProxyProperties java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkPolicy NetworkPolicy(android.net.NetworkTemplate, int, java.lang.String, long, long, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder setConfigureIntent(android.app.PendingIntent)'>
+    <item name='android.net.IConnectivityManager void startLegacyVpn(com.android.internal.net.VpnProfile) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.DnsPinger java.util.List&lt;java.net.InetAddress&gt; getDnsList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.UrlQuerySanitizer void parseUrl(java.lang.String) 0'>
@@ -374,46 +434,58 @@
     <item name='android.net.NetworkQuotaInfo NetworkQuotaInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats combineValues(java.lang.String, int, int, int, long, long, long, long, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.Proxy org.apache.http.conn.routing.HttpRoutePlanner getAndroidProxySelectorRoutePlanner(android.content.Context)'>
+    <item name='android.net.INetworkStatsService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.Uri android.net.Uri fromParts(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAmpLegal()'>
+    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateMobileWildcard()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats groupedByUid()'>
+    <item name='android.net.IConnectivityManager.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateWifiWildcard()'>
+    <item name='android.net.LinkProperties java.util.Collection&lt;android.net.LinkAddress&gt; getLinkAddresses()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.DummyDataStateTracker void startMonitoring(android.content.Context, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkPolicyManager long computeNextCycleBoundary(long, android.net.NetworkPolicy) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.INetworkPolicyListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.Uri java.util.List&lt;java.lang.String&gt; getQueryParameters(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats java.lang.String setToString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats addValues(java.lang.String, int, int, int, long, long, long, long, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.NetworkPolicyManager long computeLastCycleBoundary(long, android.net.NetworkPolicy) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkPolicy NetworkPolicy(android.net.NetworkTemplate, int, java.lang.String, long, long, long, long, boolean, boolean) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addAddress(java.lang.String, int)'>
+    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getValues(int, android.net.NetworkStats.Entry)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateMobile3gLower(java.lang.String)'>
+    <item name='android.net.LinkProperties android.net.LinkProperties.CompareResult&lt;android.net.LinkAddress&gt; compareAddresses(android.net.LinkProperties)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats android.net.NetworkStats groupedByIface()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.DummyDataStateTracker void startMonitoring(android.content.Context, android.os.Handler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getTotalIncludingTags(android.net.NetworkStats.Entry)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.LinkProperties java.util.Collection&lt;android.net.RouteInfo&gt; getAllRoutes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.Uri.Builder android.net.Uri build()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.ProxyProperties void writeToParcel(android.os.Parcel, int) 0'>
@@ -422,43 +494,31 @@
     <item name='android.net.NetworkStatsHistory NetworkStatsHistory(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedPath(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.DummyDataStateTracker java.lang.String getTcpBufferSizesPropName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.NetworkInfo.DetailedState android.net.NetworkInfo.DetailedState valueOf(java.lang.String)'>
+    <item name='android.net.IConnectivityManager void captivePortalCheckComplete(android.net.NetworkInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkStatsHistory.DataStreamUtils long[] readFullLongArray(java.io.DataInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.INetworkPolicyManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.net.Uri java.util.List&lt;java.lang.String&gt; getQueryParameters(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.TrafficStats android.net.NetworkStats stopDataProfiling(android.content.Context)'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder fragment(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.INetworkPolicyManager android.net.NetworkQuotaInfo getNetworkQuotaInfo(android.net.NetworkState) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkState NetworkState(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStatsHistory java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addDnsServer(java.net.InetAddress)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.INetworkStatsService.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder authority(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.SSLCertificateSocketFactory void setNpnProtocols(byte[][]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean)'>
+    <item name='android.net.NetworkStats android.net.NetworkStats addIfaceValues(java.lang.String, long, long, long, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedFragment(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.TrafficStats void untagSocket(java.net.Socket) 0'>
@@ -467,16 +527,19 @@
     <item name='android.net.NetworkStatsHistory.DataStreamUtils long readVarLong(java.io.DataInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.UrlQuerySanitizer java.lang.String unescape(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.Uri android.net.Uri withAppendedPath(android.net.Uri, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkUtils java.lang.String[] makeStrings(java.util.Collection&lt;java.net.InetAddress&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAmpAndSpaceLegal()'>
+    <item name='android.net.NetworkIdentity android.net.NetworkIdentity buildNetworkIdentity(android.content.Context, android.net.NetworkState)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket()'>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addAddress(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.LinkProperties void writeToParcel(android.os.Parcel, int) 0'>
@@ -485,16 +548,16 @@
     <item name='android.net.DnsPinger DnsPinger(android.content.Context, java.lang.String, android.os.Looper, android.os.Handler, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.NetworkStateTracker void startMonitoring(android.content.Context, android.os.Handler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.DummyDataStateTracker java.lang.String getTcpBufferSizesPropName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.NetworkStatsHistory void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.InterfaceConfiguration java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAllButNulAndAngleBracketsLegal()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.SSLCertificateSocketFactory javax.net.SocketFactory getDefault(int)'>
+    <item name='android.net.UrlQuerySanitizer java.util.List&lt;android.net.UrlQuerySanitizer.ParameterValuePair&gt; getParameterList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkUtils int inetAddressToInt(java.net.Inet4Address) 0'>
@@ -503,85 +566,109 @@
     <item name='android.net.SSLCertificateSocketFactory byte[] getAlpnSelectedProtocol(java.net.Socket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkCapabilities android.net.LinkCapabilities createNeedsMap(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addAddress(java.net.InetAddress, int)'>
+    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateMobile3gLower(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.ConnectivityManager ConnectivityManager(android.net.IConnectivityManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getTotal(android.net.NetworkStats.Entry)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.LinkCapabilities void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri build()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.UrlQuerySanitizer void parseQuery(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.LinkProperties boolean isIdenticalHttpProxy(android.net.LinkProperties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkCapabilities java.util.Set&lt;java.util.Map.Entry&lt;java.lang.Integer,java.lang.String&gt;&gt; entrySet()'>
+    <item name='android.net.LinkSocket android.net.LinkCapabilities getCapabilities(java.util.Set&lt;java.lang.Integer&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.UrlQuerySanitizer java.lang.String unescape(java.lang.String)'>
+    <item name='android.net.LinkCapabilities java.util.Set&lt;java.lang.Integer&gt; keySet()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.InterfaceConfiguration void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri android.net.Uri withAppendedPath(android.net.Uri, java.lang.String)'>
+    <item name='android.net.NetworkUtils java.lang.String[] makeStrings(java.util.Collection&lt;java.net.InetAddress&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkIdentity android.net.NetworkIdentity buildNetworkIdentity(android.content.Context, android.net.NetworkState)'>
+    <item name='android.net.EthernetDataTracker android.net.LinkProperties getLinkProperties()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getTotal(android.net.NetworkStats.Entry, java.util.HashSet&lt;java.lang.String&gt;)'>
+    <item name='android.net.NetworkStateTracker void startMonitoring(android.content.Context, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkUtils java.net.InetAddress getNetworkPart(java.net.InetAddress, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.lang.String, int)'>
+    <item name='android.net.NetworkStatsHistory android.net.NetworkStatsHistory.Entry getValues(int, android.net.NetworkStatsHistory.Entry)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats clone()'>
+    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getSpaceLegal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats java.lang.String toString()'>
+    <item name='android.net.Uri java.lang.String toSafeString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.DummyDataStateTracker android.net.LinkProperties getLinkProperties()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.Uri java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.MobileDataStateTracker java.lang.String getTcpBufferSizesPropName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkPolicyManager void dumpPolicy(java.io.PrintWriter, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateWifi()'>
+    <item name='android.net.RouteInfo java.net.InetAddress getGateway()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.INetworkManagementEventObserver void interfaceAdded(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats int[] getUniqueUids()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.MobileDataStateTracker android.net.LinkProperties getLinkProperties()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkStatsHistory void writeToStream(java.io.DataOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.SSLCertificateSocketFactory javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.NetworkStats void dump(java.lang.String, java.io.PrintWriter) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.UrlQuerySanitizer java.util.List&lt;android.net.UrlQuerySanitizer.ParameterValuePair&gt; getParameterList()'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder appendEncodedPath(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addAddress(java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.LocalServerSocket android.net.LocalSocket accept()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedQuery(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkTemplate java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.VpnService.Builder android.net.VpnService.Builder addAddress(java.net.InetAddress, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStatsHistory void dump(com.android.internal.util.IndentingPrintWriter, boolean) 0'>
+    <item name='android.net.Uri android.net.Uri fromParts(java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getValues(int, android.net.NetworkStats.Entry)'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder appendQueryParameter(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStatsHistory void dump(com.android.internal.util.IndentingPrintWriter, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkStats android.net.NetworkStats addValues(android.net.NetworkStats.Entry) 0'>
@@ -590,22 +677,25 @@
     <item name='android.net.InterfaceConfiguration boolean hasFlag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder setSession(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStateTracker android.net.LinkCapabilities getLinkCapabilities()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats java.lang.String setToString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addRoute(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.Uri android.net.Uri fromFile(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkUtils java.lang.String[] makeStrings(java.util.Collection&lt;java.net.InetAddress&gt;)'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder clearQuery()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkSocket java.util.Set&lt;java.lang.Integer&gt; getTrackedCapabilities()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedOpaquePart(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getSpaceLegal()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.LinkProperties android.net.LinkProperties.CompareResult&lt;java.net.InetAddress&gt; compareDnses(android.net.LinkProperties)'>
+    <item name='android.net.MailTo android.net.MailTo parse(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkConfig NetworkConfig(java.lang.String) 0'>
@@ -614,43 +704,43 @@
     <item name='android.net.NetworkStats android.net.NetworkStats combineValues(android.net.NetworkStats.Entry) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.INetworkStatsSession.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.NetworkInfo.DetailedState android.net.NetworkInfo.DetailedState valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder encodedAuthority(java.lang.String)'>
+    <item name='android.net.NetworkStatsHistory android.net.NetworkStatsHistory.Entry getValues(long, long, long, android.net.NetworkStatsHistory.Entry)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.RouteInfo android.net.LinkAddress getDestination()'>
+    <item name='android.net.NetworkStats java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getTotal(android.net.NetworkStats.Entry, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.EthernetDataTracker android.net.LinkProperties getLinkProperties()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addRoute(java.net.InetAddress, int)'>
+    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAmpAndSpaceLegal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.EthernetDataTracker void startMonitoring(android.content.Context, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.MobileDataStateTracker java.lang.String getTcpBufferSizesPropName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.NetworkStatsHistory void recordHistory(android.net.NetworkStatsHistory, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateEthernet()'>
+    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateMobile4g(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkIdentity java.lang.String toString()'>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addRoute(java.net.InetAddress, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getTotalIncludingTags(android.net.NetworkStats.Entry)'>
+    <item name='android.net.NetworkStats android.net.NetworkStats subtract(android.net.NetworkStats)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.Proxy org.apache.http.conn.routing.HttpRoutePlanner getAndroidProxySelectorRoutePlanner(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.SSLCertificateSocketFactory byte[] getNpnSelectedProtocol(java.net.Socket) 0'>
@@ -659,13 +749,22 @@
     <item name='android.net.NetworkPolicyManager void dumpRules(java.io.PrintWriter, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.BaseNetworkStateTracker android.net.NetworkInfo getNetworkInfo()'>
+    <item name='android.net.MobileDataStateTracker android.net.LinkCapabilities getLinkCapabilities()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder clearQuery()'>
+    <item name='android.net.VpnService android.os.IBinder onBind(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStatsHistory android.net.NetworkStatsHistory.Entry getValues(long, long, long, android.net.NetworkStatsHistory.Entry)'>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addSearchDomain(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.DhcpResults java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.INetworkPolicyManager void registerListener(android.net.INetworkPolicyListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.LinkCapabilities java.util.Set&lt;java.util.Map.Entry&lt;java.lang.Integer,java.lang.String&gt;&gt; entrySet()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.Proxy void validate(java.lang.String, java.lang.String, java.lang.String) 1'>
@@ -674,16 +773,19 @@
     <item name='android.net.NetworkPolicyManager NetworkPolicyManager(android.net.INetworkPolicyManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.Uri android.net.Uri.Builder buildUpon()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.SSLSessionCache SSLSessionCache(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.DhcpStateMachine android.net.DhcpStateMachine makeDhcpStateMachine(android.content.Context, com.android.internal.util.StateMachine, java.lang.String)'>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addDnsServer(java.net.InetAddress)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateMobileAll(java.lang.String)'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder appendPath(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri android.net.Uri fromFile(java.io.File)'>
+    <item name='android.net.MobileDataStateTracker java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.WebAddress WebAddress(java.lang.String) 0'>
@@ -692,39 +794,42 @@
     <item name='android.net.UrlQuerySanitizer java.lang.String unescape(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.MobileDataStateTracker java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.NetworkStatsHistory void recordEntireHistory(android.net.NetworkStatsHistory) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties android.net.LinkProperties.CompareResult&lt;android.net.LinkAddress&gt; compareAddresses(android.net.LinkProperties)'>
+    <item name='android.net.INetworkPolicyManager void unregisterListener(android.net.INetworkPolicyListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkUtils java.net.InetAddress hexToInet6Address(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats combineValues(java.lang.String, int, int, long, long, long, long, long)'>
+    <item name='android.net.NetworkStats android.net.NetworkStats addValues(android.net.NetworkStats.Entry)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateMobileWildcard()'>
+    <item name='android.net.LinkCapabilities android.net.LinkCapabilities createNeedsMap(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties java.util.Collection&lt;android.net.LinkAddress&gt; getLinkAddresses()'>
+    <item name='android.net.MobileDataStateTracker void startMonitoring(android.content.Context, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.ProxyProperties java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAllButWhitespaceLegal()'>
+    <item name='android.net.NetworkInfo.DetailedState android.net.NetworkInfo.DetailedState valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.Uri java.lang.String getQueryParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.SSLCertificateSocketFactory javax.net.ssl.SSLSocketFactory getDefault(int, android.net.SSLSessionCache)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.INetworkManagementEventObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.NetworkStatsHistory NetworkStatsHistory(android.net.NetworkStatsHistory, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.LinkProperties java.util.Collection&lt;android.net.LinkProperties&gt; getStackedLinks()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.InterfaceConfiguration void setFlag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -734,13 +839,13 @@
     <item name='android.net.NetworkPolicy void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAllButNulLegal()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.Uri android.net.Uri parse(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats java.lang.String tagToString(int)'>
+    <item name='android.net.LinkSocket void connect(java.net.SocketAddress, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.UrlQuerySanitizer android.net.UrlQuerySanitizer.ValueSanitizer getAmpLegal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.Proxy void validate(java.lang.String, java.lang.String, java.lang.String) 2'>
@@ -749,139 +854,142 @@
     <item name='android.net.LinkProperties boolean isIdenticalInterfaceName(android.net.LinkProperties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LocalSocket void connect(android.net.LocalSocketAddress) 0'>
+    <item name='android.net.DnsPinger void handleMessage(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.DnsPinger void handleMessage(android.os.Message) 0'>
+    <item name='android.net.INetworkManagementEventObserver void interfaceClassDataActivityChanged(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.LocalSocket void connect(android.net.LocalSocketAddress) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.UrlQuerySanitizer UrlQuerySanitizer(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri android.net.Uri getCanonicalUri()'>
+    <item name='android.net.NetworkInfo.State android.net.NetworkInfo.State valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties android.net.LinkProperties.CompareResult&lt;android.net.RouteInfo&gt; compareRoutes(android.net.LinkProperties)'>
+    <item name='android.net.NetworkStats android.net.NetworkStats withoutUids(int[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties java.util.Collection&lt;android.net.RouteInfo&gt; getRoutes()'>
+    <item name='android.net.TrafficStats android.net.NetworkStats stopDataProfiling(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkStats.Entry void add(android.net.NetworkStats.Entry) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats addIfaceValues(java.lang.String, long, long, long, long)'>
+    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateWifi()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties java.lang.String toString()'>
+    <item name='android.net.LinkSocket android.net.LinkProperties getLinkProperties()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder fragment(java.lang.String)'>
+    <item name='android.net.NetworkStatsHistory android.net.NetworkStatsHistory.Entry getValues(long, long, android.net.NetworkStatsHistory.Entry)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.SSLCertificateSocketFactory org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache)'>
+    <item name='android.net.LocalSocketAddress.Namespace android.net.LocalSocketAddress.Namespace valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.ProxyProperties java.net.Proxy makeProxy()'>
+    <item name='android.net.NetworkInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.SSLCertificateSocketFactory void verifyHostname(java.net.Socket, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.LinkProperties java.util.Collection&lt;android.net.RouteInfo&gt; getRoutes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.NetworkStatsHistory void recordData(long, long, android.net.NetworkStats.Entry) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri.Builder android.net.Uri.Builder appendPath(java.lang.String)'>
+    <item name='android.net.NetworkStats android.net.NetworkStats combineValues(android.net.NetworkStats.Entry)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkCapabilities java.lang.String toString()'>
+    <item name='android.net.INetworkStatsService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStats android.net.NetworkStats addValues(java.lang.String, int, int, int, long, long, long, long, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.DhcpInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.INetworkManagementEventObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.LinkCapabilities java.util.Collection&lt;java.lang.String&gt; values()'>
+    <item name='android.net.CaptivePortalTracker android.net.CaptivePortalTracker makeCaptivePortalTracker(android.content.Context, android.net.IConnectivityManager)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkQuotaInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkUtils java.net.InetAddress intToInetAddress(int)'>
+    <item name='android.net.NetworkStats.Entry java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.INetworkPolicyListener.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.NetworkStatsHistory.DataStreamUtils long[] readFullLongArray(java.io.DataInputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.DhcpResults java.lang.String toString()'>
+    <item name='android.net.NetworkStateTracker java.lang.String getTcpBufferSizesPropName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkPolicyManager android.net.NetworkPolicyManager from(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkProperties boolean isIdenticalDnses(android.net.LinkProperties) 0'>
+    <item name='android.net.IConnectivityManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.Uri android.net.Uri normalizeScheme()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkStatsHistory java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkStatsHistory long randomLong(java.util.Random, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkAddress java.lang.String toString()'>
+    <item name='android.net.LinkProperties boolean isIdenticalDnses(android.net.LinkProperties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats groupedByIface()'>
+    <item name='android.net.SSLCertificateSocketFactory javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.LinkCapabilities java.util.Collection&lt;java.lang.String&gt; values()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.Proxy java.lang.String getHost(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.MailTo android.net.MailTo parse(java.lang.String) 0'>
+    <item name='android.net.EthernetDataTracker android.net.LinkCapabilities getLinkCapabilities()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats android.net.NetworkStats subtract(android.net.NetworkStats, android.net.NetworkStats, android.net.NetworkStats.NonMonotonicObserver&lt;C&gt;, C)'>
+    <item name='android.net.MailTo android.net.MailTo parse(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkPolicyManager void snapToCycleDay(android.text.format.Time, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.IConnectivityManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.ConnectivityManager android.net.ConnectivityManager from(android.content.Context) 0'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder authority(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.INetworkStatsService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addSearchDomain(java.lang.String)'>
+    <item name='android.net.ConnectivityManager android.net.ConnectivityManager from(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.VpnService.Builder android.net.VpnService.Builder addDnsServer(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.NetworkTemplate android.net.NetworkTemplate buildTemplateWifi(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.NetworkState void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkUtils java.net.InetAddress getNetworkPart(java.net.InetAddress, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.MailTo android.net.MailTo parse(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.NetworkStats void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.Uri android.net.Uri.Builder buildUpon()'>
+    <item name='android.net.NetworkStats android.net.NetworkStats.Entry getTotal(android.net.NetworkStats.Entry, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.NetworkStats java.lang.Object clone()'>
+    <item name='android.net.ProxyProperties java.net.Proxy makeProxy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.Uri java.lang.String toSafeString()'>
+    <item name='android.net.SSLCertificateSocketFactory java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.IConnectivityManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
@@ -890,19 +998,16 @@
     <item name='android.net.MobileDataStateTracker void startMonitoring(android.content.Context, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.VpnService boolean protect(java.net.Socket) 0'>
+    <item name='android.net.Proxy java.net.Proxy getProxy(android.content.Context, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.LinkCapabilities java.util.Set&lt;java.lang.Integer&gt; keySet()'>
+    <item name='android.net.VpnService boolean protect(java.net.Socket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.VpnService.Builder android.net.VpnService.Builder addDnsServer(java.net.InetAddress) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.MobileDataStateTracker android.net.LinkCapabilities getLinkCapabilities()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.LinkSocket android.net.LinkProperties getLinkProperties()'>
+    <item name='android.net.Uri.Builder android.net.Uri.Builder query(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/net/http/annotations.xml b/android-sdk-annotations/android/net/http/annotations.xml
index 8575152af38..dcf7b71f622 100644
--- a/android-sdk-annotations/android/net/http/annotations.xml
+++ b/android-sdk-annotations/android/net/http/annotations.xml
@@ -1,20 +1,29 @@
 <root>
-    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueRequest(java.lang.String, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.SslCertificate android.view.View inflateCertificateView(android.content.Context)'>
+    <item name='android.net.http.AndroidHttpClientConnection java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.AndroidHttpClientConnection void bind(java.net.Socket, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.SslCertificate java.lang.String toString()'>
+    <item name='android.net.http.RequestHandle java.lang.String authorizationHeader(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.RequestQueue void queueRequest(android.net.http.Request, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.RequestHandle java.lang.String computeBasicAuthResponse(java.lang.String, java.lang.String)'>
+    <item name='android.net.http.AndroidHttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.SslCertificate android.net.http.SslCertificate.DName getIssuedTo()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.LoggingEventHandler void data(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.HttpResponseCache java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map&lt;java.lang.String,java.util.List&lt;java.lang.String&gt;&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.HttpResponseCache android.net.http.HttpResponseCache install(java.io.File, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.AndroidHttpClient long parseDate(java.lang.String) 0'>
@@ -23,46 +32,67 @@
     <item name='android.net.http.AndroidHttpClient java.io.InputStream getUngzippedContent(org.apache.http.HttpEntity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.SslError android.net.http.SslCertificate getCertificate()'>
+    <item name='android.net.http.AndroidHttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueRequest(java.lang.String, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.AndroidHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.RequestHandle java.lang.String computeBasicAuthResponse(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueRequest(java.lang.String, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.SslCertificate.DName java.lang.String getDName()'>
+    <item name='android.net.http.AndroidHttpClient android.net.http.AndroidHttpClient newInstance(java.lang.String, android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.SslCertificate android.view.View inflateCertificateView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueSynchronousRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.RequestHandle java.lang.String authorizationHeader(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.ErrorStrings java.lang.String getString(int, android.content.Context) 1'>
+    <item name='android.net.http.AndroidHttpClientConnection org.apache.http.StatusLine parseResponseHeader(android.net.http.Headers)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.AndroidHttpClient void modifyRequestToAcceptGzipResponse(org.apache.http.HttpRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.http.ErrorStrings java.lang.String getString(int, android.content.Context) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.AndroidHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.http.CertificateChainValidator android.net.http.SslError verifyServerCertificates(byte[][], java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.AndroidHttpClient org.apache.http.entity.AbstractHttpEntity getCompressedEntity(byte[], android.content.ContentResolver)'>
+    <item name='android.net.http.AndroidHttpClient org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.RequestQueue RequestQueue(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueSynchronousRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.http.SslCertificate SslCertificate(java.security.cert.X509Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.http.AndroidHttpClient android.net.http.AndroidHttpClient newInstance(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.EventHandler void data(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueSynchronousRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.http.CertificateChainValidator android.net.http.SslError doHandshakeAndValidateServerCertificates(android.net.http.HttpsConnection, javax.net.ssl.SSLSocket, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueSynchronousRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int) 2'>
+    <item name='android.net.http.AndroidHttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.SslError SslError(int, java.security.cert.X509Certificate, java.lang.String) 2'>
@@ -71,73 +101,73 @@
     <item name='android.net.http.AndroidHttpClient org.apache.http.entity.AbstractHttpEntity getCompressedEntity(byte[], android.content.ContentResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.ErrorStrings java.lang.String getString(int, android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.AndroidHttpClient android.net.http.AndroidHttpClient newInstance(java.lang.String, android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.SslCertificate.DName java.lang.String getOName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.http.SslError android.net.http.SslError SslErrorFromChromiumErrorCode(int, android.net.http.SslCertificate, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.http.AndroidHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.AndroidHttpClient org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.SslError SslError(int, android.net.http.SslCertificate, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int)'>
+    <item name='android.net.http.SslError android.net.http.SslCertificate getCertificate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.AndroidHttpClientConnection void sendRequestHeader(org.apache.http.HttpRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.SslCertificate android.net.http.SslCertificate.DName getIssuedBy()'>
+    <item name='android.net.http.SslError java.lang.String getUrl()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.SslError android.net.http.SslError SslErrorFromChromiumErrorCode(int, android.net.http.SslCertificate, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.AndroidHttpClient void enableCurlLogging(java.lang.String, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.RequestQueue void requeueRequest(android.net.http.Request) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.SslError SslError(int, java.security.cert.X509Certificate, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.Headers void parseHeader(org.apache.http.util.CharArrayBuffer) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.AndroidHttpClientConnection org.apache.http.StatusLine parseResponseHeader(android.net.http.Headers)'>
+    <item name='android.net.http.SslCertificate.DName java.lang.String getUName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.SslError java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.SslCertificate.DName java.lang.String getCName()'>
+    <item name='android.net.http.RequestQueue void requeueRequest(android.net.http.Request) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.AndroidHttpClient void enableCurlLogging(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.SslError SslError(int, java.security.cert.X509Certificate, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.CertificateChainValidator android.net.http.CertificateChainValidator getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.Headers void parseHeader(org.apache.http.util.CharArrayBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.AndroidHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.SslCertificate.DName java.lang.String getOName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.HttpsConnection java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.HttpResponseCache android.net.http.HttpResponseCache install(java.io.File, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.AndroidHttpClientConnection java.lang.String toString()'>
+    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueSynchronousRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.AndroidHttpClientConnection org.apache.http.HttpEntity receiveResponseEntity(android.net.http.Headers) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueSynchronousRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int) 1'>
+    <item name='android.net.http.SslCertificate java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.SslError java.lang.String getUrl()'>
+    <item name='android.net.http.AndroidHttpClient org.apache.http.entity.AbstractHttpEntity getCompressedEntity(byte[], android.content.ContentResolver)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int) 1'>
@@ -152,25 +182,34 @@
     <item name='android.net.http.AndroidHttpClientConnection void bind(java.net.Socket, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.AndroidHttpClientConnection org.apache.http.HttpEntity receiveResponseEntity(android.net.http.Headers)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.http.CertificateChainValidator android.net.http.CertificateChainValidator getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.http.AndroidHttpClientConnection void sendRequestEntity(org.apache.http.HttpEntityEnclosingRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.http.AndroidHttpClient org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.AndroidHttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.http.X509TrustManagerExtensions X509TrustManagerExtensions(javax.net.ssl.X509TrustManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.http.AndroidHttpClient org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.http.RequestQueue RequestQueue(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.SslCertificate android.net.http.SslCertificate.DName getIssuedTo()'>
+    <item name='android.net.http.SslCertificate android.view.View inflateCertificateView(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.AndroidHttpClient android.net.http.AndroidHttpClient newInstance(java.lang.String)'>
+    <item name='android.net.http.SslCertificate android.net.http.SslCertificate.DName getIssuedBy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.SslCertificate.DName java.lang.String getDName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.ErrorStrings java.lang.String getString(int, android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueRequest(java.lang.String, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int) 0'>
@@ -182,7 +221,13 @@
     <item name='android.net.http.SslError SslError(int, android.net.http.SslCertificate) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.http.SslCertificate.DName java.lang.String getUName()'>
+    <item name='android.net.http.SslCertificate.DName java.lang.String getCName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.RequestQueue android.net.http.RequestHandle queueRequest(java.lang.String, android.net.WebAddress, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;, android.net.http.EventHandler, java.io.InputStream, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.http.AndroidHttpClientConnection org.apache.http.HttpEntity receiveResponseEntity(android.net.http.Headers)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/net/nsd/annotations.xml b/android-sdk-annotations/android/net/nsd/annotations.xml
index cf2c24e728f..75296b586f9 100644
--- a/android-sdk-annotations/android/net/nsd/annotations.xml
+++ b/android-sdk-annotations/android/net/nsd/annotations.xml
@@ -2,40 +2,22 @@
     <item name='android.net.nsd.NsdManager void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.nsd.NsdServiceInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.nsd.DnsSdTxtRecord java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.nsd.DnsSdTxtRecord void set(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.nsd.NsdManager void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.nsd.INsdManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.net.nsd.DnsSdTxtRecord java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.nsd.NsdManager void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.nsd.NsdManager void discoverServices(java.lang.String, int, android.net.nsd.NsdManager.DiscoveryListener) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.nsd.INsdManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.nsd.NsdManager void unregisterService(android.net.nsd.NsdManager.RegistrationListener) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.nsd.NsdManager void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener) 1'>
+    <item name='android.net.nsd.NsdServiceInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.nsd.DnsSdTxtRecord DnsSdTxtRecord(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.nsd.NsdManager void stopServiceDiscovery(android.net.nsd.NsdManager.DiscoveryListener) 0'>
+    <item name='android.net.nsd.NsdManager void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.nsd.DnsSdTxtRecord void writeToParcel(android.os.Parcel, int) 0'>
@@ -44,4 +26,25 @@
     <item name='android.net.nsd.NsdServiceInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.nsd.INsdManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.nsd.NsdManager void discoverServices(java.lang.String, int, android.net.nsd.NsdManager.DiscoveryListener) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.nsd.NsdManager void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.nsd.INsdManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.nsd.NsdManager void unregisterService(android.net.nsd.NsdManager.RegistrationListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.nsd.INsdManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.nsd.NsdManager void stopServiceDiscovery(android.net.nsd.NsdManager.DiscoveryListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/net/sip/annotations.xml b/android-sdk-annotations/android/net/sip/annotations.xml
index dff4a36b4cc..7c6e97efa04 100644
--- a/android-sdk-annotations/android/net/sip/annotations.xml
+++ b/android-sdk-annotations/android/net/sip/annotations.xml
@@ -1,62 +1,59 @@
 <root>
+    <item name='android.net.sip.ISipService android.net.sip.ISipSession createSession(android.net.sip.SipProfile, android.net.sip.ISipSessionListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipManager android.content.Intent createIncomingCallBroadcast(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.sip.ISipSessionListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SimpleSessionDescription java.lang.String encode()'>
+    <item name='android.net.sip.ISipService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setAutoRegistration(boolean)'>
+    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setProtocol(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipManager android.net.sip.SipManager newInstance(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.sip.SipManager android.net.sip.SipAudioCall makeAudioCall(android.net.sip.SipProfile, android.net.sip.SipProfile, android.net.sip.SipAudioCall.Listener, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setProfileName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.sip.ISipSession.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SimpleSessionDescription android.net.sip.SimpleSessionDescription.Media[] getMedia()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.sip.SipProfile java.lang.String getUriString()'>
+    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setSendKeepAlive(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipAudioCall SipAudioCall(android.content.Context, android.net.sip.SipProfile) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SimpleSessionDescription.Media java.lang.String[] getFormats()'>
+    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setAuthUserName(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipManager void open(android.net.sip.SipProfile, android.app.PendingIntent, android.net.sip.SipRegistrationListener) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.ISipService.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setPassword(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.sip.SimpleSessionDescription.Media int[] getRtpPayloadTypes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.sip.SipManager android.net.sip.SipSession getSessionFor(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SimpleSessionDescription java.lang.String[] getBandwidthTypes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.sip.SipErrorCode java.lang.String toString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setDisplayName(java.lang.String)'>
+    <item name='android.net.sip.SimpleSessionDescription android.net.sip.SimpleSessionDescription.Media[] getMedia()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipManager android.net.sip.SipSession createSipSession(android.net.sip.SipProfile, android.net.sip.SipSession.Listener)'>
+    <item name='android.net.sip.ISipSession.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SimpleSessionDescription.Media java.lang.String[] getAttributeNames()'>
+    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setPort(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipManager android.net.sip.SipAudioCall makeAudioCall(java.lang.String, java.lang.String, android.net.sip.SipAudioCall.Listener, int)'>
+    <item name='android.net.sip.SipProfile java.lang.String getUriString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipProfile.Builder Builder(java.lang.String, java.lang.String) 0'>
@@ -65,24 +62,33 @@
     <item name='android.net.sip.SipManager java.lang.String getOfferSessionDescription(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.sip.SipSession.Listener void onRinging(android.net.sip.SipSession, android.net.sip.SipProfile, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.sip.SimpleSessionDescription SimpleSessionDescription(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setSendKeepAlive(boolean)'>
+    <item name='android.net.sip.SimpleSessionDescription.Media java.lang.String[] getAttributeNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SimpleSessionDescription.Media java.lang.String[] getBandwidthTypes()'>
+    <item name='android.net.sip.SimpleSessionDescription.Media java.lang.String getAttribute(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SimpleSessionDescription java.lang.String[] getAttributeNames()'>
+    <item name='android.net.sip.ISipService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.ISipSessionListener.Stub android.os.IBinder asBinder()'>
+    <item name='android.net.sip.SipAudioCall.Listener void onChanged(android.net.sip.SipAudioCall) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.ISipService void open3(android.net.sip.SipProfile, android.app.PendingIntent, android.net.sip.ISipSessionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipManager void register(android.net.sip.SipProfile, int, android.net.sip.SipRegistrationListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.sip.ISipService void open(android.net.sip.SipProfile) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.sip.SipProfile void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -92,67 +98,109 @@
     <item name='android.net.sip.SipProfile.Builder Builder(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipManager java.lang.String getCallId(android.content.Intent) 0'>
+    <item name='android.net.sip.SimpleSessionDescription java.lang.String[] getAttributeNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipSession.State java.lang.String toString(int)'>
+    <item name='android.net.sip.SipManager java.lang.String getCallId(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipManager android.net.sip.SipAudioCall makeAudioCall(java.lang.String, java.lang.String, android.net.sip.SipAudioCall.Listener, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipManager boolean isApiSupported(android.content.Context) 0'>
+    <item name='android.net.sip.SipManager android.net.sip.SipAudioCall takeAudioCall(android.content.Intent, android.net.sip.SipAudioCall.Listener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipSessionAdapter void onRinging(android.net.sip.ISipSession, android.net.sip.SipProfile, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipManager android.net.sip.SipAudioCall takeAudioCall(android.content.Intent, android.net.sip.SipAudioCall.Listener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.ISipSession.Stub android.os.IBinder asBinder()'>
+    <item name='android.net.sip.SipManager boolean isApiSupported(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipSession.Listener void onCallTransferring(android.net.sip.SipSession, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipManager void unregister(android.net.sip.SipProfile, android.net.sip.SipRegistrationListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.sip.SimpleSessionDescription java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.ISipSession.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.ISipSession void makeCall(android.net.sip.SipProfile, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipAudioCall.Listener void onCallHeld(android.net.sip.SipAudioCall) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.sip.SipProfile.Builder Builder(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.sip.SimpleSessionDescription.Media java.lang.String[] getBandwidthTypes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.ISipSessionListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setOutboundProxy(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.ISipService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.sip.ISipSessionListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipAudioCall.Listener void onCallEnded(android.net.sip.SipAudioCall) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.sip.SimpleSessionDescription android.net.sip.SimpleSessionDescription.Media newMedia(java.lang.String, int, int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setPort(int)'>
+    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setPassword(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setProfileName(java.lang.String)'>
+    <item name='android.net.sip.SimpleSessionDescription.Media java.lang.String[] getFormats()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setProtocol(java.lang.String)'>
+    <item name='android.net.sip.SipManager android.net.sip.SipAudioCall makeAudioCall(java.lang.String, java.lang.String, android.net.sip.SipAudioCall.Listener, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setDisplayName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipAudioCall.Listener void onCallEstablished(android.net.sip.SipAudioCall) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipManager android.net.sip.SipAudioCall makeAudioCall(java.lang.String, java.lang.String, android.net.sip.SipAudioCall.Listener, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipManager boolean isVoipSupported(android.content.Context) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.sip.SipProfile.Builder Builder(android.net.sip.SipProfile) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipManager android.net.sip.SipAudioCall makeAudioCall(android.net.sip.SipProfile, android.net.sip.SipProfile, android.net.sip.SipAudioCall.Listener, int)'>
+    <item name='android.net.sip.SipManager boolean isVoipSupported(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setAuthUserName(java.lang.String)'>
+    <item name='android.net.sip.SipProfile.Builder android.net.sip.SipProfile.Builder setAutoRegistration(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipManager android.net.sip.SipAudioCall takeAudioCall(android.content.Intent, android.net.sip.SipAudioCall.Listener)'>
+    <item name='android.net.sip.SimpleSessionDescription java.lang.String[] getBandwidthTypes()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.sip.SipManager android.content.Intent createIncomingCallBroadcast(java.lang.String, java.lang.String)'>
+    <item name='android.net.sip.SimpleSessionDescription.Media int[] getRtpPayloadTypes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipManager android.net.sip.SipSession createSipSession(android.net.sip.SipProfile, android.net.sip.SipSession.Listener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.ISipSessionListener void onRinging(android.net.sip.ISipSession, android.net.sip.SipProfile, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.sip.SipSession.State java.lang.String toString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.sip.SipManager void open(android.net.sip.SipProfile, android.app.PendingIntent, android.net.sip.SipRegistrationListener) 0'>
diff --git a/android-sdk-annotations/android/net/wifi/annotations.xml b/android-sdk-annotations/android/net/wifi/annotations.xml
index 624431b76ed..8583d82760c 100644
--- a/android-sdk-annotations/android/net/wifi/annotations.xml
+++ b/android-sdk-annotations/android/net/wifi/annotations.xml
@@ -1,5 +1,5 @@
 <root>
-    <item name='android.net.wifi.WifiSsid byte[] getOctets()'>
+    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiManager void connect(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener) 0'>
@@ -8,76 +8,76 @@
     <item name='android.net.wifi.WpsResult.Status android.net.wifi.WpsResult.Status valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiConfiguration.IpAssignment android.net.wifi.WifiConfiguration.IpAssignment valueOf(java.lang.String)'>
+    <item name='android.net.wifi.WifiStateTracker void startMonitoring(android.content.Context, android.os.Handler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiManager.WifiLock java.lang.String toString()'>
+    <item name='android.net.wifi.WifiConfiguration java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.SupplicantState android.net.wifi.SupplicantState valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.WifiManager void save(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.ScanResult void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.WifiManager.WifiLock java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.WifiStateMachine boolean syncDisableNetwork(com.android.internal.util.AsyncChannel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.WifiStateMachine java.util.List&lt;android.net.wifi.ScanResult&gt; syncGetScanResultsList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.WifiWatchdogStateMachine void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiSsid android.net.wifi.WifiSsid createFromAsciiEncoded(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.WifiSsid android.net.wifi.WifiSsid createFromAsciiEncoded(java.lang.String)'>
+    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getSubjectMatch()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiStateMachine boolean syncSaveConfig(com.android.internal.util.AsyncChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WpsResult java.lang.String toString()'>
+    <item name='android.net.wifi.WifiStateTracker android.net.LinkProperties getLinkProperties()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.WifiWatchdogStateMachine android.net.wifi.WifiWatchdogStateMachine makeWifiWatchdogStateMachine(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.WifiStateMachine void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getClientCertificateAlias()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiStateMachine java.lang.String syncGetWifiApStateByName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.WifiManager android.net.wifi.WifiManager.MulticastLock createMulticastLock(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.WifiWatchdogStateMachine android.net.wifi.WifiWatchdogStateMachine makeWifiWatchdogStateMachine(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getAnonymousIdentity()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.WifiInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiManager android.net.wifi.WifiManager.WifiLock createWifiLock(int, java.lang.String)'>
+    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getPassword()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiInfo java.lang.String getSSID()'>
+    <item name='android.net.wifi.WpsInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiStateTracker java.lang.String getTcpBufferSizesPropName()'>
+    <item name='android.net.wifi.WifiManager android.net.wifi.WifiManager.WifiLock createWifiLock(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.SupplicantState android.net.wifi.SupplicantState valueOf(java.lang.String)'>
+    <item name='android.net.wifi.WifiStateTracker void startMonitoring(android.content.Context, android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.ScanResult java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.WifiStateMachine android.net.DhcpResults syncGetDhcpResults()'>
+    <item name='android.net.wifi.IWifiManager.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiStateMachine boolean syncRemoveNetwork(com.android.internal.util.AsyncChannel, int) 0'>
@@ -86,10 +86,10 @@
     <item name='android.net.wifi.WifiSsid void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiSsid java.lang.String getHexString()'>
+    <item name='android.net.wifi.IWifiManager java.lang.String getConfigFile()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiManager android.net.wifi.WifiManager.WifiLock createWifiLock(java.lang.String)'>
+    <item name='android.net.wifi.WifiInfo java.lang.String getSSID()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiStateMachine java.util.List&lt;android.net.wifi.WifiConfiguration&gt; syncGetConfiguredNetworks(com.android.internal.util.AsyncChannel) 0'>
@@ -98,28 +98,25 @@
     <item name='android.net.wifi.WifiNative boolean p2pServiceDel(android.net.wifi.p2p.nsd.WifiP2pServiceInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiManager.MulticastLock java.lang.String toString()'>
+    <item name='android.net.wifi.WifiSsid byte[] getOctets()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiStateTracker android.net.LinkProperties getLinkProperties()'>
+    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getIdentity()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiStateMachine android.os.Messenger getMessenger()'>
+    <item name='android.net.wifi.WifiConfiguration.ProxySettings android.net.wifi.WifiConfiguration.ProxySettings valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getCaCertificateAlias()'>
+    <item name='android.net.wifi.WifiStateTracker android.net.NetworkInfo getNetworkInfo()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.IWifiManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.WifiSsid java.lang.String toString()'>
+    <item name='android.net.wifi.WifiStateMachine int syncAddOrUpdateNetwork(com.android.internal.util.AsyncChannel, android.net.wifi.WifiConfiguration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiStateMachine void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiStateMachine int syncAddOrUpdateNetwork(com.android.internal.util.AsyncChannel, android.net.wifi.WifiConfiguration) 0'>
+    <item name='android.net.wifi.WifiStateMachine android.os.Messenger getMessenger()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.RssiPacketCountInfo void writeToParcel(android.os.Parcel, int) 0'>
@@ -128,87 +125,108 @@
     <item name='android.net.wifi.WifiConfiguration void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.WifiConfiguration.IpAssignment android.net.wifi.WifiConfiguration.IpAssignment valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.WifiStateMachine java.lang.String syncGetWifiStateByName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.WifiInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.WifiNative boolean p2pServiceAdd(android.net.wifi.p2p.nsd.WifiP2pServiceInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WpsResult.Status android.net.wifi.WpsResult.Status valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.WpsInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getAnonymousIdentity()'>
+    <item name='android.net.wifi.ScanResult java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiEnterpriseConfig WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.IWifiManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.WpsResult void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.WifiManager android.net.wifi.WifiManager.WifiLock createWifiLock(int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.WpsInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiConfiguration.ProxySettings android.net.wifi.WifiConfiguration.ProxySettings valueOf(java.lang.String)'>
+    <item name='android.net.wifi.WpsResult.Status android.net.wifi.WpsResult.Status valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiStateTracker android.net.LinkCapabilities getLinkCapabilities()'>
+    <item name='android.net.wifi.WifiStateMachine java.lang.String syncGetWifiApStateByName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.WifiStateMachine java.lang.String getConfigFile()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.WifiStateTracker java.lang.String getTcpBufferSizesPropName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.WifiManager android.net.wifi.WifiManager.MulticastLock createMulticastLock(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiEnterpriseConfig void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getSubjectMatch()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.WifiSsid android.net.wifi.WifiSsid createFromHex(java.lang.String)'>
+    <item name='android.net.wifi.SupplicantState android.net.wifi.SupplicantState valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiConfiguration.ProxySettings android.net.wifi.WifiConfiguration.ProxySettings valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiStateMachine java.util.List&lt;android.net.wifi.ScanResult&gt; syncGetScanResultsList()'>
+    <item name='android.net.wifi.WpsResult java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.WifiStateMachine boolean syncEnableNetwork(com.android.internal.util.AsyncChannel, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.WifiSsid android.net.wifi.WifiSsid createFromAsciiEncoded(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.WifiConfiguration.IpAssignment android.net.wifi.WifiConfiguration.IpAssignment valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.WifiStateTracker android.net.LinkCapabilities getLinkCapabilities()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.WifiWatchdogStateMachine void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.WifiManager.MulticastLock java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.WifiManager void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.SupplicantState void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiWatchdogStateMachine android.net.wifi.WifiWatchdogStateMachine makeWifiWatchdogStateMachine(android.content.Context)'>
+    <item name='android.net.wifi.WifiSsid java.lang.String getHexString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.WifiStateMachine android.net.DhcpResults syncGetDhcpResults()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.IWifiManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiStateMachine java.lang.String getConfigFile()'>
+    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getCaCertificateAlias()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getIdentity()'>
+    <item name='android.net.wifi.WifiSsid android.net.wifi.WifiSsid createFromHex(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiEnterpriseConfig java.lang.String getPassword()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.WifiConfiguration java.lang.String toString()'>
+    <item name='android.net.wifi.WifiSsid java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.SupplicantState boolean isHandshakeState(android.net.wifi.SupplicantState) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.WifiStateTracker android.net.NetworkInfo getNetworkInfo()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.WifiStateMachine boolean syncPingSupplicant(com.android.internal.util.AsyncChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/net/wifi/p2p/annotations.xml b/android-sdk-annotations/android/net/wifi/p2p/annotations.xml
index c84a23e252c..dc23f6cf503 100644
--- a/android-sdk-annotations/android/net/wifi/p2p/annotations.xml
+++ b/android-sdk-annotations/android/net/wifi/p2p/annotations.xml
@@ -1,4 +1,7 @@
 <root>
+    <item name='android.net.wifi.p2p.WifiP2pConfig java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.IWifiP2pManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,15 +14,9 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void setDnsSdResponseListeners(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener, android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pGroup java.util.Collection&lt;android.net.wifi.p2p.WifiP2pDevice&gt; getClientList()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pGroup boolean removeClient(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.IWifiP2pManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pGroup WifiP2pGroup(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,16 +29,16 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pGroupList java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pDeviceList boolean remove(android.net.wifi.p2p.WifiP2pDeviceList) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void stopPeerDiscovery(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pGroup java.lang.String toString()'>
+    <item name='android.net.wifi.p2p.WifiP2pService android.os.Messenger getMessenger()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.WifiP2pManager.PeerListListener void onPeersAvailable(android.net.wifi.p2p.WifiP2pDeviceList) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pConfig WifiP2pConfig(java.lang.String) 0'>
@@ -50,16 +47,13 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pWfdInfo java.lang.String getDeviceInfoHex()'>
+    <item name='android.net.wifi.p2p.WifiP2pWfdInfo void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pWfdInfo void readFromParcel(android.os.Parcel) 0'>
+    <item name='android.net.wifi.p2p.IWifiP2pManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pDevice WifiP2pDevice(java.lang.String) 0'>
@@ -68,10 +62,10 @@
     <item name='android.net.wifi.p2p.WifiP2pConfig void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pManager void setUpnpServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener) 0'>
+    <item name='android.net.wifi.p2p.WifiP2pGroup java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pService android.os.Messenger getMessenger()'>
+    <item name='android.net.wifi.p2p.WifiP2pManager void setUpnpServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
@@ -80,25 +74,31 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void deletePersistentGroup(android.net.wifi.p2p.WifiP2pManager.Channel, int, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pProvDiscEvent java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void setServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ServiceResponseListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void setDeviceName(android.net.wifi.p2p.WifiP2pManager.Channel, java.lang.String, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pGroup java.util.Collection&lt;android.net.wifi.p2p.WifiP2pDevice&gt; getClientList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pWfdInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pDeviceList java.util.Collection&lt;android.net.wifi.p2p.WifiP2pDevice&gt; getDeviceList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.WifiP2pDeviceList java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pDevice void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pDevice java.lang.String toString()'>
+    <item name='android.net.wifi.p2p.WifiP2pGroupList java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pDeviceList java.util.Collection&lt;android.net.wifi.p2p.WifiP2pDevice&gt; getDeviceList()'>
+    <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void removeServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener) 1'>
@@ -107,12 +107,18 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.IWifiP2pManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pDevice java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pDevice void update(android.net.wifi.p2p.WifiP2pDevice) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -125,21 +131,21 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void cancelConnect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void startWps(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.WpsInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pInfo java.lang.String toString()'>
+    <item name='android.net.wifi.p2p.WifiP2pWfdInfo java.lang.String getDeviceInfoHex()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pDeviceList boolean remove(android.net.wifi.p2p.WifiP2pDevice) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pConfig java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pWfdInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -164,6 +170,9 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void clearLocalServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pProvDiscEvent WifiP2pProvDiscEvent(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -176,22 +185,22 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void connect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pConfig, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pDeviceList java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.p2p.WifiP2pManager void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
+    <item name='android.net.wifi.p2p.WifiP2pInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void requestPersistentGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pManager void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pGroup void addClient(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void clearServiceRequests(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(int)'>
+    <item name='android.net.wifi.p2p.WifiP2pProvDiscEvent java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 1'>
diff --git a/android-sdk-annotations/android/net/wifi/p2p/nsd/annotations.xml b/android-sdk-annotations/android/net/wifi/p2p/nsd/annotations.xml
index 3d6f874d2c1..ea0c016732a 100644
--- a/android-sdk-annotations/android/net/wifi/p2p/nsd/annotations.xml
+++ b/android-sdk-annotations/android/net/wifi/p2p/nsd/annotations.xml
@@ -1,11 +1,17 @@
 <root>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest newInstance()'>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceResponse java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo newInstance(java.lang.String, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pServiceInfo WifiP2pServiceInfo(java.util.List&lt;java.lang.String&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceResponse java.lang.String toString()'>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceResponse java.util.Map&lt;java.lang.String,java.lang.String&gt; getTxtRecord()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance(java.lang.String, java.lang.String) 1'>
@@ -14,70 +20,64 @@
     <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest newInstance(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pServiceRequest void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceResponse java.util.Map&lt;java.lang.String,java.lang.String&gt; getTxtRecord()'>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceResponse java.lang.String toString()'>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest newInstance(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceRequest java.lang.String getSupplicantQuery()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pServiceResponse java.util.List&lt;android.net.wifi.p2p.nsd.WifiP2pServiceResponse&gt; newInstance(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest newInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo newInstance(java.lang.String, java.lang.String, java.util.List&lt;java.lang.String&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo newInstance(java.lang.String, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceResponse java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceResponse.Status java.lang.String toString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest newInstance(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceRequest android.net.wifi.p2p.nsd.WifiP2pServiceRequest newInstance(int)'>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceResponse java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceRequest java.lang.String getSupplicantQuery()'>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo newInstance(java.lang.String, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceRequest android.net.wifi.p2p.nsd.WifiP2pServiceRequest newInstance(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceResponse java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pServiceResponse.Status java.lang.String toString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo newInstance(java.lang.String, java.lang.String, java.util.List&lt;java.lang.String&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pServiceRequest android.net.wifi.p2p.nsd.WifiP2pServiceRequest newInstance(int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo newInstance(java.lang.String, java.lang.String, java.util.Map&lt;java.lang.String,java.lang.String&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo newInstance(java.lang.String, java.lang.String, java.util.List&lt;java.lang.String&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.nsd.WifiP2pServiceResponse void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo newInstance(java.lang.String, java.lang.String, java.util.List&lt;java.lang.String&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/nfc/annotations.xml b/android-sdk-annotations/android/nfc/annotations.xml
index b0e0de73214..ce9189227aa 100644
--- a/android-sdk-annotations/android/nfc/annotations.xml
+++ b/android-sdk-annotations/android/nfc/annotations.xml
@@ -1,8 +1,11 @@
 <root>
-    <item name='android.nfc.NdefRecord java.lang.String toString()'>
+    <item name='android.nfc.INfcAdapterExtras.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.Tag java.lang.String toString()'>
+    <item name='android.nfc.Tag android.nfc.Tag rediscover()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createMime(java.lang.String, byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.NdefRecord NdefRecord(byte[]) 0'>
@@ -11,36 +14,39 @@
     <item name='android.nfc.Tag android.nfc.Tag createMockTag(byte[], int[], android.os.Bundle[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.nfc.ErrorCodes java.lang.String asString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.nfc.INdefPushCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.nfc.Tag java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.nfc.NfcAdapter void dispatch(android.nfc.Tag) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.NdefMessage NdefMessage(android.nfc.NdefRecord, android.nfc.NdefRecord...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createExternal(java.lang.String, java.lang.String, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.nfc.NfcAdapter void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.NdefMessage java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.nfc.NfcAdapter void disableForegroundDispatch(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.INfcAdapter.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.nfc.Tag android.nfc.Tag createMockTag(byte[], int[], android.os.Bundle[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.nfc.NfcAdapter void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.NfcAdapter void setBeamPushUris(android.net.Uri[], android.app.Activity) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.Tag android.nfc.Tag rediscover()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.nfc.NfcAdapter void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -50,49 +56,55 @@
     <item name='android.nfc.NdefRecord android.nfc.NdefRecord createUri(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createApplicationRecord(java.lang.String)'>
+    <item name='android.nfc.INdefPushCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.INfcAdapterExtras.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.nfc.NdefMessage android.nfc.NdefRecord[] getRecords()'>
+    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createUri(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.NfcAdapter void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.nfc.INfcTag.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.nfc.BeamShareData void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.INfcTag.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.Tag java.lang.String[] getTechList()'>
+    <item name='android.nfc.NdefMessage java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.NfcAdapter void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createExternal(java.lang.String, java.lang.String, byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.nfc.TechListParcel void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.NdefMessage NdefMessage(android.nfc.NdefRecord[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.NdefRecord void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createUri(android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createUri(android.net.Uri)'>
+    <item name='android.nfc.NdefRecord void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.INdefPushCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.nfc.INfcAdapter.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.nfc.NfcAdapter void enableForegroundDispatch(android.app.Activity, android.app.PendingIntent, android.content.IntentFilter[], java.lang.String[][]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createUri(java.lang.String)'>
+    <item name='android.nfc.INfcTag.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.NdefMessage NdefMessage(android.nfc.NdefRecord, android.nfc.NdefRecord...) 0'>
@@ -107,10 +119,10 @@
     <item name='android.nfc.NfcAdapter void setOnNdefPushCompleteCallback(android.nfc.NfcAdapter.OnNdefPushCompleteCallback, android.app.Activity, android.app.Activity...) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.NdefMessage NdefMessage(byte[]) 0'>
+    <item name='android.nfc.NdefRecord java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.INdefPushCallback.Stub android.os.IBinder asBinder()'>
+    <item name='android.nfc.NdefMessage NdefMessage(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.NdefRecord android.nfc.NdefRecord createApplicationRecord(java.lang.String) 0'>
@@ -119,13 +131,16 @@
     <item name='android.nfc.Tag void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createApplicationRecord(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.nfc.INfcAdapterExtras.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.nfc.INfcAdapterExtras.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.Tag android.nfc.Tag createMockTag(byte[], int[], android.os.Bundle[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.nfc.INfcAdapter.Stub android.os.IBinder asBinder()'>
+    <item name='android.nfc.Tag java.lang.String[] getTechList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.NfcAdapter void disableForegroundNdefPush(android.app.Activity) 0'>
@@ -140,16 +155,13 @@
     <item name='android.nfc.Tag Tag(byte[], int[], android.os.Bundle[], int, android.nfc.INfcTag) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.NdefRecord android.nfc.NdefRecord createMime(java.lang.String, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.nfc.ErrorCodes java.lang.String asString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.nfc.NfcAdapter void enableForegroundDispatch(android.app.Activity, android.app.PendingIntent, android.content.IntentFilter[], java.lang.String[][]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.INfcTag.Stub android.os.IBinder asBinder()'>
+    <item name='android.nfc.NdefMessage android.nfc.NdefRecord[] getRecords()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.nfc.INfcAdapter.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.Tag android.nfc.Tag createMockTag(byte[], int[], android.os.Bundle[]) 1'>
diff --git a/android-sdk-annotations/android/nfc/tech/annotations.xml b/android-sdk-annotations/android/nfc/tech/annotations.xml
index b5dd6e988fc..6594d9d11ec 100644
--- a/android-sdk-annotations/android/nfc/tech/annotations.xml
+++ b/android-sdk-annotations/android/nfc/tech/annotations.xml
@@ -1,8 +1,8 @@
 <root>
-    <item name='android.nfc.tech.NfcBarcode android.nfc.tech.NfcBarcode get(android.nfc.Tag) 0'>
+    <item name='android.nfc.tech.Ndef java.lang.String getType()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.nfc.tech.Ndef java.lang.String getType()'>
+    <item name='android.nfc.tech.NfcBarcode android.nfc.tech.NfcBarcode get(android.nfc.Tag) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.nfc.tech.MifareClassic MifareClassic(android.nfc.Tag) 0'>
diff --git a/android-sdk-annotations/android/opengl/annotations.xml b/android-sdk-annotations/android/opengl/annotations.xml
index bd8984de034..ecebb3bcc0e 100644
--- a/android-sdk-annotations/android/opengl/annotations.xml
+++ b/android-sdk-annotations/android/opengl/annotations.xml
@@ -5,6 +5,12 @@
     <item name='android.opengl.GLES11Ext void glMatrixIndexPointerOES(int, int, int, java.nio.Buffer) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture createTexture(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.opengl.GLSurfaceView.EGLWindowSurfaceFactory void destroySurface(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLSurface) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.ETC1Util void writeTexture(android.opengl.ETC1Util.ETC1Texture, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -14,6 +20,9 @@
     <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture createTexture(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLSurfaceView.EGLConfigChooser javax.microedition.khronos.egl.EGLConfig chooseConfig(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.GLUtils int getType(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,6 +35,12 @@
     <item name='android.opengl.GLUtils void texSubImage2D(int, int, int, int, android.graphics.Bitmap) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture compressTexture(java.nio.Buffer, int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.opengl.GLSurfaceView.EGLContextFactory javax.microedition.khronos.egl.EGLContext createContext(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.Matrix void setRotateEulerM(float[], int, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -50,27 +65,24 @@
     <item name='android.opengl.Matrix void setRotateM(float[], int, float, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.opengl.GLSurfaceView GLSurfaceView(android.content.Context, android.util.AttributeSet) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.opengl.GLSurfaceView void surfaceCreated(android.view.SurfaceHolder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLSurfaceView GLSurfaceView(android.content.Context, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.GLUtils int getInternalFormat(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.opengl.GLUtils java.lang.String getEGLErrorString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture compressTexture(java.nio.Buffer, int, int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.opengl.ETC1Util void writeTexture(android.opengl.ETC1Util.ETC1Texture, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.opengl.GLES20 void glVertexAttribPointer(int, int, int, boolean, int, java.nio.Buffer) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLUtils java.lang.String getEGLErrorString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.Matrix void frustumM(float[], int, float, float, float, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -92,15 +104,15 @@
     <item name='android.opengl.GLES10 void glVertexPointer(int, int, int, java.nio.Buffer) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLSurfaceView.EGLContextFactory void destroyContext(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.GLSurfaceView GLSurfaceView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.opengl.GLUtils void texImage2D(int, int, int, android.graphics.Bitmap, int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture createTexture(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.opengl.Matrix void perspectiveM(float[], int, float, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -110,6 +122,9 @@
     <item name='android.opengl.GLES30 void glVertexAttribIPointer(int, int, int, int, java.nio.Buffer) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLSurfaceView.EGLConfigChooser javax.microedition.khronos.egl.EGLConfig chooseConfig(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.Matrix void orthoM(float[], int, float, float, float, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/os/annotations.xml b/android-sdk-annotations/android/os/annotations.xml
index 35215b5b02a..0e0e0035388 100644
--- a/android-sdk-annotations/android/os/annotations.xml
+++ b/android-sdk-annotations/android/os/annotations.xml
@@ -1,119 +1,56 @@
 <root>
-    <item name='android.os.Environment java.io.File getExternalStorageAppFilesDirectory(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.FileUtils java.lang.String readTextFile(java.io.File, int, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel void readBinderList(java.util.List&lt;android.os.IBinder&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.IUpdateLock.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppDataDirectory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.BatteryStats.HistoryItem void setTo(long, byte, android.os.BatteryStats.HistoryItem) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.WorkSource boolean diff(android.os.WorkSource) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Bundle Bundle(android.os.Bundle) 0'>
+    <item name='android.os.BatteryStats.Uid java.util.Map&lt;java.lang.String,? extends android.os.BatteryStats.Uid.Wakelock&gt; getWakelockStats()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.RecoverySystem void verifyPackage(java.io.File, android.os.RecoverySystem.ProgressListener, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.PowerManager.WakeLock java.lang.String toString()'>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.ResultReceiver void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.os.Environment java.io.File getDownloadCacheDirectory()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.BatteryStats.HistoryItem void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.os.INetworkManagementService void setDnsForwarders(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Messenger void writeMessengerOrNullToParcel(android.os.Messenger, android.os.Parcel) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectLeakedRegistrationObjects()'>
+    <item name='android.os.AsyncResult android.os.AsyncResult forMessage(android.os.Message)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.ICancellationSignal.Stub android.os.IBinder asBinder()'>
+    <item name='android.os.IPermissionController.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Bundle java.lang.Object clone()'>
+    <item name='android.os.Looper java.lang.Thread getThread()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Parcel void readTypedList(java.util.List&lt;T&gt;, android.os.Parcelable.Creator&lt;T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.HandlerThread HandlerThread(java.lang.String, int) 0'>
+    <item name='android.os.IHardwareService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Binder android.os.UserHandle getCallingUserHandle()'>
+    <item name='android.os.Parcel android.os.Parcel obtain(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Environment java.io.File getExternalStorageAppDataDirectory(java.lang.String)'>
+    <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor[] createPipe()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.CountDownTimer android.os.CountDownTimer start()'>
+    <item name='android.os.Parcel byte[] marshall()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode android.os.StrictMode.ThreadPolicy allowThreadDiskWrites()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppDataDirectory(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Looper android.os.MessageQueue myQueue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyDropBox()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitDiskWrites()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.NullVibrator android.os.NullVibrator getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder penaltyLog()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.ParcelFileDescriptor ParcelFileDescriptor(java.io.FileDescriptor) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.MemoryFile void writeBytes(byte[], int, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyDeath()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel void readLongArray(long[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.FileUtils java.lang.String readTextFile(java.io.File, int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.SELinux boolean restorecon(java.io.File) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode java.lang.Object trackActivity(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Debug void startMethodTracing(java.lang.String) 0'>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectDiskReads()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Binder void dumpAsync(java.io.FileDescriptor, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Parcel android.os.Parcel obtain()'>
+    <item name='android.os.Debug void startMethodTracing(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.IPermissionController.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
@@ -125,112 +62,58 @@
     <item name='android.os.Bundle void putAll(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Bundle android.os.Bundle forPair(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.IHardwareService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.SystemVibrator SystemVibrator(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Parcel void readStringArray(java.lang.String[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.DropBoxManager.Entry Entry(java.lang.String, long, java.io.File, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler boolean sendMessageAtFrontOfQueue(android.os.Message) 0'>
+    <item name='android.os.Environment java.io.File getExternalStorageAppCacheDirectory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Process android.os.Process.ProcessStartResult start(java.lang.String, java.lang.String, int, int, int[], int, int, int, java.lang.String, java.lang.String[])'>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppObbDirectory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectFileUriExposure()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Handler boolean sendMessageAtTime(android.os.Message, long) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getExternalStorageAppDataDirectory(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppFilesDirectory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitDiskReads()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.WorkSource android.os.WorkSource addReturningNewbs(android.os.WorkSource) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode void onVmPolicyViolation(java.lang.String, java.lang.Throwable) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyLog()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getRootDirectory()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.ParcelUuid android.os.ParcelUuid fromString(java.lang.String)'>
+    <item name='android.os.INetworkManagementService void setInterfaceConfig(java.lang.String, android.net.InterfaceConfiguration) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Debug void startMethodTracing(java.lang.String, java.io.FileDescriptor, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Debug.MemoryInfo void readFromParcel(android.os.Parcel) 0'>
+    <item name='android.os.WorkSource java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor fromFd(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.BatteryStats.HistoryItem void setTo(android.os.BatteryStats.HistoryItem) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStoragePublicDirectory(java.lang.String)'>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyDeath()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler boolean sendMessage(android.os.Message) 0'>
+    <item name='android.os.IPowerManager.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.WorkSource boolean add(android.os.WorkSource) 0'>
+    <item name='android.os.AsyncTask android.os.AsyncTask&lt;Params,Progress,Result&gt; execute(Params...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.DropBoxManager void addFile(java.lang.String, java.io.File, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Debug java.lang.String getCallers(int, java.lang.String)'>
+    <item name='android.os.Parcel android.os.Parcel obtain()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.MemoryFile int readBytes(byte[], int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler android.os.Message obtainMessage()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.WorkSource void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppObbDirectory(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode void setVmPolicy(android.os.StrictMode.VmPolicy) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectActivityLeaks()'>
+    <item name='android.os.Handler Handler(android.os.Looper, android.os.Handler.Callback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.RecoverySystem void rebootWipeCache(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler Handler(android.os.Looper, android.os.Handler.Callback) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectDiskWrites()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.SystemService void waitForState(java.lang.String, android.os.SystemService.State, long) 1'>
+    <item name='android.os.Environment java.io.File getLegacyExternalStorageDirectory()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.AsyncTask void execute(java.lang.Runnable) 0'>
@@ -239,82 +122,40 @@
     <item name='android.os.SystemProperties int getInt(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Handler void dump(android.util.Printer, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode android.os.StrictMode.ThreadPolicy getThreadPolicy()'>
+    <item name='android.os.Handler android.os.Message obtainMessage(int, int, int, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.ParcelFileDescriptor.AutoCloseInputStream AutoCloseInputStream(android.os.ParcelFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor[] createPipe()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.BatteryStats void dumpLocked(java.io.PrintWriter, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Environment java.io.File getExternalStorageAppCacheDirectory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.UEventObserver void startObserving(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.UserManager boolean isUserRunningOrStopping(android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.UserManager android.os.Bundle getApplicationRestrictions(java.lang.String, android.os.UserHandle) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy build()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.TokenWatcher void acquire(android.os.IBinder, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.AsyncResult android.os.AsyncResult forMessage(android.os.Message)'>
+    <item name='android.os.AsyncTask.Status android.os.AsyncTask.Status valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.FileUtils boolean isFilenameSafe(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Message android.os.Message obtain(android.os.Handler, java.lang.Runnable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel void readMap(java.util.Map, java.lang.ClassLoader) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.UEventObserver.UEvent UEvent(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Process android.os.UserHandle myUserHandle()'>
+    <item name='android.os.IVibratorService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.DropBoxManager.Entry Entry(java.lang.String, long, android.os.ParcelFileDescriptor, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.AsyncTask android.os.AsyncTask.Status getStatus()'>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Parcel void readByteArray(byte[]) 0'>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppDataDirectory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.SystemService.State android.os.SystemService.State valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getExternalStorageAppMediaDirectory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.BatteryStats.HistoryPrinter void printNextItem(java.io.PrintWriter, android.os.BatteryStats.HistoryItem, long) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getSystemSecureDirectory()'>
+    <item name='android.os.INetworkManagementService void disableNat(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.UserHandle void writeToParcel(android.os.Parcel, int) 0'>
@@ -326,112 +167,64 @@
     <item name='android.os.SystemProperties boolean getBoolean(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.SELinux boolean restorecon(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.ParcelUuid android.os.ParcelUuid fromString(java.lang.String) 0'>
+    <item name='android.os.PerformanceCollector android.os.Bundle addIteration(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Messenger android.os.Messenger readMessengerOrNullFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.DropBoxManager.Entry void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.UserHandle UserHandle(android.os.Parcel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor fromSocket(java.net.Socket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.StrictMode void onIntentReceiverLeaked(java.lang.Throwable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Binder boolean isProxy(android.os.IInterface) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectLeakedClosableObjects()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.PatternMatcher java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getExternalStorageAppFilesDirectory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.IPowerManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.IPowerManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.os.PerformanceCollector.PerformanceResultsWriter void writeEndSnapshot(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.IVibratorService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.SystemProperties long getLong(java.lang.String, long) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Registrant void notifyRegistrant(android.os.AsyncResult) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getLegacyExternalStorageDirectory()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.Binder boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.UserHandle android.os.UserHandle readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.CancellationSignal android.os.ICancellationSignal createTransport()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode void onServiceConnectionLeaked(java.lang.Throwable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode android.os.StrictMode.ThreadPolicy allowThreadDiskReads()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectDiskReads()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppObbDirectory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppMediaDirectory(java.lang.String)'>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.DropBoxManager.Entry Entry(java.lang.String, long, java.io.File, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Environment java.io.File getSecureDataDirectory()'>
+    <item name='android.os.Debug java.lang.String getCaller()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder penaltyDropBox()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectNetwork()'>
+    <item name='android.os.PowerManager.WakeLock java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.RegistrantList void notifyRegistrants(android.os.AsyncResult) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.os.StrictMode android.os.StrictMode.ThreadPolicy allowThreadDiskReads()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.VmPolicy java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getExternalStorageAppObbDirectory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.SystemVibrator void vibrate(long[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.os.RecoverySystem void installPackage(android.content.Context, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler Handler(android.os.Looper) 0'>
+    <item name='android.os.ParcelUuid java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.IUpdateLock.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.MemoryFile java.io.OutputStream getOutputStream()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel T readCreator(android.os.Parcelable.Creator&lt;T&gt;, java.lang.ClassLoader) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Debug void dumpHprofData(java.lang.String) 0'>
+    <item name='android.os.IPowerManager void updateWakeLockWorkSource(android.os.IBinder, android.os.WorkSource) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.INetworkManagementService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
@@ -440,58 +233,25 @@
     <item name='android.os.AsyncResult android.os.AsyncResult forMessage(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.SystemProperties java.lang.String get(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getExternalStorageAppMediaDirectory(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy build()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.IHardwareService.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode java.lang.Object trackActivity(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyDeathOnNetwork()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor fromDatagramSocket(java.net.DatagramSocket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.AsyncResult android.os.AsyncResult forMessage(android.os.Message, java.lang.Object, java.lang.Throwable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.AsyncTask android.os.AsyncTask&lt;Params,Progress,Result&gt; executeOnExecutor(java.util.concurrent.Executor, Params...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel void readFloatArray(float[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel void readDoubleArray(double[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.RemoteCallbackList boolean register(E) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode android.os.StrictMode.Span enterCriticalSpan(java.lang.String)'>
+    <item name='android.os.IServiceManager java.lang.String[] listServices()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStoragePublicDirectory(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppCacheDirectory(java.lang.String)'>
+    <item name='android.os.BatteryStats.Uid java.util.Map&lt;java.lang.Integer,? extends android.os.BatteryStats.Uid.Sensor&gt; getSensorStats()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Binder boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Bundle java.lang.String toString()'>
+    <item name='android.os.Bundle java.util.Set&lt;java.lang.String&gt; keySet()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Debug java.lang.String getCallers(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.StrictMode.ViolationInfo void dump(android.util.Printer, java.lang.String) 0'>
@@ -500,10 +260,7 @@
     <item name='android.os.AsyncResult android.os.AsyncResult forMessage(android.os.Message, java.lang.Object, java.lang.Throwable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.PerformanceCollector android.os.Bundle addIteration(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.IBinder boolean transact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.os.INetworkManagementService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Environment java.io.File getExternalStorageAppObbDirectory(java.lang.String) 0'>
@@ -512,130 +269,79 @@
     <item name='android.os.Parcel void readCharArray(char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.os.StrictMode android.os.StrictMode.ThreadPolicy getThreadPolicy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.os.ISchedulingPolicyService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectAll()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder penaltyDeath()'>
+    <item name='android.os.ParcelUuid android.os.ParcelUuid fromString(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.SystemProperties java.lang.String get(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.FileUtils long checksumCrc32(java.io.File) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel void appendFrom(android.os.Parcel, int, int) 0'>
+    <item name='android.os.FileObserver void onEvent(int, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Debug.MemoryInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor adoptFd(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.os.StrictMode.ViolationInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.IUserManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.BatteryStats.HistoryPrinter void printNextItem(java.io.PrintWriter, android.os.BatteryStats.HistoryItem, long) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.FileUtils void stringToFile(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.ServiceManagerNative android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel T[] readTypedArray(android.os.Parcelable.Creator&lt;T&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Debug.MemoryInfo java.lang.String getOtherLabel(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.MessageQueue void addIdleHandler(android.os.MessageQueue.IdleHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.os.Looper android.os.MessageQueue myQueue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IUserManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.os.PowerManager android.os.PowerManager.WakeLock newWakeLock(int, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Environment java.io.File getDataDirectory()'>
+    <item name='android.os.StrictMode android.os.StrictMode.Span enterCriticalSpan(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Parcel byte[] createByteArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.ParcelUuid java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor adoptFd(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel void readStringList(java.util.List&lt;java.lang.String&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.BatteryStats void dumpCheckinLocked(java.io.PrintWriter, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Binder boolean transact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.TokenWatcher void dump(java.io.PrintWriter) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.VmPolicy java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getExternalStoragePublicDirectory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Handler boolean runWithScissors(java.lang.Runnable, long) 0'>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppMediaDirectory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.AsyncTask Result get(long, java.util.concurrent.TimeUnit) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler Handler(android.os.Looper, android.os.Handler.Callback, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.ParcelFileDescriptor void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Parcel void readTypedArray(T[], android.os.Parcelable.Creator&lt;T&gt;) 1'>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitDiskReads()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectAll()'>
+    <item name='android.os.ISchedulingPolicyService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.MemoryFile java.io.InputStream getInputStream()'>
+    <item name='android.os.ParcelFileDescriptor java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode android.os.StrictMode.VmPolicy getVmPolicy()'>
+    <item name='android.os.IMessenger.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.PatternMatcher PatternMatcher(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.ParcelUuid void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Binder boolean transact(int, android.os.Parcel, android.os.Parcel, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Message android.os.Message obtain(android.os.Message) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.RemoteCallback void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.BatteryStats void dumpCheckinLocked(java.io.PrintWriter, java.lang.String[], java.util.List&lt;android.content.pm.ApplicationInfo&gt;) 0'>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder penaltyDeath()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int, java.lang.Object)'>
+    <item name='android.os.CountDownTimer android.os.CountDownTimer start()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStoragePublicDirectory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Parcel java.util.ArrayList&lt;T&gt; createTypedArrayList(android.os.Parcelable.Creator&lt;T&gt;) 0'>
@@ -647,58 +353,634 @@
     <item name='android.os.UserManager long getSerialNumberForUser(android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.os.BatteryStats.Uid.Pkg java.util.Map&lt;java.lang.String,? extends android.os.BatteryStats.Uid.Pkg.Serv&gt; getServiceStats()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode java.lang.Object trackActivity(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.os.ParcelFileDescriptor.AutoCloseOutputStream AutoCloseOutputStream(android.os.ParcelFileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.AsyncTask android.os.AsyncTask&lt;Params,Progress,Result&gt; execute(Params...)'>
+    <item name='android.os.Process android.os.Process.ProcessStartResult start(java.lang.String, java.lang.String, int, int, int[], int, int, int, java.lang.String, java.lang.String[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Message android.os.Message obtain(android.os.Handler)'>
+    <item name='android.os.Vibrator void vibrate(long[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.RemoteCallbackList boolean register(E, java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Handler android.os.Message obtainMessage(int, java.lang.Object)'>
+    <item name='android.os.INetworkManagementService void setDnsServersForInterface(java.lang.String, java.lang.String[], java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.RecoverySystem void installPackage(android.content.Context, java.io.File) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Message android.os.Message obtain(android.os.Message)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder Builder(android.os.StrictMode.ThreadPolicy) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Debug java.lang.String getCallers(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.DropBoxManager.Entry Entry(java.lang.String, long, byte[], int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.ISchedulingPolicyService.Stub android.os.IBinder asBinder()'>
+    <item name='android.os.CancellationSignal android.os.ICancellationSignal createTransport()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Parcel void readList(java.util.List, java.lang.ClassLoader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Message void copyFrom(android.os.Message) 0'>
+    <item name='android.os.BatteryStats.Uid java.util.Map&lt;java.lang.String,? extends android.os.BatteryStats.Uid.Pkg&gt; getPackageStats()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Looper java.lang.String toString()'>
+    <item name='android.os.RemoteCallback void onResult(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.IPermissionController.Stub android.os.IBinder asBinder()'>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy build()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.RemoteCallbackList boolean unregister(E) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor open(java.io.File, int) 0'>
+    <item name='android.os.AsyncTask android.os.AsyncTask.Status getStatus()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Debug java.lang.String getCaller()'>
+    <item name='android.os.IServiceManager void setPermissionController(android.os.IPermissionController) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel byte[] createByteArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel T[] createTypedArray(android.os.Parcelable.Creator&lt;T&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Bundle android.os.Bundle forPair(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppCacheDirectory(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IMessenger void send(android.os.Message) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.SystemService.State android.os.SystemService.State valueOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcelable.ClassLoaderCreator T createFromParcel(android.os.Parcel, java.lang.ClassLoader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Messenger void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler boolean sendMessageDelayed(android.os.Message, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readIntArray(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ViolationInfo ViolationInfo(java.lang.Throwable, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.DropBoxManager.Entry Entry(java.lang.String, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyDropBox()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppMediaDirectory(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Bundle java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats.HistoryItem void writeDelta(android.os.Parcel, android.os.BatteryStats.HistoryItem) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppCacheDirectory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler void dispatchMessage(android.os.Message) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IUserManager void setUserRestrictions(android.os.Bundle, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectAll()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.PatternMatcher void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectFileUriExposure()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.UserHandle void writeToParcel(android.os.UserHandle, android.os.Parcel) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.UserHandle void formatUid(java.lang.StringBuilder, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.MemoryFile java.io.InputStream getInputStream()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IUpdateLock.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode android.os.StrictMode.VmPolicy getVmPolicy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IRemoteCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Looper android.os.MessageQueue getQueue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.WorkSource android.os.WorkSource stripNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats.Counter void logState(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyDialog()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode void setThreadPolicy(android.os.StrictMode.ThreadPolicy) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.MemoryFile java.io.OutputStream getOutputStream()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectNetwork()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.INetworkManagementService void enableNat(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler void handleMessage(android.os.Message) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.FileUtils java.lang.String readTextFile(java.io.File, int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.WorkSource android.os.WorkSource[] setReturningDiffs(android.os.WorkSource) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IMessenger.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppFilesDirectory(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Binder void dump(java.io.FileDescriptor, java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppFilesDirectory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats android.util.SparseArray&lt;? extends android.os.BatteryStats.Uid&gt; getUidStats()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ServiceManagerNative boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode void onSqliteObjectLeaked(java.lang.String, java.lang.Throwable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats.HistoryItem HistoryItem(long, android.os.Parcel) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ViolationInfo ViolationInfo(android.os.Parcel, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.PatternMatcher java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.INetworkManagementService void registerObserver(android.net.INetworkManagementEventObserver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IMessenger.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.NullVibrator android.os.NullVibrator getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getExternalStorageAppDataDirectory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Looper java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getExternalStoragePublicDirectory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectLeakedRegistrationObjects()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Process android.os.UserHandle myUserHandle()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.UserHandle java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ServiceManagerNative boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getExternalStorageAppFilesDirectory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcelable void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.FileUtils java.lang.String readTextFile(java.io.File, int, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getExternalStorageAppFilesDirectory(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readBinderList(java.util.List&lt;android.os.IBinder&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IUpdateLock.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.WorkSource boolean diff(android.os.WorkSource) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Bundle Bundle(android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ResultReceiver void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats.HistoryItem void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.AsyncResult android.os.AsyncResult forMessage(android.os.Message, java.lang.Object, java.lang.Throwable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IPermissionController boolean checkPermission(java.lang.String, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, java.lang.Runnable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getEmulatedStorageObbSource()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.HandlerThread HandlerThread(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IUpdateLock.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppDataDirectory(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.AsyncTask android.os.AsyncTask&lt;Params,Progress,Result&gt; executeOnExecutor(java.util.concurrent.Executor, Params...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ParcelFileDescriptor ParcelFileDescriptor(java.io.FileDescriptor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.MemoryFile void writeBytes(byte[], int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readLongArray(long[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.SELinux boolean restorecon(java.io.File) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode java.lang.Object trackActivity(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitAll()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readStringArray(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler boolean sendMessageAtFrontOfQueue(android.os.Message) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getEmulatedStorageSource(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Debug.MemoryInfo java.lang.String getOtherLabel(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.INetworkManagementService void addSecondaryRoute(java.lang.String, android.net.RouteInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler boolean sendMessageAtTime(android.os.Message, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getExternalStorageAppDataDirectory(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.WorkSource android.os.WorkSource addReturningNewbs(android.os.WorkSource) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode void onVmPolicyViolation(java.lang.String, java.lang.Throwable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Debug.MemoryInfo void readFromParcel(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler boolean sendMessage(android.os.Message) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.WorkSource boolean add(android.os.WorkSource) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getSystemSecureDirectory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.DropBoxManager void addFile(java.lang.String, java.io.File, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.SystemService.State android.os.SystemService.State valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.WorkSource void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectDiskWrites()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IPowerManager void acquireWakeLock(android.os.IBinder, int, java.lang.String, android.os.WorkSource) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppObbDirectory(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode void setVmPolicy(android.os.StrictMode.VmPolicy) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.PowerManager android.os.PowerManager.WakeLock newWakeLock(int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.SystemService void waitForState(java.lang.String, android.os.SystemService.State, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectLeakedClosableObjects()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler void dump(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.INetworkManagementService android.net.NetworkStats getNetworkStatsTethering(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder penaltyLog()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.UEventObserver void startObserving(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.UserManager android.os.Bundle getApplicationRestrictions(java.lang.String, android.os.UserHandle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.TokenWatcher void acquire(android.os.IBinder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Binder void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IBinder void dumpAsync(java.io.FileDescriptor, java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readMap(java.util.Map, java.lang.ClassLoader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getSecureDataDirectory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.UEventObserver.UEvent UEvent(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readByteArray(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats.HistoryPrinter void printNextItem(java.io.PrintWriter, android.os.BatteryStats.HistoryItem, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler android.os.Message obtainMessage(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IVibratorService.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ParcelUuid android.os.ParcelUuid fromString(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.SELinux boolean restorecon(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IPowerManager void acquireWakeLock(android.os.IBinder, int, java.lang.String, android.os.WorkSource) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.INetworkManagementService void removeSecondaryRoute(java.lang.String, android.net.RouteInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.DropBoxManager.Entry void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.UserHandle UserHandle(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Binder boolean isProxy(android.os.IInterface) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IPowerManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Binder void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Registrant void notifyRegistrant(android.os.AsyncResult) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ServiceManagerNative android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.SystemProperties long getLong(java.lang.String, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode void onServiceConnectionLeaked(java.lang.Throwable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.DropBoxManager.Entry java.lang.String getTag()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.AsyncTask Result doInBackground(Params...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Message)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyDeathOnNetwork()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler Handler(android.os.Looper) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel T readCreator(android.os.Parcelable.Creator&lt;T&gt;, java.lang.ClassLoader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Debug void dumpHprofData(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.SystemProperties java.lang.String get(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IBinder boolean transact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getExternalStorageAppMediaDirectory(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ICancellationSignal.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IPowerManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readFloatArray(float[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readDoubleArray(double[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode android.os.StrictMode.ThreadPolicy allowThreadDiskWrites()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStoragePublicDirectory(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.UEventObserver void onUEvent(android.os.UEventObserver.UEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitDiskWrites()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IBinder boolean transact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcelable.Creator T createFromParcel(android.os.Parcel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ICancellationSignal.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.FileUtils long checksumCrc32(java.io.File) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void appendFrom(android.os.Parcel, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitNetwork()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats.HistoryPrinter void printNextItem(java.io.PrintWriter, android.os.BatteryStats.HistoryItem, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.FileUtils void stringToFile(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel T[] readTypedArray(android.os.Parcelable.Creator&lt;T&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readStringList(java.util.List&lt;java.lang.String&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats void dumpCheckinLocked(java.io.PrintWriter, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Binder boolean transact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats.Uid android.util.SparseArray&lt;? extends android.os.BatteryStats.Uid.Pid&gt; getPidStats()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.TokenWatcher void dump(java.io.PrintWriter) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler boolean runWithScissors(java.lang.Runnable, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler Handler(android.os.Looper, android.os.Handler.Callback, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.SystemService android.os.SystemService.State getState(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Parcel void readTypedArray(T[], android.os.Parcelable.Creator&lt;T&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler android.os.Message obtainMessage(int, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Binder boolean transact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Message) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ParcelUuid void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Debug java.lang.String getCallers(int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats void dumpCheckinLocked(java.io.PrintWriter, java.lang.String[], java.util.List&lt;android.content.pm.ApplicationInfo&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.BatteryStats java.util.Map&lt;java.lang.String,? extends android.os.BatteryStats.Timer&gt; getKernelWakelockStats()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.RemoteCallbackList boolean register(E, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ICancellationSignal.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder Builder(android.os.StrictMode.ThreadPolicy) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler android.os.Message obtainMessage()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.DropBoxManager.Entry Entry(java.lang.String, long, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message void copyFrom(android.os.Message) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getUserSystemDirectory(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor open(java.io.File, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.BatteryStats void dumpCheckinLocked(java.io.PrintWriter, java.lang.String[], java.util.List&lt;android.content.pm.ApplicationInfo&gt;) 1'>
@@ -710,91 +992,49 @@
     <item name='android.os.HandlerThread HandlerThread(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Parcel T[] createTypedArray(android.os.Parcelable.Creator&lt;T&gt;) 0'>
+    <item name='android.os.Bundle java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.DropBoxManager.Entry Entry(java.lang.String, long, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.SystemService android.os.SystemService.State getState(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getExternalStorageAppObbDirectory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.PowerManager void validateWakeLockParameters(int, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppCacheDirectory(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.SystemService.State android.os.SystemService.State valueOf(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.BatteryStats.HistoryItem void readDelta(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.StrictMode void onWebViewMethodCalledOnWrongThread(java.lang.Throwable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitAll()'>
+    <item name='android.os.ISchedulingPolicyService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.UserHandle java.lang.String toString()'>
+    <item name='android.os.StrictMode.ThreadPolicy java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.UserManager void setApplicationRestrictions(java.lang.String, android.os.Bundle, android.os.UserHandle) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Environment java.io.File getEmulatedStorageObbSource()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Messenger void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder permitNetwork()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.AsyncTask.Status android.os.AsyncTask.Status valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Handler android.os.Message obtainMessage(int)'>
+    <item name='android.os.Binder android.os.UserHandle getCallingUserHandle()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Parcel void writeException(java.lang.Exception) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Message void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectCustomSlowCalls()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Handler boolean sendMessageDelayed(android.os.Message, long) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.IMessenger.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel void readIntArray(int[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getDownloadCacheDirectory()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.Messenger Messenger(android.os.Handler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.ViolationInfo ViolationInfo(java.lang.Throwable, int) 0'>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder penaltyDropBox()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Parcel void readTypedArray(T[], android.os.Parcelable.Creator&lt;T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Bundle java.util.Set&lt;java.lang.String&gt; keySet()'>
+    <item name='android.os.BatteryStats.Uid java.util.Map&lt;java.lang.String,? extends android.os.BatteryStats.Uid.Proc&gt; getProcessStats()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.DropBoxManager.Entry Entry(java.lang.String, long) 0'>
+    <item name='android.os.Environment java.io.File getRootDirectory()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.BatteryStats.HistoryItem boolean same(android.os.BatteryStats.HistoryItem) 0'>
@@ -803,46 +1043,37 @@
     <item name='android.os.BatteryStats void dumpLocked(java.io.PrintWriter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Parcel byte[] marshall()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.StrictMode.VmPolicy.Builder Builder(android.os.StrictMode.VmPolicy) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.StrictMode.ViolationInfo ViolationInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int, int, int, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppMediaDirectory(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.DropBoxManager void addData(java.lang.String, byte[], int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.WorkSource boolean remove(android.os.WorkSource) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.ParcelFileDescriptor java.lang.String toString()'>
+    <item name='android.os.IRemoteCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.BatteryStats.HistoryItem void writeDelta(android.os.Parcel, android.os.BatteryStats.HistoryItem) 0'>
+    <item name='android.os.Parcelable.Creator T[] newArray(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Message java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment java.io.File getUserSystemDirectory(int)'>
+    <item name='android.os.Handler java.lang.String getMessageName(android.os.Message)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.RecoverySystem void rebootWipeUserData(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler void dispatchMessage(android.os.Message) 0'>
+    <item name='android.os.IUserManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.IUserManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.os.IPermissionController.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.INetworkManagementService void removeRoute(java.lang.String, android.net.RouteInfo) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.DropBoxManager.Entry Entry(java.lang.String, long, java.lang.String) 0'>
@@ -851,85 +1082,82 @@
     <item name='android.os.NullVibrator void vibrate(int, java.lang.String, long[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.SystemService void waitForAnyStopped(java.lang.String...) 0'>
+    <item name='android.os.INetworkManagementService void startTethering(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.INetworkManagementService void addRoute(java.lang.String, android.net.RouteInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getDataDirectory()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.NullVibrator void vibrate(long[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.PatternMatcher void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.os.SystemService void waitForAnyStopped(java.lang.String...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Handler android.os.Message obtainMessage(int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.DropBoxManager void addFile(java.lang.String, java.io.File, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.UserHandle void writeToParcel(android.os.UserHandle, android.os.Parcel) 1'>
+    <item name='android.os.IHardwareService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Parcel void writeParcelableCreator(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.UserHandle void formatUid(java.lang.StringBuilder, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Message android.os.Message obtain()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.UserHandle void formatUid(java.io.PrintWriter, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.FileUtils void deleteOlderFiles(java.io.File, int, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int)'>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectAll()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler android.os.Message obtainMessage(int, int, int)'>
+    <item name='android.os.Handler.Callback boolean handleMessage(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.INetworkManagementService.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcel android.os.Parcel obtain(int)'>
+    <item name='android.os.PerformanceCollector.PerformanceResultsWriter void writeStopTiming(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.UserManager boolean isUserRunning(android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode void setThreadPolicy(android.os.StrictMode.ThreadPolicy) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Handler android.os.Message obtainMessage(int, int, int, java.lang.Object)'>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectCustomSlowCalls()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.WorkSource void set(int, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.SystemProperties void set(java.lang.String, java.lang.String) 0'>
+    <item name='android.os.Vibrator void vibrate(int, java.lang.String, long[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.ServiceManager void initServiceCache(java.util.Map&lt;java.lang.String,android.os.IBinder&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler void handleMessage(android.os.Message) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.WorkSource android.os.WorkSource[] setReturningDiffs(android.os.WorkSource) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Environment.UserEnvironment java.io.File getExternalStorageAppFilesDirectory(java.lang.String) 0'>
+    <item name='android.os.SystemProperties void set(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Debug void startMethodTracing(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Binder void dump(java.io.FileDescriptor, java.lang.String[]) 0'>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int, int, int, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode void onSqliteObjectLeaked(java.lang.String, java.lang.Throwable) 1'>
+    <item name='android.os.IBinder void dump(java.io.FileDescriptor, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.BatteryStats.HistoryItem HistoryItem(long, android.os.Parcel) 1'>
+    <item name='android.os.BatteryStats.Timer void logState(android.util.Printer, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.IPowerManager void releaseWakeLock(android.os.IBinder, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Environment java.io.File getExternalStorageAppMediaDirectory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.AsyncTask android.os.AsyncTask&lt;Params,Progress,Result&gt; executeOnExecutor(java.util.concurrent.Executor, Params...) 0'>
@@ -938,70 +1166,46 @@
     <item name='android.os.Bundle void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Environment java.io.File getExternalStorageAppCacheDirectory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.Debug void startMethodTracing(java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Handler java.lang.String getMessageName(android.os.Message)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Handler java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.Handler java.lang.String getMessageName(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Looper android.os.MessageQueue getQueue()'>
+    <item name='android.os.Parcelable.ClassLoaderCreator T createFromParcel(android.os.Parcel, java.lang.ClassLoader)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.ViolationInfo ViolationInfo(android.os.Parcel, boolean) 0'>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyLog()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.WorkSource java.lang.String toString()'>
+    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy build()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Environment java.io.File getEmulatedStorageSource(int)'>
+    <item name='android.os.SystemVibrator void vibrate(int, java.lang.String, long[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.IRemoteCallback.Stub android.os.IBinder asBinder()'>
+    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder detectActivityLeaks()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.WorkSource android.os.WorkSource stripNames()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor fromFd(int)'>
+    <item name='android.os.INetworkManagementService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.AsyncTask.Status android.os.AsyncTask.Status valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.DropBoxManager.Entry java.lang.String getTag()'>
+    <item name='android.os.IRemoteCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.PowerManager android.os.PowerManager.WakeLock newWakeLock(int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Looper java.lang.Thread getThread()'>
+    <item name='android.os.IUserManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.Parcel void readBinderArray(android.os.IBinder[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.IVibratorService.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.Bundle void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder penaltyDialog()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.Parcelable void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.os.INetworkManagementService void unregisterObserver(android.net.INetworkManagementEventObserver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/os/storage/annotations.xml b/android-sdk-annotations/android/os/storage/annotations.xml
index 3d660bcbc2a..6294edddae8 100644
--- a/android-sdk-annotations/android/os/storage/annotations.xml
+++ b/android-sdk-annotations/android/os/storage/annotations.xml
@@ -1,29 +1,23 @@
 <root>
-    <item name='android.os.storage.StorageManager android.os.storage.StorageManager from(android.content.Context) 0'>
+    <item name='android.os.storage.IMountService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.StorageManager boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.storage.IMountService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.storage.StorageManager boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener) 2'>
+    <item name='android.os.storage.IMountService void unmountObb(java.lang.String, boolean, android.os.storage.IObbActionListener, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.storage.IObbActionListener.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.StorageVolume java.lang.String getDescription(android.content.Context)'>
+    <item name='android.os.storage.StorageManager boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.StorageManager android.os.storage.StorageVolume getPrimaryVolume(android.os.storage.StorageVolume[]) 0'>
+    <item name='android.os.storage.IMountService boolean isObbMounted(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.StorageVolume void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.os.storage.IMountService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.StorageVolume android.os.storage.StorageVolume fromTemplate(android.os.storage.StorageVolume, java.io.File, android.os.UserHandle)'>
+    <item name='android.os.storage.IMountService java.lang.String getVolumeState(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.storage.StorageManager boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener) 2'>
@@ -32,43 +26,82 @@
     <item name='android.os.storage.IObbActionListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.StorageVolume java.lang.String getDescription(android.content.Context) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.storage.StorageManager java.lang.String getMountedObbPath(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.StorageManager boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.storage.StorageManager boolean isObbMounted(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.StorageVolume java.lang.String toString()'>
+    <item name='android.os.storage.IObbActionListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.IMountServiceListener.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.os.storage.IMountServiceListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.os.storage.IMountServiceListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.storage.IMountShutdownObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.IMountShutdownObserver.Stub android.os.IBinder asBinder()'>
+    <item name='android.os.storage.IMountService void mountObb(java.lang.String, java.lang.String, java.lang.String, android.os.storage.IObbActionListener, int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.IMountService void mountObb(java.lang.String, java.lang.String, java.lang.String, android.os.storage.IObbActionListener, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.storage.StorageVolume android.os.storage.StorageVolume fromTemplate(android.os.storage.StorageVolume, java.io.File, android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.IMountService.Stub android.os.IBinder asBinder()'>
+    <item name='android.os.storage.StorageManager long getStorageLowBytes(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.storage.StorageManager long getStorageLowBytes(java.io.File) 0'>
+    <item name='android.os.storage.StorageVolume java.lang.String getDescription(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.StorageManager android.os.storage.StorageManager from(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.IMountService java.lang.String getMountedObbPath(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.StorageManager boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.StorageVolume java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.IMountService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.StorageManager android.os.storage.StorageVolume getPrimaryVolume(android.os.storage.StorageVolume[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.StorageVolume void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.StorageVolume java.lang.String getDescription(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.StorageManager boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.IMountShutdownObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.StorageVolume android.os.storage.StorageVolume fromTemplate(android.os.storage.StorageVolume, java.io.File, android.os.UserHandle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.IMountServiceListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.os.storage.StorageVolume java.lang.String getPath()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.os.storage.IMountShutdownObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.IMountServiceListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.storage.IMountService void mountObb(java.lang.String, java.lang.String, java.lang.String, android.os.storage.IObbActionListener, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/preference/annotations.xml b/android-sdk-annotations/android/preference/annotations.xml
index f9cf5b1c88a..8a1ba6536ff 100644
--- a/android-sdk-annotations/android/preference/annotations.xml
+++ b/android-sdk-annotations/android/preference/annotations.xml
@@ -14,7 +14,7 @@
     <item name='android.preference.PreferenceGroup void dispatchSaveInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceManager android.preference.PreferenceScreen createPreferenceScreen(android.content.Context)'>
+    <item name='android.preference.VolumePreference.SeekBarVolumizer void onProgressChanged(android.widget.SeekBar, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.SwitchPreference SwitchPreference(android.content.Context, android.util.AttributeSet, int) 1'>
@@ -23,9 +23,18 @@
     <item name='android.preference.PreferenceManager void setDefaultValues(android.content.Context, java.lang.String, int, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.PreferenceManager android.preference.PreferenceScreen inflateFromResource(android.content.Context, int, android.preference.PreferenceScreen)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.MultiCheckPreference void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.SeekBarPreference SeekBarPreference(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.Preference void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.ListPreference void onPrepareDialogBuilder(android.app.AlertDialog.Builder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -38,6 +47,9 @@
     <item name='android.preference.Preference void onAttachedToHierarchy(android.preference.PreferenceManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.PreferenceActivity android.preference.PreferenceActivity.Header onGetInitialHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.PreferenceScreen PreferenceScreen(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -47,6 +59,9 @@
     <item name='android.preference.ListPreference java.lang.Object onGetDefaultValue(android.content.res.TypedArray, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.Preference void onSetInitialValue(boolean, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.RingtonePreference RingtonePreference(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -56,10 +71,10 @@
     <item name='android.preference.Preference void saveHierarchyState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.Preference java.lang.String toString()'>
+    <item name='android.preference.PreferenceFrameLayout void addView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceFrameLayout void addView(android.view.View) 0'>
+    <item name='android.preference.Preference boolean onKey(android.view.View, int, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.EditTextPreference EditTextPreference(android.content.Context, android.util.AttributeSet) 0'>
@@ -71,6 +86,9 @@
     <item name='android.preference.MultiSelectListPreference void setValues(java.util.Set&lt;java.lang.String&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.PreferenceManager android.preference.PreferenceScreen createPreferenceScreen(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.VolumePreference.SeekBarVolumizer void onRestoreInstanceState(android.preference.VolumePreference.VolumeStore) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,21 +98,21 @@
     <item name='android.preference.PreferenceGroup boolean addPreference(android.preference.Preference) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceActivity android.preference.PreferenceActivity.Header onGetInitialHeader()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.preference.SeekBarDialogPreference void onBindDialogView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceFrameLayout android.widget.FrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.preference.EditTextPreference EditTextPreference(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.RingtonePreference RingtonePreference(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.PreferenceActivity android.content.Intent onBuildStartFragmentIntent(java.lang.String, android.os.Bundle, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.ListPreference void onSetInitialValue(boolean, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.Preference.BaseSavedState BaseSavedState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -137,6 +155,12 @@
     <item name='android.preference.TwoStatePreference TwoStatePreference(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.VolumePreference boolean onKey(android.view.View, int, android.view.KeyEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.TwoStatePreference java.lang.Object onGetDefaultValue(android.content.res.TypedArray, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.TwoStatePreference TwoStatePreference(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -149,6 +173,9 @@
     <item name='android.preference.SeekBarDialogPreference SeekBarDialogPreference(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.PreferenceFrameLayout android.preference.PreferenceFrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.VolumePreference.SeekBarVolumizer SeekBarVolumizer(android.preference.VolumePreference, android.content.Context, android.widget.SeekBar, int, android.net.Uri) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -158,6 +185,9 @@
     <item name='android.preference.ListPreference ListPreference(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.Preference android.view.View onCreateView(android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.SwitchPreference SwitchPreference(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -167,9 +197,6 @@
     <item name='android.preference.MultiCheckPreference java.lang.Object onGetDefaultValue(android.content.res.TypedArray, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceManager android.preference.PreferenceScreen inflateFromResource(android.content.Context, int, android.preference.PreferenceScreen)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.preference.DialogPreference DialogPreference(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -197,6 +224,15 @@
     <item name='android.preference.VolumePreference.SeekBarVolumizer SeekBarVolumizer(android.preference.VolumePreference, android.content.Context, android.widget.SeekBar, int, android.net.Uri) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.PreferenceScreen void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.PreferenceScreen android.widget.ListAdapter onCreateRootAdapter()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.SeekBarPreference void onSetInitialValue(boolean, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.PreferenceGroup boolean removePreference(android.preference.Preference) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -239,9 +275,6 @@
     <item name='android.preference.MultiCheckPreference MultiCheckPreference(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.MultiSelectListPreference java.lang.Object onGetDefaultValue(android.content.res.TypedArray, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.preference.RingtonePreference RingtonePreference(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -254,18 +287,15 @@
     <item name='android.preference.SeekBarPreference SeekBarPreference(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceFrameLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.preference.ListPreference void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.RingtonePreference void onSetInitialValue(boolean, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.DialogPreference void onClick(android.content.DialogInterface, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.TwoStatePreference java.lang.Object onGetDefaultValue(android.content.res.TypedArray, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.preference.PreferenceFrameLayout android.preference.PreferenceFrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.preference.PreferenceFrameLayout PreferenceFrameLayout(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -275,31 +305,46 @@
     <item name='android.preference.PreferenceActivity.Header void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.SeekBarPreference void onProgressChanged(android.widget.SeekBar, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.PreferenceFrameLayout android.widget.FrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.CheckBoxPreference void onBindView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.Preference void restoreHierarchyState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.MultiSelectListPreference java.util.Set&lt;java.lang.String&gt; getValues()'>
+    <item name='android.preference.MultiCheckPreference MultiCheckPreference(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.MultiCheckPreference MultiCheckPreference(android.content.Context, android.util.AttributeSet) 1'>
+    <item name='android.preference.PreferenceActivity java.util.List&lt;android.preference.PreferenceActivity.Header&gt; getHeaders()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.Preference.BaseSavedState BaseSavedState(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.MultiSelectListPreference java.lang.Object onGetDefaultValue(android.content.res.TypedArray, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.Preference android.view.View getView(android.view.View, android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.CheckBoxPreference CheckBoxPreference(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.TwoStatePreference void onSetInitialValue(boolean, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.EditTextPreference EditTextPreference(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.MultiCheckPreference MultiCheckPreference(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceScreen android.widget.ListAdapter onCreateRootAdapter()'>
+    <item name='android.preference.PreferenceFrameLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.Preference Preference(android.content.Context, android.util.AttributeSet) 0'>
@@ -320,10 +365,10 @@
     <item name='android.preference.SeekBarPreference SeekBarPreference(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.Preference Preference(android.content.Context, android.util.AttributeSet, int) 0'>
+    <item name='android.preference.MultiCheckPreference void onPrepareDialogBuilder(android.app.AlertDialog.Builder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.MultiCheckPreference void onPrepareDialogBuilder(android.app.AlertDialog.Builder) 0'>
+    <item name='android.preference.Preference Preference(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.TwoStatePreference TwoStatePreference(android.content.Context, android.util.AttributeSet, int) 1'>
@@ -332,25 +377,34 @@
     <item name='android.preference.DialogPreference void onPrepareDialogBuilder(android.app.AlertDialog.Builder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.EditTextPreference void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.Preference Preference(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.PreferenceFragment.OnPreferenceStartFragmentCallback boolean onPreferenceStartFragment(android.preference.PreferenceFragment, android.preference.Preference) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceCategory boolean onPrepareAddPreference(android.preference.Preference) 0'>
+    <item name='android.preference.MultiSelectListPreference java.util.Set&lt;java.lang.String&gt; getValues()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceActivity android.content.Intent onBuildStartFragmentIntent(java.lang.String, android.os.Bundle, int, int)'>
+    <item name='android.preference.VolumePreference void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.PreferenceCategory boolean onPrepareAddPreference(android.preference.Preference) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.CheckBoxPreference CheckBoxPreference(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceActivity void onSaveInstanceState(android.os.Bundle) 0'>
+    <item name='android.preference.PreferenceFrameLayout android.preference.PreferenceFrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceFrameLayout android.preference.PreferenceFrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
+    <item name='android.preference.GenericInflater.Parent void addItemFromInflater(T) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.PreferenceActivity void onSaveInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.PreferenceGroup void addItemFromInflater(java.lang.Object) 0'>
@@ -365,6 +419,9 @@
     <item name='android.preference.Preference Preference(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.EditTextPreference void onSetInitialValue(boolean, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.TwoStatePreference TwoStatePreference(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -380,6 +437,12 @@
     <item name='android.preference.PreferenceManager PreferenceManager(android.app.Activity, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.MultiCheckPreference void onSetInitialValue(boolean, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.preference.TwoStatePreference void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.PreferenceFrameLayout PreferenceFrameLayout(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -431,9 +494,6 @@
     <item name='android.preference.ListPreference ListPreference(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.Preference android.view.View getView(android.view.View, android.view.ViewGroup)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.preference.SwitchPreference SwitchPreference(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -449,7 +509,7 @@
     <item name='android.preference.MultiSelectListPreference MultiSelectListPreference(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.PreferenceActivity java.util.List&lt;android.preference.PreferenceActivity.Header&gt; getHeaders()'>
+    <item name='android.preference.DialogPreference void onRestoreInstanceState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.preference.SeekBarPreference void onBindView(android.view.View) 0'>
@@ -461,15 +521,18 @@
     <item name='android.preference.VolumePreference.SeekBarVolumizer SeekBarVolumizer(android.preference.VolumePreference, android.content.Context, android.widget.SeekBar, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.preference.Preference android.view.View onCreateView(android.view.ViewGroup)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.preference.EditTextPreference java.lang.Object onGetDefaultValue(android.content.res.TypedArray, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.PreferenceActivity boolean onPreferenceTreeClick(android.preference.PreferenceScreen, android.preference.Preference) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.PreferenceCategory PreferenceCategory(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.VolumePreference.SeekBarVolumizer void onStopTrackingTouch(android.widget.SeekBar) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.PreferenceActivity void loadHeadersFromResource(int, java.util.List&lt;android.preference.PreferenceActivity.Header&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -482,6 +545,9 @@
     <item name='android.preference.PreferenceGroup PreferenceGroup(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.preference.Preference java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.preference.ListPreference ListPreference(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/provider/annotations.xml b/android-sdk-annotations/android/provider/annotations.xml
index 338f334a708..05d0a789d1c 100644
--- a/android-sdk-annotations/android/provider/annotations.xml
+++ b/android-sdk-annotations/android/provider/annotations.xml
@@ -5,15 +5,6 @@
     <item name='android.provider.Browser boolean canClearHistory(android.content.ContentResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Audio.Genres.Members android.net.Uri getContentUri(java.lang.String, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.MediaStore.Audio.Media android.net.Uri getContentUriForPath(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.BrowserContract.SyncState android.content.ContentProviderOperation newSetOperation(android.accounts.Account, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Contacts.People android.net.Uri addToGroup(android.content.ContentResolver, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,6 +14,9 @@
     <item name='android.provider.UserDictionary.Words void addWord(android.content.Context, java.lang.String, int, java.lang.String, java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.VoicemailContract.Voicemails android.net.Uri buildSourceUri(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Telephony.Sms.Sent android.net.Uri addMessage(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String, java.lang.Long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,6 +26,15 @@
     <item name='android.provider.Browser void clearSearches(android.content.ContentResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.MediaStore android.net.Uri getMediaScannerUri()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.BrowserContract.Bookmarks android.net.Uri buildFolderUri(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.Browser java.lang.String[] getVisitedHistory(android.content.ContentResolver)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.ContactsContract.CommonDataKinds.Email java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -44,6 +47,9 @@
     <item name='android.provider.Settings.System void getConfiguration(android.content.ContentResolver, android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.Contacts.ContactMethods java.lang.String encodeCustomImProtocol(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Browser void deleteHistoryTimeFrame(android.content.ContentResolver, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -53,6 +59,9 @@
     <item name='android.provider.BrowserContract.Settings boolean isSyncEnabled(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder setLimit(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.CalendarContract.CalendarAlerts boolean alarmExists(android.content.ContentResolver, long, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -71,6 +80,9 @@
     <item name='android.provider.ContactsContract.CommonDataKinds.SipAddress java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.ContactsContract.QuickContact android.content.Intent composeQuickContactsIntent(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Contacts.People android.database.Cursor queryGroups(android.content.ContentResolver, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,13 +92,10 @@
     <item name='android.provider.Settings.System boolean putConfiguration(android.content.ContentResolver, android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.Telephony.Mms java.lang.String getMessageBoxName(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Contacts.People void setPhotoData(android.content.ContentResolver, android.net.Uri, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Files android.net.Uri getMtpObjectsUri(java.lang.String)'>
+    <item name='android.provider.MediaStore.Audio.Media android.net.Uri getContentUriForPath(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Settings.Secure float getFloat(android.content.ContentResolver, java.lang.String, float) 0'>
@@ -101,6 +110,9 @@
     <item name='android.provider.ContactsContract.CommonDataKinds.Im java.lang.CharSequence getProtocolLabel(android.content.res.Resources, int, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.MediaStore.Files android.net.Uri getContentUri(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Settings.Secure float getFloat(android.content.ContentResolver, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -110,7 +122,10 @@
     <item name='android.provider.MediaStore.Images.Thumbnails android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.VoicemailContract.Status android.net.Uri buildSourceUri(java.lang.String)'>
+    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder setContactId(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.MediaStore.Images.Media android.net.Uri getContentUri(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.ContactsContract.Data android.net.Uri getContactLookupUri(android.content.ContentResolver, android.net.Uri) 0'>
@@ -125,12 +140,6 @@
     <item name='android.provider.MediaStore.Audio.Playlists.Members boolean moveItem(android.content.ContentResolver, long, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Video.Media android.net.Uri getContentUri(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder setLimit(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Browser android.database.Cursor getAllVisitedUrls(android.content.ContentResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -140,9 +149,6 @@
     <item name='android.provider.CalendarContract.CalendarAlerts long findNextAlarmTime(android.content.ContentResolver, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.CalendarContract.EventsEntity android.content.EntityIterator newEntityIterator(android.database.Cursor, android.content.ContentProviderClient)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Contacts.People void setPhotoData(android.content.ContentResolver, android.net.Uri, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -161,22 +167,19 @@
     <item name='android.provider.Telephony.Sms.Intents android.telephony.SmsMessage[] getMessagesFromIntent(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore android.net.Uri getMediaScannerUri()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Contacts.ContactMethods java.lang.CharSequence getDisplayLabel(android.content.Context, int, int, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.SyncStateContract.Helpers byte[] get(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.MediaStore.Audio.Playlists android.net.Uri getContentUri(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.ContactsContract.Data android.net.Uri getContactLookupUri(android.content.ContentResolver, android.net.Uri) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.Contacts android.net.Uri getLookupUri(long, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.MediaStore.Files android.net.Uri getContentUri(java.lang.String)'>
+    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder android.net.Uri build()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Settings.Secure boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String) 0'>
@@ -185,9 +188,6 @@
     <item name='android.provider.CallLog.Calls android.net.Uri addCall(com.android.internal.telephony.CallerInfo, android.content.Context, java.lang.String, int, int, long, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder builder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Settings.Global long getLong(android.content.ContentResolver, java.lang.String, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -203,21 +203,12 @@
     <item name='android.provider.Settings.NameValueTable boolean putString(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.Browser java.lang.String[] getVisitedHistory(android.content.ContentResolver)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.Telephony.Sms.Intents android.telephony.SmsMessage[] getMessagesFromIntent(android.content.Intent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Settings.System boolean putLong(android.content.ContentResolver, java.lang.String, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Settings.NameValueTable android.net.Uri getUriFor(android.net.Uri, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.RawContacts android.content.EntityIterator newEntityIterator(android.database.Cursor)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.SyncStateContract.Helpers android.util.Pair&lt;android.net.Uri,byte[]&gt; getWithUri(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -227,7 +218,10 @@
     <item name='android.provider.ContactsContract.SyncState android.util.Pair&lt;android.net.Uri,byte[]&gt; getWithUri(android.content.ContentProviderClient, android.accounts.Account) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.Settings.Global java.lang.String getBluetoothHeadsetPriorityKey(java.lang.String)'>
+    <item name='android.provider.SyncStateContract.Helpers android.content.ContentProviderOperation newSetOperation(android.net.Uri, android.accounts.Account, byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.Telephony.Mms java.lang.String getMessageBoxName(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.ContactsContract.SyncState android.util.Pair&lt;android.net.Uri,byte[]&gt; getWithUri(android.content.ContentProviderClient, android.accounts.Account) 1'>
@@ -239,22 +233,28 @@
     <item name='android.provider.Settings.NameValueTable boolean putString(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.MediaStore.Images.Thumbnails android.net.Uri getContentUri(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Settings.Bookmarks android.net.Uri add(android.content.ContentResolver, android.content.Intent, java.lang.String, java.lang.String, char, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Contacts.People android.net.Uri addToGroup(android.content.ContentResolver, long, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.MediaStore.Audio.Artists.Albums android.net.Uri getContentUri(java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.MediaStore.Images.Thumbnails android.database.Cursor queryMiniThumbnails(android.content.ContentResolver, android.net.Uri, int, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.MediaStore.Video android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.ProfileSyncState android.util.Pair&lt;android.net.Uri,byte[]&gt; getWithUri(android.content.ContentProviderClient, android.accounts.Account) 0'>
+    <item name='android.provider.MediaStore.Video.Media android.net.Uri getContentUri(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Video.Thumbnails android.net.Uri getContentUri(java.lang.String)'>
+    <item name='android.provider.ContactsContract.ProfileSyncState android.util.Pair&lt;android.net.Uri,byte[]&gt; getWithUri(android.content.ContentProviderClient, android.accounts.Account) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Settings.System java.lang.String getString(android.content.ContentResolver, java.lang.String) 0'>
@@ -275,10 +275,10 @@
     <item name='android.provider.ContactsContract.ProfileSyncState void set(android.content.ContentProviderClient, android.accounts.Account, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder android.net.Uri build()'>
+    <item name='android.provider.ContactsContract.QuickContact android.content.Intent composeQuickContactsIntent(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.QuickContact android.content.Intent composeQuickContactsIntent(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]) 1'>
+    <item name='android.provider.MediaStore.Files android.net.Uri getMtpObjectsUri(java.lang.String, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.MediaStore.Video.Thumbnails void cancelThumbnailRequest(android.content.ContentResolver, long) 0'>
@@ -293,6 +293,12 @@
     <item name='android.provider.MediaStore.Images.Thumbnails android.database.Cursor queryMiniThumbnails(android.content.ContentResolver, android.net.Uri, int, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.Telephony.Sms.Intents android.telephony.SmsMessage[] getMessagesFromIntent(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.CalendarContract.EventsEntity android.content.EntityIterator newEntityIterator(android.database.Cursor, android.content.ContentProviderClient)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.ContactsContract.QuickContact void showQuickContact(android.content.Context, android.graphics.Rect, android.net.Uri, int, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -305,9 +311,15 @@
     <item name='android.provider.ContactsContract.ProfileSyncState android.util.Pair&lt;android.net.Uri,byte[]&gt; getWithUri(android.content.ContentProviderClient, android.accounts.Account) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.Settings.Global java.lang.String getBluetoothA2dpSinkPriorityKey(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Telephony.Sms android.net.Uri addMessageToUri(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String, java.lang.String, java.lang.Long, boolean, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.ContactsContract.Groups android.content.EntityIterator newEntityIterator(android.database.Cursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.ContactsContract.CommonDataKinds.Phone java.lang.CharSequence getDisplayLabel(android.content.Context, int, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -335,58 +347,28 @@
     <item name='android.provider.CalendarContract.CalendarAlerts void scheduleAlarm(android.content.Context, android.app.AlarmManager, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.Contacts.ContactMethods java.lang.String encodePredefinedImProtocol(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.Settings.NameValueTable android.net.Uri getUriFor(android.net.Uri, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.BrowserContract.Bookmarks android.net.Uri buildFolderUri(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.MediaStore.Audio.Playlists android.net.Uri getContentUri(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Telephony.Threads long getOrCreateThreadId(android.content.Context, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Audio.Artists android.net.Uri getContentUri(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Settings.Secure boolean putFloat(android.content.ContentResolver, java.lang.String, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.SyncStateContract.Helpers android.content.ContentProviderOperation newUpdateOperation(android.net.Uri, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Settings.System void getMovedKeys(java.util.HashSet&lt;java.lang.String&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.ContactsContract.CommonDataKinds.Phone java.lang.CharSequence getDisplayLabel(android.content.Context, int, java.lang.CharSequence, java.lang.CharSequence[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Images.Thumbnails android.net.Uri getContentUri(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Settings.Global float getFloat(android.content.ContentResolver, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Telephony.Threads long getOrCreateThreadId(android.content.Context, java.util.Set&lt;java.lang.String&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.QuickContact android.content.Intent composeQuickContactsIntent(android.content.Context, android.graphics.Rect, android.net.Uri, int, java.lang.String[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder setContactId(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Telephony.Sms android.net.Uri addMessageToUri(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String, java.lang.String, java.lang.Long, boolean, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.Settings.Global java.lang.String getBluetoothA2dpSinkPriorityKey(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.MediaStore.Audio.Genres android.net.Uri getContentUri(java.lang.String)'>
+    <item name='android.provider.SyncStateContract.Helpers android.content.ContentProviderOperation newUpdateOperation(android.net.Uri, byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Contacts.Organizations java.lang.CharSequence getDisplayLabel(android.content.Context, int, java.lang.CharSequence) 0'>
@@ -407,6 +389,9 @@
     <item name='android.provider.Settings.Global java.lang.String getBluetoothInputDevicePriorityKey(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.MediaStore.Audio.Genres.Members android.net.Uri getContentUri(java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Contacts.Settings java.lang.String getSetting(android.content.ContentResolver, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -425,9 +410,6 @@
     <item name='android.provider.ContactsContract.Contacts java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.SyncState android.content.ContentProviderOperation newSetOperation(android.accounts.Account, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Settings.Global java.lang.String getBluetoothA2dpSinkPriorityKey(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -437,15 +419,15 @@
     <item name='android.provider.ContactsContract.QuickContact void showQuickContact(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.Settings.NameValueTable android.net.Uri getUriFor(android.net.Uri, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.SyncStateContract.Helpers void set(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Settings.System boolean putConfigurationForUser(android.content.ContentResolver, android.content.res.Configuration, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder addParameter(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.ContactsContract.SyncState void set(android.content.ContentProviderClient, android.accounts.Account, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -455,6 +437,9 @@
     <item name='android.provider.Settings.Global java.lang.String getBluetoothHeadsetPriorityKey(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.Settings java.lang.String getGTalkDeviceId(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Contacts.People java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -464,10 +449,10 @@
     <item name='android.provider.Contacts.People android.net.Uri createPersonInMyContactsGroup(android.content.ContentResolver, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Files android.net.Uri getContentUri(java.lang.String, long)'>
+    <item name='android.provider.BrowserContract.Settings void setSyncEnabled(android.content.Context, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.BrowserContract.Settings void setSyncEnabled(android.content.Context, boolean) 0'>
+    <item name='android.provider.MediaStore.Files android.net.Uri getMtpObjectsUri(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.ContactsContract.Contacts java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri) 1'>
@@ -482,6 +467,12 @@
     <item name='android.provider.MediaStore.Video.Thumbnails void cancelThumbnailRequest(android.content.ContentResolver, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.VoicemailContract.Status android.net.Uri buildSourceUri(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder addParameter(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.ContactsContract.QuickContact void showQuickContact(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -503,15 +494,15 @@
     <item name='android.provider.SyncStateContract.Helpers android.net.Uri insert(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.Settings.Global java.lang.String getBluetoothInputDevicePriorityKey(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.MediaStore.Images.Media java.lang.String insertImage(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Settings.Secure void setLocationProviderEnabled(android.content.ContentResolver, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.Settings.Global java.lang.String getBluetoothInputDevicePriorityKey(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Settings.Bookmarks java.lang.CharSequence getTitle(android.content.Context, android.database.Cursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -530,6 +521,9 @@
     <item name='android.provider.MediaStore.Images.Thumbnails android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.CalendarContract.EventsEntity android.content.EntityIterator newEntityIterator(android.database.Cursor, android.content.ContentResolver)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Settings.Secure boolean putInt(android.content.ContentResolver, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -545,7 +539,7 @@
     <item name='android.provider.Settings.System long getLong(android.content.ContentResolver, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Audio.Playlists.Members android.net.Uri getContentUri(java.lang.String, long)'>
+    <item name='android.provider.ContactsContract.ProfileSyncState android.content.ContentProviderOperation newSetOperation(android.accounts.Account, byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Telephony.Sms.Inbox android.net.Uri addMessage(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String, java.lang.Long, boolean) 0'>
@@ -560,9 +554,6 @@
     <item name='android.provider.Settings.System boolean putInt(android.content.ContentResolver, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Files android.net.Uri getMtpObjectsUri(java.lang.String, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.MediaStore.Images.Media android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -572,12 +563,6 @@
     <item name='android.provider.DrmStore void enforceAccessDrmPermission(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.SyncStateContract.Helpers android.content.ContentProviderOperation newSetOperation(android.net.Uri, android.accounts.Account, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.Applications android.net.Uri componentNameToUri(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Contacts.Phones java.lang.CharSequence getDisplayLabel(android.content.Context, int, java.lang.CharSequence, java.lang.CharSequence[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -593,6 +578,9 @@
     <item name='android.provider.Telephony.Sms android.net.Uri addMessageToUri(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String, java.lang.String, java.lang.Long, boolean, boolean, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.ContactsContract.QuickContact android.content.Intent composeQuickContactsIntent(android.content.Context, android.graphics.Rect, android.net.Uri, int, java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Contacts.ContactMethods void addPostalLocation(android.content.Context, long, double, double) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -608,28 +596,22 @@
     <item name='android.provider.Settings.Secure boolean isLocationProviderEnabled(android.content.ContentResolver, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.Contacts.People android.graphics.Bitmap loadContactPhoto(android.content.Context, android.net.Uri, int, android.graphics.BitmapFactory.Options) 0'>
+    <item name='android.provider.MediaStore.Audio.Genres android.net.Uri getContentUri(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.QuickContact android.content.Intent composeQuickContactsIntent(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[])'>
+    <item name='android.provider.Contacts.People android.graphics.Bitmap loadContactPhoto(android.content.Context, android.net.Uri, int, android.graphics.BitmapFactory.Options) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Settings.Global boolean putLong(android.content.ContentResolver, java.lang.String, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Files android.net.Uri getMtpReferencesUri(java.lang.String, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.SyncStateContract.Helpers android.net.Uri insert(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.CalendarContract.CalendarEntity android.content.EntityIterator newEntityIterator(android.database.Cursor)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.Telephony.Mms java.lang.String extractAddrSpec(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Audio.Genres android.net.Uri getContentUriForAudioId(java.lang.String, int)'>
+    <item name='android.provider.MediaStore.Audio.Media android.net.Uri getContentUri(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Contacts.People java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri) 0'>
@@ -641,7 +623,7 @@
     <item name='android.provider.ContactsContract.SyncState void set(android.content.ContentProviderClient, android.accounts.Account, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.Contacts.ContactMethods java.lang.String encodeCustomImProtocol(java.lang.String)'>
+    <item name='android.provider.MediaStore.Video.Thumbnails android.net.Uri getContentUri(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Settings.Global boolean putInt(android.content.ContentResolver, java.lang.String, int) 0'>
@@ -653,7 +635,7 @@
     <item name='android.provider.Contacts.People android.net.Uri addToMyContactsGroup(android.content.ContentResolver, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.Groups android.content.EntityIterator newEntityIterator(android.database.Cursor)'>
+    <item name='android.provider.Contacts.ContactMethods java.lang.String encodePredefinedImProtocol(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.BrowserContract.SyncState byte[] get(android.content.ContentProviderClient, android.accounts.Account) 1'>
@@ -668,6 +650,9 @@
     <item name='android.provider.ContactsContract.CommonDataKinds.Organization java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.Settings.Global java.lang.String getBluetoothHeadsetPriorityKey(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Browser void clearHistory(android.content.ContentResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -692,13 +677,16 @@
     <item name='android.provider.Contacts.Settings void setSetting(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.MediaStore.Files android.net.Uri getMtpReferencesUri(java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Settings.Global boolean putFloat(android.content.ContentResolver, java.lang.String, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.CallLog.Calls java.lang.String getLastOutgoingCall(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.ProfileSyncState android.content.ContentProviderOperation newSetOperation(android.accounts.Account, byte[])'>
+    <item name='android.provider.ContactsContract.Contacts android.net.Uri getLookupUri(long, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.BrowserContract.SyncState android.util.Pair&lt;android.net.Uri,byte[]&gt; getWithUri(android.content.ContentProviderClient, android.accounts.Account) 1'>
@@ -710,7 +698,13 @@
     <item name='android.provider.BrowserContract.SyncState byte[] get(android.content.ContentProviderClient, android.accounts.Account) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.Settings java.lang.String getGTalkDeviceId(long)'>
+    <item name='android.provider.CalendarContract.CalendarEntity android.content.EntityIterator newEntityIterator(android.database.Cursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.MediaStore.Audio.Albums android.net.Uri getContentUri(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.BrowserContract.SyncState android.content.ContentProviderOperation newSetOperation(android.accounts.Account, byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Telephony.Mms android.database.Cursor query(android.content.ContentResolver, java.lang.String[]) 0'>
@@ -728,16 +722,22 @@
     <item name='android.provider.CalendarContract.EventDays android.database.Cursor query(android.content.ContentResolver, int, int, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.ContactsContract.RawContacts android.content.EntityIterator newEntityIterator(android.database.Cursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.Telephony.Sms.Draft boolean saveMessage(android.content.ContentResolver, android.net.Uri, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.MediaStore.Images.Thumbnails void cancelThumbnailRequest(android.content.ContentResolver, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.Directory void notifyDirectoryChange(android.content.ContentResolver) 0'>
+    <item name='android.provider.Applications android.net.Uri componentNameToUri(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Audio.Albums android.net.Uri getContentUri(java.lang.String)'>
+    <item name='android.provider.MediaStore.Audio.Genres android.net.Uri getContentUriForAudioId(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.ContactsContract.Directory void notifyDirectoryChange(android.content.ContentResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.ContactsContract.RawContacts android.net.Uri getContactLookupUri(android.content.ContentResolver, android.net.Uri) 0'>
@@ -752,10 +752,13 @@
     <item name='android.provider.Browser android.database.Cursor getAllBookmarks(android.content.ContentResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Audio.Media android.net.Uri getContentUri(java.lang.String)'>
+    <item name='android.provider.ContactsContract.Contacts android.net.Uri lookupContact(android.content.ContentResolver, android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.ContactsContract.Contacts android.net.Uri lookupContact(android.content.ContentResolver, android.net.Uri) 0'>
+    <item name='android.provider.MediaStore.Audio.Artists android.net.Uri getContentUri(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.provider.MediaStore.Files android.net.Uri getContentUri(java.lang.String, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.Settings.System boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String) 0'>
@@ -764,6 +767,9 @@
     <item name='android.provider.Contacts.Phones java.lang.CharSequence getDisplayLabel(android.content.Context, int, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.ContactsContract.SyncState android.content.ContentProviderOperation newSetOperation(android.accounts.Account, byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.MediaStore.Images.Media android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -779,16 +785,10 @@
     <item name='android.provider.SyncStateContract.Helpers void set(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.VoicemailContract.Voicemails android.net.Uri buildSourceUri(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.provider.CalendarContract.EventsEntity android.content.EntityIterator newEntityIterator(android.database.Cursor, android.content.ContentResolver)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.MediaStore.Images.Media java.lang.String insertImage(android.content.ContentResolver, android.graphics.Bitmap, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Images.Media android.net.Uri getContentUri(java.lang.String)'>
+    <item name='android.provider.ContactsContract.Contacts.AggregationSuggestions android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder builder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.provider.ContactsContract.RawContacts android.net.Uri getContactLookupUri(android.content.ContentResolver, android.net.Uri) 1'>
@@ -800,6 +800,9 @@
     <item name='android.provider.MediaStore java.lang.String getVersion(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.provider.MediaStore.Audio.Playlists.Members android.net.Uri getContentUri(java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.provider.ContactsContract.Contacts android.net.Uri getLookupUri(android.content.ContentResolver, android.net.Uri) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -809,9 +812,6 @@
     <item name='android.provider.Settings.System float getFloat(android.content.ContentResolver, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.provider.MediaStore.Audio.Artists.Albums android.net.Uri getContentUri(java.lang.String, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.provider.MediaStore.Images.Media android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/renderscript/annotations.xml b/android-sdk-annotations/android/renderscript/annotations.xml
index 75fa9131130..f17627331fd 100644
--- a/android-sdk-annotations/android/renderscript/annotations.xml
+++ b/android-sdk-annotations/android/renderscript/annotations.xml
@@ -1,8 +1,5 @@
 <root>
-    <item name='android.renderscript.Type.CubemapFace android.renderscript.Type.CubemapFace valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Matrix3f subMatrix3f()'>
+    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copyFrom(float[]) 0'>
@@ -14,25 +11,16 @@
     <item name='android.renderscript.Element android.renderscript.Element I16_2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.AllocationAdapter android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ScriptIntrinsicBlend android.renderscript.ScriptIntrinsicBlend create(android.renderscript.RenderScript, android.renderscript.Element)'>
+    <item name='android.renderscript.Script android.renderscript.Script.KernelID createKernelID(int, int, android.renderscript.Element, android.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element I16_3(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Script.LaunchOptions android.renderscript.Script.LaunchOptions setX(int, int)'>
+    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder android.renderscript.ProgramFragmentFixedFunction create()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder addTriangle(int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Matrix2f subMatrix2f()'>
+    <item name='android.renderscript.Mesh.AllocationBuilder android.renderscript.Mesh.AllocationBuilder addVertexAllocation(android.renderscript.Allocation)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.RenderScript.Priority android.renderscript.RenderScript.Priority valueOf(java.lang.String) 0'>
@@ -50,43 +38,40 @@
     <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.FieldPacker android.renderscript.Double3 subDouble3()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.RenderScript.ContextType android.renderscript.RenderScript.ContextType valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ProgramRaster android.renderscript.ProgramRaster CULL_NONE(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder setShader(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Sampler.Value android.renderscript.Sampler.Value valueOf(java.lang.String)'>
+    <item name='android.renderscript.ScriptIntrinsicColorMatrix android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ProgramStore.BlendSrcFunc android.renderscript.ProgramStore.BlendSrcFunc valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh create(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ProgramVertex.Builder android.renderscript.ProgramVertex.Builder addInput(android.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Font android.renderscript.Font create(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, android.renderscript.Font.Style, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptIntrinsicYuvToRGB android.renderscript.ScriptIntrinsicYuvToRGB create(android.renderscript.RenderScript, android.renderscript.Element) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.AllocationAdapter void subData1D(int, int, float[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Element, int, android.renderscript.Mesh.Primitive)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.ScriptGroup.Builder android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.FieldID) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramRaster.CullMode android.renderscript.ProgramRaster.CullMode valueOf(java.lang.String)'>
+    <item name='android.renderscript.ScriptIntrinsicConvolve3x3 android.renderscript.ScriptIntrinsicConvolve3x3 create(android.renderscript.RenderScript, android.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copy1DRangeFromUnchecked(int, int, short[]) 2'>
@@ -95,13 +80,7 @@
     <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, android.renderscript.Allocation.MipmapControl, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Path.Primitive android.renderscript.Path.Primitive valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder android.renderscript.ProgramFragmentFixedFunction.Builder setPointSpriteTexCoordinateReplacement(boolean)'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Float4 subFloat4()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachSrcOut(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
@@ -110,51 +89,42 @@
     <item name='android.renderscript.Element android.renderscript.Element F32_4(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder android.renderscript.ProgramFragmentFixedFunction.Builder setVaryingColor(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.FieldPacker void addI64(android.renderscript.Long2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element U64(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramRaster.Builder android.renderscript.ProgramRaster create()'>
+    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh create()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker byte[] getData()'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Float3 subFloat3()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Font android.renderscript.Font createFromAsset(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Font android.renderscript.Font create(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, android.renderscript.Font.Style, float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Font android.renderscript.Font create(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, android.renderscript.Font.Style, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Element android.renderscript.Element MATRIX_2X2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsic3DLUT android.renderscript.ScriptIntrinsic3DLUT create(android.renderscript.RenderScript, android.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Script.LaunchOptions android.renderscript.Script.LaunchOptions setY(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.AllocationAdapter void subElementData(int, int, android.renderscript.FieldPacker) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copyFromUnchecked(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Script.LaunchOptions android.renderscript.Script.LaunchOptions setZ(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Element android.renderscript.Element U16(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.AllocationAdapter android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Mesh.AllocationBuilder android.renderscript.Mesh.AllocationBuilder addIndexSetType(android.renderscript.Mesh.Primitive)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Allocation void copyFrom(short[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -164,9 +134,6 @@
     <item name='android.renderscript.ScriptIntrinsicBlur android.renderscript.ScriptIntrinsicBlur create(android.renderscript.RenderScript, android.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachClear(android.renderscript.Allocation, android.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -176,10 +143,7 @@
     <item name='android.renderscript.Element android.renderscript.Element U64_4(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Element.DataKind android.renderscript.Element.DataKind valueOf(java.lang.String)'>
+    <item name='android.renderscript.ProgramStore.DepthFunc android.renderscript.ProgramStore.DepthFunc valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element MATRIX_4X4(android.renderscript.RenderScript) 0'>
@@ -191,10 +155,7 @@
     <item name='android.renderscript.RSTextureView android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addVertexType(android.renderscript.Element, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setBlendFunc(android.renderscript.ProgramStore.BlendSrcFunc, android.renderscript.ProgramStore.BlendDstFunc)'>
+    <item name='android.renderscript.ProgramFragment.Builder android.renderscript.ProgramFragment create()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsic3DLUT android.renderscript.ScriptIntrinsic3DLUT create(android.renderscript.RenderScript, android.renderscript.Element) 1'>
@@ -209,6 +170,9 @@
     <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Element android.renderscript.Element I64_4(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -218,27 +182,27 @@
     <item name='android.renderscript.Element android.renderscript.Element F64_2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ProgramStore.BlendSrcFunc android.renderscript.ProgramStore.BlendSrcFunc valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.ScriptIntrinsicBlend android.renderscript.ScriptIntrinsicBlend create(android.renderscript.RenderScript, android.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.BaseObj void setName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.ScriptIntrinsicColorMatrix void setColorMatrix(android.renderscript.Matrix4f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder android.renderscript.ProgramFragmentFixedFunction create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ScriptIntrinsicColorMatrix android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element)'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Float2 subFloat2()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Script void setTimeZone(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Short4 subShort4()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.FileA3D.EntryType android.renderscript.FileA3D.EntryType valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -254,10 +218,16 @@
     <item name='android.renderscript.FieldPacker void addI8(android.renderscript.Byte2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromAsset(android.renderscript.RenderScript, android.content.res.AssetManager, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.ScriptIntrinsicLUT android.renderscript.ScriptIntrinsicLUT create(android.renderscript.RenderScript, android.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createFromBitmapResource(android.renderscript.RenderScript, android.content.res.Resources, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode valueOf(java.lang.String)'>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Script void setVar(int, android.renderscript.FieldPacker, android.renderscript.Element, int[]) 1'>
@@ -272,24 +242,18 @@
     <item name='android.renderscript.ScriptIntrinsicBlend android.renderscript.ScriptIntrinsicBlend create(android.renderscript.RenderScript, android.renderscript.Element) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramVertex.Builder android.renderscript.ProgramVertex create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Byte4 subByte4()'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Short2 subShort2()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachDstOut(android.renderscript.Allocation, android.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptGroup.Builder android.renderscript.ScriptGroup.Builder addKernel(android.renderscript.Script.KernelID)'>
+    <item name='android.renderscript.Script.LaunchOptions android.renderscript.Script.LaunchOptions setZ(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copyFrom(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Path android.renderscript.Path createStaticPath(android.renderscript.RenderScript, android.renderscript.Path.Primitive, float, android.renderscript.Allocation)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -308,40 +272,43 @@
     <item name='android.renderscript.Allocation.MipmapControl android.renderscript.Allocation.MipmapControl valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Int3 subInt3()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.FieldPacker void addF32(android.renderscript.Float2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element I64_3(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.RSTextureView RSTextureView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ProgramStore android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_TEST(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createFromString(android.renderscript.RenderScript, java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.ProgramVertex.Builder android.renderscript.ProgramVertex.Builder addInput(android.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.FieldPacker android.renderscript.Byte4 subByte4()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Script.FieldBase void init(android.renderscript.RenderScript, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copyFrom(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setDepthMaskEnabled(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ProgramVertexFixedFunction.Builder android.renderscript.ProgramVertexFixedFunction create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.RSSurfaceView android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptIntrinsicConvolve3x3 android.renderscript.ScriptIntrinsicConvolve3x3 create(android.renderscript.RenderScript, android.renderscript.Element)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Element android.renderscript.Element createVector(android.renderscript.RenderScript, android.renderscript.Element.DataType, int)'>
+    <item name='android.renderscript.ScriptGroup.Builder android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.FieldID)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 2'>
@@ -353,16 +320,22 @@
     <item name='android.renderscript.RSSurfaceView RSSurfaceView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setY(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Element android.renderscript.Element U8_3(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Sampler android.renderscript.Sampler CLAMP_NEAREST(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Element.Builder android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String)'>
+    <item name='android.renderscript.RSTextureView android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Type.CubemapFace android.renderscript.Type.CubemapFace valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addVertexType(android.renderscript.Type)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Type.Builder android.renderscript.Type create()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element PROGRAM_VERTEX(android.renderscript.RenderScript) 0'>
@@ -371,10 +344,16 @@
     <item name='android.renderscript.Allocation void copy3DRangeFrom(int, int, int, int, int, int, byte[]) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setDitherEnabled(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.RSTextureView RSTextureView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.io.File)'>
+    <item name='android.renderscript.Element android.renderscript.Element createPixel(android.renderscript.RenderScript, android.renderscript.Element.DataType, android.renderscript.Element.DataKind)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsicColorMatrix android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element) 1'>
@@ -389,15 +368,18 @@
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachSubtract(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.Primitive android.renderscript.Mesh.Primitive valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachMultiply(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ProgramVertexFixedFunction.Builder android.renderscript.ProgramVertexFixedFunction create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.RSSurfaceView RSSurfaceView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, android.renderscript.Allocation.MipmapControl, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Font android.renderscript.Font createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int, float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -410,10 +392,13 @@
     <item name='android.renderscript.Allocation android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Float3 subFloat3()'>
+    <item name='android.renderscript.ScriptIntrinsicBlend void forEachXor(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptIntrinsicBlend void forEachXor(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
+    <item name='android.renderscript.ScriptGroup.Builder android.renderscript.ScriptGroup create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Script.LaunchOptions android.renderscript.Script.LaunchOptions setY(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ProgramRaster android.renderscript.ProgramRaster CULL_FRONT(android.renderscript.RenderScript) 0'>
@@ -425,9 +410,6 @@
     <item name='android.renderscript.ProgramRaster.CullMode android.renderscript.ProgramRaster.CullMode valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setX(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Allocation void setFromFieldPacker(int, int, android.renderscript.FieldPacker) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -437,9 +419,6 @@
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachSubtract(android.renderscript.Allocation, android.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Font android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromAsset(android.renderscript.RenderScript, android.content.res.AssetManager, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -449,9 +428,6 @@
     <item name='android.renderscript.Allocation android.renderscript.Allocation createFromString(android.renderscript.RenderScript, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder setShader(android.content.res.Resources, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptGroup void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -464,7 +440,7 @@
     <item name='android.renderscript.Allocation void copy3DRangeFrom(int, int, int, int, int, int, float[]) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder setNormal(float, float, float)'>
+    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder setColor(float, float, float, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FieldPacker void addF64(android.renderscript.Double2) 0'>
@@ -473,9 +449,6 @@
     <item name='android.renderscript.Element android.renderscript.Element F64_3(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context, int, android.renderscript.RenderScript.ContextType) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -491,7 +464,10 @@
     <item name='android.renderscript.Sampler android.renderscript.Sampler MIRRORED_REPEAT_NEAREST(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.RenderScript.Priority android.renderscript.RenderScript.Priority valueOf(java.lang.String)'>
+    <item name='android.renderscript.AllocationAdapter android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Mesh.AllocationBuilder android.renderscript.Mesh.AllocationBuilder addIndexSetAllocation(android.renderscript.Allocation, android.renderscript.Mesh.Primitive)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int) 0'>
@@ -506,16 +482,25 @@
     <item name='android.renderscript.FieldPacker void addI32(android.renderscript.Int2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.FieldPacker android.renderscript.Matrix3f subMatrix3f()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder setShader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createFromString(android.renderscript.RenderScript, java.lang.String, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Mesh.Primitive android.renderscript.Mesh.Primitive valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachDstOver(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Matrix4f float[] getArray()'>
+    <item name='android.renderscript.ProgramStore.BlendDstFunc android.renderscript.ProgramStore.BlendDstFunc valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsicLUT android.renderscript.ScriptIntrinsicLUT create(android.renderscript.RenderScript, android.renderscript.Element) 1'>
@@ -527,10 +512,10 @@
     <item name='android.renderscript.Element android.renderscript.Element I8_4(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Matrix2f float[] getArray()'>
+    <item name='android.renderscript.Element android.renderscript.Element A_8(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Element android.renderscript.Element A_8(android.renderscript.RenderScript) 0'>
+    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder addTriangle(int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element U8(android.renderscript.RenderScript) 0'>
@@ -545,16 +530,22 @@
     <item name='android.renderscript.Element android.renderscript.Element ELEMENT(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Path.Primitive android.renderscript.Path.Primitive valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.ScriptIntrinsicColorMatrix android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Int4 subInt4()'>
+    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder.Format android.renderscript.ProgramFragmentFixedFunction.Builder.Format valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Font android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copy1DRangeFromUnchecked(int, int, int[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramRaster.Builder android.renderscript.ProgramRaster.Builder setPointSpriteEnabled(boolean)'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Int3 subInt3()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachDstAtop(android.renderscript.Allocation, android.renderscript.Allocation) 1'>
@@ -575,9 +566,6 @@
     <item name='android.renderscript.Element android.renderscript.Element F32(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.RenderScript.ContextType android.renderscript.RenderScript.ContextType valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptIntrinsicLUT android.renderscript.ScriptIntrinsicLUT create(android.renderscript.RenderScript, android.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -587,6 +575,9 @@
     <item name='android.renderscript.AllocationAdapter void subData2D(int, int, int, int, float[]) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Allocation.MipmapControl android.renderscript.Allocation.MipmapControl valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -599,10 +590,7 @@
     <item name='android.renderscript.Font android.renderscript.Font createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.AllocationBuilder android.renderscript.Mesh create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType, java.lang.String)'>
+    <item name='android.renderscript.ScriptIntrinsicYuvToRGB android.renderscript.ScriptIntrinsicYuvToRGB create(android.renderscript.RenderScript, android.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsicBlur android.renderscript.ScriptIntrinsicBlur create(android.renderscript.RenderScript, android.renderscript.Element) 1'>
@@ -611,31 +599,34 @@
     <item name='android.renderscript.Font.Style android.renderscript.Font.Style valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Int2 subInt2()'>
+    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setX(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element MATRIX4X4(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Element android.renderscript.Element createPixel(android.renderscript.RenderScript, android.renderscript.Element.DataType, android.renderscript.Element.DataKind)'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Long4 subLong4()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context, int)'>
+    <item name='android.renderscript.ProgramVertexFixedFunction.Builder android.renderscript.ProgramVertexFixedFunction.Builder setTextureMatrixEnable(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element SCRIPT(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Type.Builder android.renderscript.Type create()'>
+    <item name='android.renderscript.FieldPacker byte[] getData()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element createPixel(android.renderscript.RenderScript, android.renderscript.Element.DataType, android.renderscript.Element.DataKind) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context, android.renderscript.RenderScript.ContextType)'>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.FieldPacker android.renderscript.Byte2 subByte2()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copy2DRangeFrom(int, int, int, int, byte[]) 4'>
@@ -647,19 +638,25 @@
     <item name='android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ScriptGroup.Builder android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.KernelID)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Element android.renderscript.Element F32_2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.RSTextureView android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig)'>
+    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Mesh.Primitive)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setDepthFunc(android.renderscript.ProgramStore.DepthFunc)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.RSSurfaceView android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig)'>
+    <item name='android.renderscript.Allocation void copyFrom(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation void copyFrom(byte[]) 0'>
+    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setYuvFormat(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.io.File) 1'>
@@ -677,10 +674,13 @@
     <item name='android.renderscript.Allocation void copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int, int)'>
+    <item name='android.renderscript.Font android.renderscript.Font createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setDitherEnabled(boolean)'>
+    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder android.renderscript.ProgramFragmentFixedFunction.Builder setTexture(android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode, android.renderscript.ProgramFragmentFixedFunction.Builder.Format, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Path android.renderscript.Path createStaticPath(android.renderscript.RenderScript, android.renderscript.Path.Primitive, float, android.renderscript.Allocation)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FieldPacker void addU8(android.renderscript.Short2) 0'>
@@ -689,13 +689,10 @@
     <item name='android.renderscript.Element android.renderscript.Element U64_3(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Font.Style android.renderscript.Font.Style valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptC ScriptC(android.renderscript.RenderScript, android.content.res.Resources, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context, int, android.renderscript.RenderScript.ContextType)'>
+    <item name='android.renderscript.RenderScript.Priority android.renderscript.RenderScript.Priority valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ProgramVertexFixedFunction.Constants void setProjection(android.renderscript.Matrix4f) 0'>
@@ -710,40 +707,43 @@
     <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float)'>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 1'>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void setFromFieldPacker(int, android.renderscript.FieldPacker) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.lang.String)'>
+    <item name='android.renderscript.ProgramRaster.Builder android.renderscript.ProgramRaster.Builder setPointSpriteEnabled(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element I32_3(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Font.Style android.renderscript.Font.Style valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Mesh.AllocationBuilder android.renderscript.Mesh create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Element android.renderscript.Element U16_4(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Font android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Mesh.Primitive)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Allocation void copy1DRangeFrom(int, int, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element ALLOCATION(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Byte3 subByte3()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Type, android.renderscript.Mesh.Primitive)'>
+    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh create(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ProgramRaster android.renderscript.ProgramRaster CULL_BACK(android.renderscript.RenderScript) 0'>
@@ -752,66 +752,57 @@
     <item name='android.renderscript.Element android.renderscript.Element U16_3(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setBlendFunc(android.renderscript.ProgramStore.BlendSrcFunc, android.renderscript.ProgramStore.BlendDstFunc)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Element.DataType android.renderscript.Element.DataType valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Element.Builder android.renderscript.Element create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.FieldPacker android.renderscript.Matrix2f subMatrix2f()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation void copyFromUnchecked(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramFragment.Builder android.renderscript.ProgramFragment create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.FieldPacker void addI16(android.renderscript.Short3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Long3 subLong3()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Element.DataKind android.renderscript.Element.DataKind valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Script android.renderscript.Script.FieldID createFieldID(int, android.renderscript.Element)'>
+    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder android.renderscript.ProgramFragmentFixedFunction.Builder setVaryingColor(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element I8_2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramRaster.Builder android.renderscript.ProgramRaster.Builder setCullMode(android.renderscript.ProgramRaster.CullMode)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Font android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element PROGRAM_STORE(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Element android.renderscript.Element I8_3(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptIntrinsicYuvToRGB android.renderscript.ScriptIntrinsicYuvToRGB create(android.renderscript.RenderScript, android.renderscript.Element)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Script android.renderscript.Script.KernelID createKernelID(int, int, android.renderscript.Element, android.renderscript.Element)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptC ScriptC(android.renderscript.RenderScript, android.content.res.Resources, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Element.Builder android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String, int)'>
+    <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.io.File)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Short2 subShort2()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context)'>
+    <item name='android.renderscript.Element.DataKind android.renderscript.Element.DataKind valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachAdd(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Matrix2f float[] getArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.AllocationAdapter void setFace(android.renderscript.Type.CubemapFace) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -821,9 +812,6 @@
     <item name='android.renderscript.Sampler android.renderscript.Sampler MIRRORED_REPEAT_LINEAR_MIP_LINEAR(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Short3 subShort3()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Sampler android.renderscript.Sampler CLAMP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -836,7 +824,10 @@
     <item name='android.renderscript.Element android.renderscript.Element RGB_888(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Font android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float)'>
+    <item name='android.renderscript.RenderScript.ContextType android.renderscript.RenderScript.ContextType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Program.TextureType android.renderscript.Program.TextureType valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element FONT(android.renderscript.RenderScript) 0'>
@@ -848,28 +839,16 @@
     <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptIntrinsicConvolve5x5 android.renderscript.ScriptIntrinsicConvolve5x5 create(android.renderscript.RenderScript, android.renderscript.Element)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.RSSurfaceView RSSurfaceView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ProgramStore android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_NONE(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setYuvFormat(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setZ(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Element android.renderscript.Element createVector(android.renderscript.RenderScript, android.renderscript.Element.DataType, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptIntrinsicBlur android.renderscript.ScriptIntrinsicBlur create(android.renderscript.RenderScript, android.renderscript.Element)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Allocation.MipmapControl android.renderscript.Allocation.MipmapControl valueOf(java.lang.String)'>
+    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachSrcIn(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
@@ -890,16 +869,13 @@
     <item name='android.renderscript.FieldPacker void addMatrix(android.renderscript.Matrix3f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Float4 subFloat4()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachSrcAtop(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptIntrinsicLUT android.renderscript.ScriptIntrinsicLUT create(android.renderscript.RenderScript, android.renderscript.Element)'>
+    <item name='android.renderscript.Element android.renderscript.Element PROGRAM_RASTER(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Element android.renderscript.Element PROGRAM_RASTER(android.renderscript.RenderScript) 0'>
+    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder addConstant(android.renderscript.Type)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int) 0'>
@@ -908,10 +884,10 @@
     <item name='android.renderscript.Allocation void copy2DRangeFrom(int, int, int, int, int[]) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Sampler.Value android.renderscript.Sampler.Value valueOf(java.lang.String) 0'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Long3 subLong3()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Matrix3f float[] getArray()'>
+    <item name='android.renderscript.Sampler.Value android.renderscript.Sampler.Value valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copy2DRangeFrom(int, int, android.graphics.Bitmap) 2'>
@@ -932,6 +908,9 @@
     <item name='android.renderscript.RenderScript void setPriority(android.renderscript.RenderScript.Priority) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ProgramVertex.Builder android.renderscript.ProgramVertex create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.FieldPacker void addU64(android.renderscript.Long2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -953,64 +932,76 @@
     <item name='android.renderscript.Element android.renderscript.Element I64(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.AllocationAdapter android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation void copy1DRangeFrom(int, int, android.renderscript.Allocation, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FieldPacker void addMatrix(android.renderscript.Matrix2f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder setTexture(float, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context, android.renderscript.RenderScript.ContextType)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.FieldPacker void addI32(android.renderscript.Int4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setFaces(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addVertexType(android.renderscript.Type)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Path android.renderscript.Path createStaticPath(android.renderscript.RenderScript, android.renderscript.Path.Primitive, float, android.renderscript.Allocation) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation void copy2DRangeFrom(int, int, int, int, short[]) 4'>
+    <item name='android.renderscript.ScriptIntrinsicBlend android.renderscript.ScriptIntrinsicBlend create(android.renderscript.RenderScript, android.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Element android.renderscript.Element U32_4(android.renderscript.RenderScript) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Font android.renderscript.Font createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ProgramVertexFixedFunction void bindConstants(android.renderscript.ProgramVertexFixedFunction.Constants) 0'>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setMipmaps(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Allocation void copy2DRangeFrom(int, int, int, int, short[]) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Element android.renderscript.Element U32_4(android.renderscript.RenderScript) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.FieldPacker android.renderscript.Short3 subShort3()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.ProgramVertexFixedFunction void bindConstants(android.renderscript.ProgramVertexFixedFunction.Constants) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachSrc(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Element.DataType android.renderscript.Element.DataType valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Allocation void copy3DRangeFrom(int, int, int, int, int, int, android.renderscript.Allocation, int, int, int) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramStore.BlendDstFunc android.renderscript.ProgramStore.BlendDstFunc valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptC ScriptC(int, android.renderscript.RenderScript) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copyFromUnchecked(short[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.FieldPacker android.renderscript.Long2 subLong2()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachDstIn(android.renderscript.Allocation, android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap)'>
+    <item name='android.renderscript.Matrix4f float[] getArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.ScriptIntrinsic3DLUT android.renderscript.ScriptIntrinsic3DLUT create(android.renderscript.RenderScript, android.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder setShader(android.content.res.Resources, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addVertexType(android.renderscript.Element, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Font android.renderscript.Font createFromAsset(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float) 1'>
@@ -1037,6 +1028,9 @@
     <item name='android.renderscript.Element android.renderscript.Element U32_2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.FileA3D.EntryType android.renderscript.FileA3D.EntryType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Element android.renderscript.Element I64_2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1049,18 +1043,9 @@
     <item name='android.renderscript.Font android.renderscript.Font createFromAsset(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramVertex.Builder android.renderscript.ProgramVertex.Builder addInput(android.renderscript.Element)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.FieldPacker void addF64(android.renderscript.Double4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder android.renderscript.ProgramFragmentFixedFunction.Builder setTexture(android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode, android.renderscript.ProgramFragmentFixedFunction.Builder.Format, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setColorMaskEnabled(boolean, boolean, boolean, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Allocation void copy1DRangeFrom(int, int, short[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1070,25 +1055,28 @@
     <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setDepthFunc(android.renderscript.ProgramStore.DepthFunc)'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Double4 subDouble4()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Path android.renderscript.Path createStaticPath(android.renderscript.RenderScript, android.renderscript.Path.Primitive, float, android.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Sampler.Builder android.renderscript.Sampler create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Path.Primitive android.renderscript.Path.Primitive valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ProgramRaster.CullMode android.renderscript.ProgramRaster.CullMode valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context, android.renderscript.RenderScript.ContextType) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder setTexture(float, float)'>
+    <item name='android.renderscript.Sampler.Value android.renderscript.Sampler.Value valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element F32_3(android.renderscript.RenderScript) 0'>
@@ -1097,16 +1085,16 @@
     <item name='android.renderscript.ScriptIntrinsic3DLUT void setLUT(android.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptGroup.Builder android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.FieldID)'>
+    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setZ(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder.Format android.renderscript.ProgramFragmentFixedFunction.Builder.Format valueOf(java.lang.String)'>
+    <item name='android.renderscript.Script.LaunchOptions android.renderscript.Script.LaunchOptions setX(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.AllocationBuilder android.renderscript.Mesh.AllocationBuilder addIndexSetAllocation(android.renderscript.Allocation, android.renderscript.Mesh.Primitive)'>
+    <item name='android.renderscript.Font android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Long4 subLong4()'>
+    <item name='android.renderscript.Element android.renderscript.Element createVector(android.renderscript.RenderScript, android.renderscript.Element.DataType, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Sampler android.renderscript.Sampler CLAMP_LINEAR(android.renderscript.RenderScript) 0'>
@@ -1115,24 +1103,21 @@
     <item name='android.renderscript.Program.BaseProgramBuilder void initProgram(android.renderscript.Program) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Font android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder setColor(float, float, float, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ProgramStore android.renderscript.ProgramStore BLEND_NONE_DEPTH_NONE(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element TYPE(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromAsset(android.renderscript.RenderScript, android.content.res.AssetManager, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.FieldPacker void addI32(android.renderscript.Int3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1154,6 +1139,9 @@
     <item name='android.renderscript.ScriptIntrinsicConvolve3x3 android.renderscript.ScriptIntrinsicConvolve3x3 create(android.renderscript.RenderScript, android.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.ProgramVertexFixedFunction.Constants void setModelview(android.renderscript.Matrix4f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1166,7 +1154,10 @@
     <item name='android.renderscript.Matrix4f void load(android.renderscript.Matrix3f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Element, int, android.renderscript.Mesh.Primitive)'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Int2 subInt2()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.ProgramRaster.Builder android.renderscript.ProgramRaster.Builder setCullMode(android.renderscript.ProgramRaster.CullMode)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.AllocationAdapter android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation) 1'>
@@ -1178,13 +1169,19 @@
     <item name='android.renderscript.Allocation void copy3DRangeFrom(int, int, int, int, int, int, int[]) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Mesh.AllocationBuilder android.renderscript.Mesh.AllocationBuilder addIndexSetType(android.renderscript.Mesh.Primitive)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation void copyTo(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptIntrinsic3DLUT android.renderscript.ScriptIntrinsic3DLUT create(android.renderscript.RenderScript, android.renderscript.Element)'>
+    <item name='android.renderscript.FieldPacker void addU64(android.renderscript.Long3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker void addU64(android.renderscript.Long3) 0'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Int4 subInt4()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float, float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FieldPacker void addI64(android.renderscript.Long4) 0'>
@@ -1196,6 +1193,12 @@
     <item name='android.renderscript.FieldPacker android.renderscript.Matrix4f subMatrix4f()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.FieldPacker android.renderscript.Short4 subShort4()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.FileA3D android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1211,15 +1214,15 @@
     <item name='android.renderscript.FieldPacker void addU8(android.renderscript.Short3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ScriptIntrinsicBlur android.renderscript.ScriptIntrinsicBlur create(android.renderscript.RenderScript, android.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FieldPacker void addI8(android.renderscript.Byte4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Double2 subDouble2()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.AllocationAdapter void subData1D(int, int, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1232,27 +1235,18 @@
     <item name='android.renderscript.Element android.renderscript.Element U8_2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ScriptGroup.Builder android.renderscript.ScriptGroup create()'>
+    <item name='android.renderscript.Matrix3f float[] getArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.RenderScriptGL RenderScriptGL(android.content.Context, android.renderscript.RenderScriptGL.SurfaceConfig) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Float2 subFloat2()'>
+    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setY(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Matrix2f void load(android.renderscript.Matrix2f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Long2 subLong2()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Font android.renderscript.Font createFromAsset(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ProgramStore.DepthFunc android.renderscript.ProgramStore.DepthFunc valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.FieldPacker void addU64(android.renderscript.Long4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1265,6 +1259,9 @@
     <item name='android.renderscript.FieldPacker void addI64(android.renderscript.Long3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Element.DataType android.renderscript.Element.DataType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Element android.renderscript.Element I32_2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1274,12 +1271,18 @@
     <item name='android.renderscript.Element android.renderscript.Element U16_2(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ProgramFragmentFixedFunction.Builder android.renderscript.ProgramFragmentFixedFunction.Builder setPointSpriteTexCoordinateReplacement(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Element android.renderscript.Element U8_4(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, android.renderscript.Allocation.MipmapControl, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Element.Builder android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.ScriptIntrinsicConvolve5x5 android.renderscript.ScriptIntrinsicConvolve5x5 create(android.renderscript.RenderScript, android.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1295,30 +1298,27 @@
     <item name='android.renderscript.FieldPacker void addU32(android.renderscript.Long3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FileA3D.EntryType android.renderscript.FileA3D.EntryType valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ScriptGroup.Builder android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.KernelID)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.ProgramVertexFixedFunction.Builder android.renderscript.ProgramVertexFixedFunction.Builder setTextureMatrixEnable(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.FieldPacker FieldPacker(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.RenderScript android.renderscript.RenderScript create(android.content.Context, int, android.renderscript.RenderScript.ContextType)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, android.renderscript.Allocation.MipmapControl, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Double3 subDouble3()'>
+    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setColorMaskEnabled(boolean, boolean, boolean, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Matrix3f void load(android.renderscript.Matrix3f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ScriptGroup.Builder android.renderscript.ScriptGroup.Builder addKernel(android.renderscript.Script.KernelID)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation void copy1DRangeFrom(int, int, float[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1334,16 +1334,19 @@
     <item name='android.renderscript.Element android.renderscript.Element U32_3(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.Script android.renderscript.Script.FieldID createFieldID(int, android.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Element android.renderscript.Element BOOLEAN(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Byte2 subByte2()'>
+    <item name='android.renderscript.Type.Builder Builder(android.renderscript.RenderScript, android.renderscript.Element) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Type.Builder Builder(android.renderscript.RenderScript, android.renderscript.Element) 1'>
+    <item name='android.renderscript.RSSurfaceView android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FieldPacker void addI16(android.renderscript.Short4) 0'>
@@ -1355,76 +1358,73 @@
     <item name='android.renderscript.FieldPacker void addMatrix(android.renderscript.Matrix4f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.ProgramStore.Builder android.renderscript.ProgramStore.Builder setDepthMaskEnabled(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.Allocation android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, android.renderscript.Allocation.MipmapControl, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.renderscript.FieldPacker android.renderscript.Double2 subDouble2()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Mesh.Builder android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Type, android.renderscript.Mesh.Primitive)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.renderscript.FieldPacker void addU16(android.renderscript.Int2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createFromString(android.renderscript.RenderScript, java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Sampler.Builder android.renderscript.Sampler create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Allocation void copy1DRangeFromUnchecked(int, int, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Allocation void copy3DRangeFrom(int, int, int, int, int, int, short[]) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.ProgramStore.BlendSrcFunc android.renderscript.ProgramStore.BlendSrcFunc valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Element android.renderscript.Element RGBA_8888(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Font android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap) 1'>
+    <item name='android.renderscript.Element.Builder android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float, float)'>
+    <item name='android.renderscript.Allocation android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FieldPacker void addU16(android.renderscript.Int4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.FieldPacker android.renderscript.Double4 subDouble4()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Element android.renderscript.Element PROGRAM_FRAGMENT(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Font android.renderscript.Font create(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, android.renderscript.Font.Style, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder addConstant(android.renderscript.Type)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.Sampler android.renderscript.Sampler WRAP_NEAREST(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.Element android.renderscript.Element F64(android.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Program.TextureType android.renderscript.Program.TextureType valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.renderscript.ScriptIntrinsicBlend void forEachSrcOver(android.renderscript.Allocation, android.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Mesh.AllocationBuilder android.renderscript.Mesh.AllocationBuilder addVertexAllocation(android.renderscript.Allocation)'>
+    <item name='android.renderscript.FieldPacker android.renderscript.Byte3 subByte3()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Element.Builder android.renderscript.Element create()'>
+    <item name='android.renderscript.ProgramRaster.Builder android.renderscript.ProgramRaster create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Mesh.TriangleMeshBuilder android.renderscript.Mesh.TriangleMeshBuilder setNormal(float, float, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Program.BaseProgramBuilder android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.renderscript.Type.Builder android.renderscript.Type.Builder setFaces(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.renderscript.FieldPacker void addF32(android.renderscript.Float4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.renderscript.Allocation android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int)'>
+    <item name='android.renderscript.ScriptIntrinsicConvolve5x5 android.renderscript.ScriptIntrinsicConvolve5x5 create(android.renderscript.RenderScript, android.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/sax/annotations.xml b/android-sdk-annotations/android/sax/annotations.xml
index 6ce5b0341ad..7ee3ef86544 100644
--- a/android-sdk-annotations/android/sax/annotations.xml
+++ b/android-sdk-annotations/android/sax/annotations.xml
@@ -1,17 +1,17 @@
 <root>
-    <item name='android.sax.Element android.sax.Element getChild(java.lang.String, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.sax.Element android.sax.Element getChild(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.sax.Element java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.sax.Element android.sax.Element requireChild(java.lang.String) 0'>
+    <item name='android.sax.Element android.sax.Element getChild(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.sax.Element android.sax.Element getChild(java.lang.String)'>
+    <item name='android.sax.StartElementListener void start(org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.sax.Element android.sax.Element requireChild(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.sax.Element android.sax.Element requireChild(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.sax.Element android.sax.Element getChild(java.lang.String, java.lang.String) 0'>
@@ -20,18 +20,21 @@
     <item name='android.sax.Element android.sax.Element requireChild(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.sax.Element android.sax.Element requireChild(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.sax.RootElement org.xml.sax.ContentHandler getContentHandler()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.sax.Element android.sax.Element requireChild(java.lang.String, java.lang.String)'>
+    <item name='android.sax.Element android.sax.Element requireChild(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.sax.Element android.sax.Element getChild(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.sax.Element android.sax.Element requireChild(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.sax.Element android.sax.Element getChild(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.sax.Element android.sax.Element getChild(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/security/annotations.xml b/android-sdk-annotations/android/security/annotations.xml
index b0f6800cb2f..91ac61dae00 100644
--- a/android-sdk-annotations/android/security/annotations.xml
+++ b/android-sdk-annotations/android/security/annotations.xml
@@ -2,7 +2,7 @@
     <item name='android.security.AndroidKeyStore java.security.Key engineGetKey(java.lang.String, char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.AndroidKeyPairGenerator java.security.KeyPair generateKeyPair()'>
+    <item name='android.security.KeyStoreParameter.Builder android.security.KeyStoreParameter.Builder setEncryptionRequired(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.IKeystoreService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
@@ -17,7 +17,7 @@
     <item name='android.security.AndroidKeyPairGenerator void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.IKeyChainService.Stub android.os.IBinder asBinder()'>
+    <item name='android.security.AndroidKeyStore void engineStore(java.io.OutputStream, char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyPairGeneratorSpec KeyPairGeneratorSpec(android.content.Context, java.lang.String, java.lang.String, int, java.security.spec.AlgorithmParameterSpec, javax.security.auth.x500.X500Principal, java.math.BigInteger, java.util.Date, java.util.Date, int) 5'>
@@ -26,25 +26,37 @@
     <item name='android.security.KeyChain java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.IKeystoreService.Stub android.os.IBinder asBinder()'>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyChain java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec java.math.BigInteger getSerialNumber()'>
+    <item name='android.security.KeyPairGeneratorSpec java.util.Date getStartDate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.AndroidKeyStore void engineSetCertificateEntry(java.lang.String, java.security.cert.Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.security.KeyStoreParameter.Builder android.security.KeyStoreParameter build()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setAlias(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.security.AndroidKeyStore void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyChain android.security.KeyChain.KeyChainConnection bind(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.Credentials java.util.List&lt;java.security.cert.X509Certificate&gt; convertFromPem(byte[])'>
+    <item name='android.security.KeyPairGeneratorSpec android.content.Context getContext()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.AndroidKeyStore void engineSetEntry(java.lang.String, java.security.KeyStore.Entry, java.security.KeyStore.ProtectionParameter) 1'>
@@ -56,43 +68,52 @@
     <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setKeyType(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.security.Credentials byte[] convertToPem(java.security.cert.Certificate...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal)'>
+    <item name='android.security.IKeystoreService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired()'>
+    <item name='android.security.IKeystoreService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec java.util.Date getEndDate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.security.IKeyChainAliasCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.security.KeyPairGeneratorSpec KeyPairGeneratorSpec(android.content.Context, java.lang.String, java.lang.String, int, java.security.spec.AlgorithmParameterSpec, javax.security.auth.x500.X500Principal, java.math.BigInteger, java.util.Date, java.util.Date, int) 6'>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec build()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyStoreParameter.Builder android.security.KeyStoreParameter build()'>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setKeyType(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.IKeyChainService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.AndroidKeyStore java.util.Enumeration&lt;java.lang.String&gt; engineAliases()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.KeyStore.State android.security.KeyStore.State valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyStore android.security.KeyStore getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.SystemKeyStore byte[] generateNewKey(int, java.lang.String, java.lang.String) 1'>
+    <item name='android.security.AndroidKeyStore void engineStore(java.io.OutputStream, char[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec javax.security.auth.x500.X500Principal getSubjectDN()'>
+    <item name='android.security.KeyStore android.security.KeyStore.State state()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.AndroidKeyPairGenerator java.security.KeyPair generateKeyPair()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.KeyPairGeneratorSpec KeyPairGeneratorSpec(android.content.Context, java.lang.String, java.lang.String, int, java.security.spec.AlgorithmParameterSpec, javax.security.auth.x500.X500Principal, java.math.BigInteger, java.util.Date, java.util.Date, int) 6'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.IKeystoreService byte[] sign(java.lang.String, byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.SystemKeyStore byte[] generateNewKey(int, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyStoreParameter.Builder Builder(android.content.Context) 0'>
@@ -101,13 +122,10 @@
     <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.Credentials java.util.List&lt;java.security.cert.X509Certificate&gt; convertFromPem(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.security.KeyPairGeneratorSpec.Builder Builder(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setKeySize(int)'>
+    <item name='android.security.Credentials java.util.List&lt;java.security.cert.X509Certificate&gt; convertFromPem(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyChain void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String) 0'>
@@ -119,7 +137,10 @@
     <item name='android.security.KeyChain boolean isKeyAlgorithmSupported(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setAlias(java.lang.String)'>
+    <item name='android.security.KeyPairGeneratorSpec javax.security.auth.x500.X500Principal getSubjectDN()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.IKeyChainAliasCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyPairGeneratorSpec KeyPairGeneratorSpec(android.content.Context, java.lang.String, java.lang.String, int, java.security.spec.AlgorithmParameterSpec, javax.security.auth.x500.X500Principal, java.math.BigInteger, java.util.Date, java.util.Date, int) 7'>
@@ -134,19 +155,31 @@
     <item name='android.security.AndroidKeyStore java.security.cert.Certificate engineGetCertificate(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec) 0'>
+    <item name='android.security.IKeyChainService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec android.content.Context getContext()'>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.AndroidKeyStore boolean engineContainsAlias(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.security.AndroidKeyStore void engineSetKeyEntry(java.lang.String, byte[], java.security.cert.Certificate[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setAlias(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date)'>
+    <item name='android.security.KeyPairGeneratorSpec java.util.Date getEndDate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.IKeystoreService byte[] get(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.KeyChain android.security.KeyChain.KeyChainConnection bind(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.IKeystoreService byte[] get_pubkey(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyChain void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String) 1'>
@@ -155,52 +188,49 @@
     <item name='android.security.KeyChain java.security.cert.X509Certificate[] getCertificateChain(android.content.Context, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec java.util.Date getStartDate()'>
+    <item name='android.security.Credentials java.util.List&lt;java.security.cert.X509Certificate&gt; convertFromPem(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.AndroidKeyStore java.security.cert.Certificate[] engineGetCertificateChain(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyChain android.content.Intent createInstallIntent()'>
+    <item name='android.security.Credentials byte[] convertToPem(java.security.cert.Certificate...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyStoreParameter.Builder android.security.KeyStoreParameter.Builder setEncryptionRequired(boolean)'>
+    <item name='android.security.AndroidKeyStore void engineDeleteEntry(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.IKeyChainAliasCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.AndroidKeyStore void engineDeleteEntry(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.security.Credentials byte[] convertToPem(java.security.cert.Certificate...)'>
+    <item name='android.security.IKeyChainService byte[] getCertificate(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyPairGeneratorSpec KeyPairGeneratorSpec(android.content.Context, java.lang.String, java.lang.String, int, java.security.spec.AlgorithmParameterSpec, javax.security.auth.x500.X500Principal, java.math.BigInteger, java.util.Date, java.util.Date, int) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.security.KeyPairGeneratorSpec java.math.BigInteger getSerialNumber()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.security.AndroidKeyStore void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.security.AndroidKeyStore void engineSetEntry(java.lang.String, java.security.KeyStore.Entry, java.security.KeyStore.ProtectionParameter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setKeySize(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.security.AndroidKeyStore void engineSetCertificateEntry(java.lang.String, java.security.cert.Certificate) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyStore android.security.KeyStore.State state()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.security.AndroidKeyStore java.util.Enumeration&lt;java.lang.String&gt; engineAliases()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.security.KeyChain android.security.KeyChain.KeyChainConnection bind(android.content.Context)'>
+    <item name='android.security.IKeyChainAliasCallback.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.KeyChain boolean isBoundKeyAlgorithm(java.lang.String) 0'>
@@ -209,13 +239,13 @@
     <item name='android.security.KeyChain java.security.cert.X509Certificate[] getCertificateChain(android.content.Context, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec build()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.security.KeyStore.State android.security.KeyStore.State valueOf(java.lang.String)'>
+    <item name='android.security.KeyChain android.content.Intent createInstallIntent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.security.SystemKeyStore java.lang.String generateNewKeyHexString(int, java.lang.String, java.lang.String) 1'>
@@ -224,4 +254,7 @@
     <item name='android.security.KeyPairGeneratorSpec.Builder android.security.KeyPairGeneratorSpec.Builder setKeyType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.security.AndroidKeyStore void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/service/dreams/annotations.xml b/android-sdk-annotations/android/service/dreams/annotations.xml
index 1b4ff260822..0de7a62ca78 100644
--- a/android-sdk-annotations/android/service/dreams/annotations.xml
+++ b/android-sdk-annotations/android/service/dreams/annotations.xml
@@ -2,9 +2,6 @@
     <item name='android.service.dreams.IDreamManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.dreams.DreamService android.os.IBinder onBind(android.content.Intent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.service.dreams.DreamService boolean onMenuItemSelected(int, android.view.MenuItem) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -14,27 +11,51 @@
     <item name='android.service.dreams.DreamService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.service.dreams.IDreamService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.service.dreams.DreamService boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.dreams.DreamService boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.dreams.DreamService boolean dispatchKeyShortcutEvent(android.view.KeyEvent) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.service.dreams.IDreamService.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.service.dreams.DreamService android.os.IBinder onBind(android.content.Intent) 0'>
+    <item name='android.service.dreams.IDreamManager void testDream(android.content.ComponentName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.dreams.IDreamManager.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.service.dreams.DreamService boolean dispatchGenericMotionEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.dreams.DreamService boolean dispatchKeyShortcutEvent(android.view.KeyEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.dreams.IDreamService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.dreams.IDreamManager void finishSelf(android.os.IBinder) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.dreams.IDreamManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.dreams.DreamService android.os.IBinder onBind(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.dreams.DreamService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.dreams.IDreamService.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.service.dreams.Sandman boolean shouldStartDockApp(android.content.Context, android.content.Intent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.service.dreams.DreamService android.os.IBinder onBind(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.service.dreams.Sandman boolean shouldStartDockApp(android.content.Context, android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/service/notification/annotations.xml b/android-sdk-annotations/android/service/notification/annotations.xml
index fad48aa72d9..81f669f2fcd 100644
--- a/android-sdk-annotations/android/service/notification/annotations.xml
+++ b/android-sdk-annotations/android/service/notification/annotations.xml
@@ -1,29 +1,32 @@
 <root>
-    <item name='android.service.notification.StatusBarNotification java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.service.notification.StatusBarNotification android.app.Notification getNotification()'>
+    <item name='android.service.notification.StatusBarNotification java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, int, java.lang.String, int, int, int, android.app.Notification) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.notification.INotificationListener.Stub android.os.IBinder asBinder()'>
+    <item name='android.service.notification.INotificationListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.notification.INotificationListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, int, java.lang.String, int, int, int, android.app.Notification) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle) 0'>
+    <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle, long) 0'>
+    <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.notification.StatusBarNotification android.service.notification.StatusBarNotification cloneLight()'>
+    <item name='android.service.notification.StatusBarNotification android.service.notification.StatusBarNotification clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.notification.StatusBarNotification java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle) 7'>
@@ -35,24 +38,30 @@
     <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle, long) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.service.notification.StatusBarNotification android.service.notification.StatusBarNotification cloneLight()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.notification.StatusBarNotification void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.notification.StatusBarNotification java.lang.String toString()'>
+    <item name='android.service.notification.INotificationListener.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.notification.StatusBarNotification StatusBarNotification(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.notification.StatusBarNotification android.service.notification.StatusBarNotification clone()'>
+    <item name='android.service.notification.StatusBarNotification android.app.Notification getNotification()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.service.notification.NotificationListenerService android.os.IBinder onBind(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.service.notification.StatusBarNotification StatusBarNotification(java.lang.String, java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/service/textservice/annotations.xml b/android-sdk-annotations/android/service/textservice/annotations.xml
index cf48ffdc0e8..3edd8494536 100644
--- a/android-sdk-annotations/android/service/textservice/annotations.xml
+++ b/android-sdk-annotations/android/service/textservice/annotations.xml
@@ -1,16 +1,16 @@
 <root>
-    <item name='android.service.textservice.SpellCheckerService.Session android.view.textservice.SuggestionsInfo[] onGetSuggestionsMultiple(android.view.textservice.TextInfo[], int, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.service.textservice.SpellCheckerService android.os.IBinder onBind(android.content.Intent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.textservice.SpellCheckerService.SentenceLevelAdapter.SentenceTextInfoParams SentenceTextInfoParams(android.view.textservice.TextInfo, java.util.ArrayList&lt;android.service.textservice.SpellCheckerService.SentenceLevelAdapter.SentenceWordItem&gt;) 1'>
+    <item name='android.service.textservice.SpellCheckerService.Session android.view.textservice.SuggestionsInfo[] onGetSuggestionsMultiple(android.view.textservice.TextInfo[], int, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.textservice.SpellCheckerService.Session android.view.textservice.SentenceSuggestionsInfo[] onGetSentenceSuggestionsMultiple(android.view.textservice.TextInfo[], int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.service.textservice.SpellCheckerService.SentenceLevelAdapter.SentenceTextInfoParams SentenceTextInfoParams(android.view.textservice.TextInfo, java.util.ArrayList&lt;android.service.textservice.SpellCheckerService.SentenceLevelAdapter.SentenceWordItem&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.service.textservice.SpellCheckerService android.os.IBinder onBind(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/service/wallpaper/annotations.xml b/android-sdk-annotations/android/service/wallpaper/annotations.xml
index 45a30e6a598..8c0428c0872 100644
--- a/android-sdk-annotations/android/service/wallpaper/annotations.xml
+++ b/android-sdk-annotations/android/service/wallpaper/annotations.xml
@@ -1,29 +1,50 @@
 <root>
-    <item name='android.service.wallpaper.WallpaperService android.os.IBinder onBind(android.content.Intent) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.service.wallpaper.WallpaperService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.wallpaper.IWallpaperEngine.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.service.wallpaper.WallpaperService android.os.IBinder onBind(android.content.Intent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.service.wallpaper.IWallpaperConnection.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.service.wallpaper.WallpaperService.Engine void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.wallpaper.IWallpaperConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.service.wallpaper.WallpaperService android.os.IBinder onBind(android.content.Intent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.service.wallpaper.WallpaperService.Engine android.view.SurfaceHolder getSurfaceHolder()'>
+    <item name='android.service.wallpaper.IWallpaperService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.IWallpaperEngine.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.IWallpaperService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.WallpaperService android.os.IBinder onBind(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.IWallpaperConnection.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.IWallpaperConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.IWallpaperEngine void dispatchPointer(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.service.wallpaper.IWallpaperService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.service.wallpaper.IWallpaperConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.IWallpaperEngine.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.IWallpaperEngine.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.WallpaperService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.service.wallpaper.WallpaperService.Engine android.view.SurfaceHolder getSurfaceHolder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/speech/annotations.xml b/android-sdk-annotations/android/speech/annotations.xml
index 3d5110891a4..671d5a1248f 100644
--- a/android-sdk-annotations/android/speech/annotations.xml
+++ b/android-sdk-annotations/android/speech/annotations.xml
@@ -1,35 +1,47 @@
 <root>
+    <item name='android.speech.RecognizerIntent android.content.Intent getVoiceDetailsIntent(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.IRecognitionListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.IRecognitionListener.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.IRecognitionListener.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.speech.SpeechRecognizer android.speech.SpeechRecognizer createSpeechRecognizer(android.content.Context, android.content.ComponentName)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.RecognitionService android.os.IBinder onBind(android.content.Intent)'>
+    <item name='android.speech.SpeechRecognizer boolean isRecognitionAvailable(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.IRecognitionService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.IRecognitionService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.speech.RecognitionService android.os.IBinder onBind(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.SpeechRecognizer android.speech.SpeechRecognizer createSpeechRecognizer(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.speech.RecognizerIntent android.content.Intent getVoiceDetailsIntent(android.content.Context) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.speech.SpeechRecognizer android.speech.SpeechRecognizer createSpeechRecognizer(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.speech.RecognitionService android.os.IBinder onBind(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.speech.SpeechRecognizer android.speech.SpeechRecognizer createSpeechRecognizer(android.content.Context, android.content.ComponentName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.speech.SpeechRecognizer void startListening(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.SpeechRecognizer boolean isRecognitionAvailable(android.content.Context) 0'>
+    <item name='android.speech.SpeechRecognizer android.speech.SpeechRecognizer createSpeechRecognizer(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.speech.IRecognitionService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.IRecognitionListener.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/speech/srec/annotations.xml b/android-sdk-annotations/android/speech/srec/annotations.xml
index 106b8639893..fde690e7b5d 100644
--- a/android-sdk-annotations/android/speech/srec/annotations.xml
+++ b/android-sdk-annotations/android/speech/srec/annotations.xml
@@ -1,20 +1,26 @@
 <root>
-    <item name='android.speech.srec.WaveHeader android.speech.srec.WaveHeader setSampleRate(int)'>
+    <item name='android.speech.srec.WaveHeader android.speech.srec.WaveHeader setNumChannels(short)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.srec.WaveHeader int write(java.io.OutputStream) 0'>
+    <item name='android.speech.srec.Recognizer java.lang.String eventToString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.srec.WaveHeader android.speech.srec.WaveHeader setBitsPerSample(short)'>
+    <item name='android.speech.srec.UlawEncoderInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.speech.srec.WaveHeader android.speech.srec.WaveHeader setNumBytes(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.srec.WaveHeader android.speech.srec.WaveHeader setFormat(short)'>
+    <item name='android.speech.srec.WaveHeader int write(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.srec.Recognizer java.lang.String eventToString(int)'>
+    <item name='android.speech.srec.WaveHeader java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.srec.MicrophoneInputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.srec.WaveHeader android.speech.srec.WaveHeader setSampleRate(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.speech.srec.Recognizer void putAudio(java.io.InputStream) 0'>
@@ -26,15 +32,15 @@
     <item name='android.speech.srec.Recognizer.Grammar Grammar(android.speech.srec.Recognizer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.srec.WaveHeader java.lang.String toString()'>
+    <item name='android.speech.srec.WaveHeader android.speech.srec.WaveHeader setBitsPerSample(short)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.srec.WaveHeader android.speech.srec.WaveHeader setFormat(short)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.speech.srec.UlawEncoderInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.srec.WaveHeader android.speech.srec.WaveHeader setNumChannels(short)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.speech.srec.WaveHeader int read(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/speech/tts/annotations.xml b/android-sdk-annotations/android/speech/tts/annotations.xml
index e81e86330eb..3a4def846d5 100644
--- a/android-sdk-annotations/android/speech/tts/annotations.xml
+++ b/android-sdk-annotations/android/speech/tts/annotations.xml
@@ -2,43 +2,52 @@
     <item name='android.speech.tts.TextToSpeechService android.os.IBinder onBind(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.tts.TextToSpeech int isLanguageAvailable(java.util.Locale) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.speech.tts.TtsEngines java.lang.String[] parseLocalePref(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.tts.ITextToSpeechCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.speech.tts.ITextToSpeechService.Stub android.os.IBinder asBinder()'>
+    <item name='android.speech.tts.TextToSpeech int isLanguageAvailable(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.speech.tts.SynthesisRequest android.os.Bundle getParams()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.tts.TextToSpeech java.util.List&lt;android.speech.tts.TextToSpeech.EngineInfo&gt; getEngines()'>
+    <item name='android.speech.tts.SynthesisRequest SynthesisRequest(java.lang.String, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.tts.SynthesisRequest SynthesisRequest(java.lang.String, android.os.Bundle) 1'>
+    <item name='android.speech.tts.ITextToSpeechService.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.speech.tts.TextToSpeech int addEarcon(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.speech.tts.TtsEngines java.util.List&lt;android.speech.tts.TextToSpeech.EngineInfo&gt; getEngines()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.speech.tts.TextToSpeech int addSpeech(java.lang.String, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.speech.tts.ITextToSpeechService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.speech.tts.TextToSpeech java.util.Set&lt;java.lang.String&gt; getFeatures(java.util.Locale) 0'>
+    <item name='android.speech.tts.ITextToSpeechCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.speech.tts.TextToSpeech.EngineInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.speech.tts.TextToSpeech int addSpeech(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.tts.TextToSpeech java.util.List&lt;android.speech.tts.TextToSpeech.EngineInfo&gt; getEngines()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.tts.TextToSpeech java.util.Set&lt;java.lang.String&gt; getFeatures(java.util.Locale) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.tts.ITextToSpeechService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.tts.ITextToSpeechCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.tts.TtsEngines java.util.List&lt;android.speech.tts.TextToSpeech.EngineInfo&gt; getEngines()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.tts.ITextToSpeechCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.speech.tts.ITextToSpeechService.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/support/v13/app/annotations.xml b/android-sdk-annotations/android/support/v13/app/annotations.xml
index 9a4c463bbe2..3c906fdbdec 100644
--- a/android-sdk-annotations/android/support/v13/app/annotations.xml
+++ b/android-sdk-annotations/android/support/v13/app/annotations.xml
@@ -8,9 +8,15 @@
     <item name='android.support.v13.app.FragmentTabHost FragmentTabHost(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v13.app.FragmentStatePagerAdapter java.lang.Object instantiateItem(android.view.ViewGroup, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v13.app.FragmentTabHost void addTab(android.widget.TabHost.TabSpec, java.lang.Class&lt;?&gt;, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v13.app.FragmentTabHost android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v13.app.FragmentTabHost FragmentTabHost(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,9 +26,6 @@
     <item name='android.support.v13.app.FragmentTabHost FragmentTabHost(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v13.app.FragmentTabHost android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v13.app.FragmentStatePagerAdapter boolean isViewFromObject(android.view.View, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/support/v4/app/annotations.xml b/android-sdk-annotations/android/support/v4/app/annotations.xml
index 231bb5a3388..c62e029e3ff 100644
--- a/android-sdk-annotations/android/support/v4/app/annotations.xml
+++ b/android-sdk-annotations/android/support/v4/app/annotations.xml
@@ -1,47 +1,71 @@
 <root>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setText(java.lang.CharSequence)'>
+    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setFullScreenIntent(android.app.PendingIntent, boolean)'>
+    <item name='android.support.v4.app.FragmentManager android.support.v4.app.FragmentTransaction beginTransaction()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ListFragment android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.LoaderManager void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.ActivityCompat void startActivityForResult(android.app.Activity, android.content.Intent, int, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder create(android.content.Context)'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setOngoing(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.InboxStyle android.support.v4.app.NotificationCompat.InboxStyle addLine(java.lang.CharSequence)'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setLights(int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setText(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setProgress(int, int, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction setCustomAnimations(int, int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addParentStack(android.content.ComponentName)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentReader android.support.v4.app.ShareCompat.IntentReader from(android.app.Activity)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder from(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setPriority(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailTo(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addStream(android.net.Uri)'>
+    <item name='android.support.v4.app.NotificationCompat.InboxStyle android.support.v4.app.NotificationCompat.InboxStyle setBigContentTitle(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.NavUtils android.content.Intent getParentActivityIntent(android.content.Context, java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailBcc(java.lang.String[])'>
+    <item name='android.support.v4.app.Fragment java.lang.String getString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContentText(java.lang.CharSequence)'>
+    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addParentStack(java.lang.Class&lt;?&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setOnlyAlertOnce(boolean)'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setAutoCancel(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentManager void putFragment(android.os.Bundle, java.lang.String, android.support.v4.app.Fragment) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.InboxStyle android.support.v4.app.NotificationCompat.InboxStyle addLine(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.TaskStackBuilder android.content.Intent[] getIntents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction add(int, android.support.v4.app.Fragment, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.Fragment android.support.v4.app.Fragment instantiate(android.content.Context, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addParentStack(android.app.Activity)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction remove(android.support.v4.app.Fragment)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.NavUtils java.lang.String getParentActivityName(android.content.Context, android.content.ComponentName) 0'>
@@ -50,64 +74,73 @@
     <item name='android.support.v4.app.FragmentStatePagerAdapter boolean isViewFromObject(android.view.View, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.Fragment android.support.v4.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle)'>
+    <item name='android.support.v4.app.ActivityOptionsCompat android.support.v4.app.ActivityOptionsCompat makeCustomAnimation(android.content.Context, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.Fragment java.lang.String getString(int)'>
+    <item name='android.support.v4.app.Fragment android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setType(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.Fragment void onConfigurationChanged(android.content.res.Configuration) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setEmailTo(java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ActivityOptionsCompat android.support.v4.app.ActivityOptionsCompat makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction add(android.support.v4.app.Fragment, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.FragmentTabHost void addTab(android.widget.TabHost.TabSpec, java.lang.Class&lt;?&gt;, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.FragmentStatePagerAdapter java.lang.Object instantiateItem(android.view.ViewGroup, int)'>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction addToBackStack(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.FragmentPagerAdapter boolean isViewFromObject(android.view.View, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setLargeIcon(android.graphics.Bitmap)'>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailCc(java.lang.String[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addNextIntent(android.content.Intent)'>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setStream(android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ActivityOptionsCompat android.support.v4.app.ActivityOptionsCompat makeCustomAnimation(android.content.Context, int, int)'>
+    <item name='android.support.v4.app.NotificationCompat.BigPictureStyle android.support.v4.app.NotificationCompat.BigPictureStyle setSummaryText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.Fragment java.lang.String toString()'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setSmallIcon(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContentTitle(java.lang.CharSequence)'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContentText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder from(android.app.Activity)'>
+    <item name='android.support.v4.app.Fragment java.lang.CharSequence getText(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setStyle(android.support.v4.app.NotificationCompat.Style)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.NavUtils java.lang.String getParentActivityName(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setDefaults(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setVibrate(long[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.FragmentActivity android.support.v4.app.FragmentManager getSupportFragmentManager()'>
+    <item name='android.support.v4.app.ListFragment android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.ActivityCompat void startActivity(android.app.Activity, android.content.Intent, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.Fragment android.support.v4.app.Fragment instantiate(android.content.Context, java.lang.String)'>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailTo(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.ShareCompat.IntentReader android.support.v4.app.ShareCompat.IntentReader from(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContentIntent(android.app.PendingIntent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setUsesChronometer(boolean)'>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction replace(int, android.support.v4.app.Fragment)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addParentStack(java.lang.Class&lt;?&gt;) 0'>
@@ -116,196 +149,241 @@
     <item name='android.support.v4.app.Fragment void registerForContextMenu(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setEmailBcc(java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setEmailCc(java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailTo(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setSound(android.net.Uri, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setStyle(android.support.v4.app.NotificationCompat.Style)'>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction setCustomAnimations(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.FragmentActivity void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addParentStack(android.app.Activity)'>
+    <item name='android.support.v4.app.ShareCompat.IntentReader android.support.v4.app.ShareCompat.IntentReader from(android.app.Activity)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.FragmentTabHost void onRestoreInstanceState(android.os.Parcelable) 0'>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addStream(android.net.Uri)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailTo(java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContentTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentManager void putFragment(android.os.Bundle, java.lang.String, android.support.v4.app.Fragment) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.FragmentActivity boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.BigTextStyle android.support.v4.app.NotificationCompat.BigTextStyle setSummaryText(java.lang.CharSequence)'>
+    <item name='android.support.v4.app.FragmentTabHost void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.Fragment android.support.v4.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction setTransitionStyle(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setChooserTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setLargeIcon(android.graphics.Bitmap)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.FragmentActivity boolean onMenuItemSelected(int, android.view.MenuItem) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder addAction(int, java.lang.CharSequence, android.app.PendingIntent)'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setDeleteIntent(android.app.PendingIntent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentManager void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction add(int, android.support.v4.app.Fragment) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder create(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.BigTextStyle android.support.v4.app.NotificationCompat.BigTextStyle setSummaryText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.ShareCompat void configureMenuItem(android.view.Menu, int, android.support.v4.app.ShareCompat.IntentBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.BigPictureStyle android.support.v4.app.NotificationCompat.BigPictureStyle setBigContentTitle(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.app.FragmentPagerAdapter java.lang.Object instantiateItem(android.view.ViewGroup, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.DialogFragment int show(android.support.v4.app.FragmentTransaction, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.BigTextStyle android.support.v4.app.NotificationCompat.BigTextStyle setBigContentTitle(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.Fragment void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setDeleteIntent(android.app.PendingIntent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder from(android.app.Activity) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailCc(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.ActivityOptionsCompat android.support.v4.app.ActivityOptionsCompat makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.Fragment.SavedState void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setSmallIcon(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setNumber(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.FragmentTabHost FragmentTabHost(android.content.Context) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.BigPictureStyle android.support.v4.app.NotificationCompat.BigPictureStyle bigLargeIcon(android.graphics.Bitmap)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.BigTextStyle android.support.v4.app.NotificationCompat.BigTextStyle bigText(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContent(android.widget.RemoteViews)'>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.content.Intent createChooserIntent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setSubText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.TaskStackBuilder java.util.Iterator&lt;android.content.Intent&gt; iterator()'>
+    <item name='android.support.v4.app.Fragment void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.Fragment java.lang.String getString(int, java.lang.Object...)'>
+    <item name='android.support.v4.app.LoaderManager android.support.v4.content.Loader&lt;D&gt; restartLoader(int, android.os.Bundle, android.support.v4.app.LoaderManager.LoaderCallbacks&lt;D&gt;) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setEmailTo(java.lang.String[])'>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder from(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailTo(java.lang.String[])'>
+    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder from(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.InboxStyle android.support.v4.app.NotificationCompat.InboxStyle setBigContentTitle(java.lang.CharSequence)'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setUsesChronometer(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent) 0'>
+    <item name='android.support.v4.app.FragmentActivity android.support.v4.app.FragmentManager getSupportFragmentManager()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContentIntent(android.app.PendingIntent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.Fragment.SavedState void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTabHost FragmentTabHost(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setSmallIcon(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction disallowAddToBackStack()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailBcc(java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setFullScreenIntent(android.app.PendingIntent, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.DialogFragment void onSaveInstanceState(android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentManager android.support.v4.app.Fragment getFragment(android.os.Bundle, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentManager android.support.v4.app.Fragment.SavedState saveFragmentInstanceState(android.support.v4.app.Fragment) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.NotificationCompat.BigPictureStyle android.support.v4.app.NotificationCompat.BigPictureStyle bigPicture(android.graphics.Bitmap)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setSound(android.net.Uri)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setOngoing(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.FragmentTabHost android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NavUtils android.content.Intent getParentActivityIntent(android.content.Context, android.content.ComponentName) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailBcc(java.lang.String[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setTicker(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setHtmlText(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat java.lang.String getCallingPackage(android.app.Activity) 0'>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailBcc(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.Fragment void unregisterForContextMenu(android.view.View) 0'>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction setBreadCrumbShortTitle(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setEmailBcc(java.lang.String[])'>
+    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ListFragment android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle)'>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction replace(int, android.support.v4.app.Fragment, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setType(java.lang.String)'>
+    <item name='android.support.v4.app.Fragment void onSaveInstanceState(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setStream(android.net.Uri)'>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction show(android.support.v4.app.Fragment)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.NotificationCompat.InboxStyle android.support.v4.app.NotificationCompat.InboxStyle setSummaryText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat android.content.ComponentName getCallingActivity(android.app.Activity) 0'>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction replace(int, android.support.v4.app.Fragment, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setEmailCc(java.lang.String[])'>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailBcc(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setProgress(int, int, boolean)'>
+    <item name='android.support.v4.app.NavUtils android.content.Intent getParentActivityIntent(android.content.Context, android.content.ComponentName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailCc(java.lang.String[]) 0'>
+    <item name='android.support.v4.app.DialogFragment void onAttach(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setSubject(java.lang.String)'>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction hide(android.support.v4.app.Fragment)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.FragmentTabHost FragmentTabHost(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.support.v4.app.ShareCompat java.lang.String getCallingPackage(android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.FragmentActivity void onSaveInstanceState(android.os.Bundle) 0'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContent(android.widget.RemoteViews)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.TaskStackBuilder android.content.Intent[] getIntents()'>
+    <item name='android.support.v4.app.Fragment void unregisterForContextMenu(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.ActivityOptionsCompat android.support.v4.app.ActivityOptionsCompat makeScaleUpAnimation(android.view.View, int, int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setAutoCancel(boolean)'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setSound(android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setWhen(long)'>
+    <item name='android.support.v4.app.FragmentTabHost android.os.Parcelable onSaveInstanceState()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent)'>
+    <item name='android.support.v4.app.NotificationCompat.BigTextStyle android.support.v4.app.NotificationCompat.BigTextStyle bigText(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat android.content.ComponentName getCallingActivity(android.app.Activity) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentStatePagerAdapter java.lang.Object instantiateItem(android.view.ViewGroup, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentStatePagerAdapter java.lang.Object instantiateItem(android.view.ViewGroup, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailCc(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTabHost FragmentTabHost(android.content.Context, android.util.AttributeSet) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addNextIntent(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setNumber(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentActivity void onSaveInstanceState(android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.BigPictureStyle android.support.v4.app.NotificationCompat.BigPictureStyle setBigContentTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setSubject(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.Fragment java.lang.String getString(int, java.lang.Object...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction add(int, android.support.v4.app.Fragment, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.DialogFragment void show(android.support.v4.app.FragmentManager, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.BigPictureStyle android.support.v4.app.NotificationCompat.BigPictureStyle setSummaryText(java.lang.CharSequence)'>
+    <item name='android.support.v4.app.NotificationCompat.BigTextStyle android.support.v4.app.NotificationCompat.BigTextStyle setBigContentTitle(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.TaskStackBuilder android.support.v4.app.TaskStackBuilder addParentStack(java.lang.Class&lt;?&gt;)'>
+    <item name='android.support.v4.app.TaskStackBuilder java.util.Iterator&lt;android.content.Intent&gt; iterator()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.Fragment java.lang.String getString(int, java.lang.Object...) 1'>
@@ -314,49 +392,94 @@
     <item name='android.support.v4.app.ActionBarDrawerToggle ActionBarDrawerToggle(android.app.Activity, android.support.v4.widget.DrawerLayout, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ActivityCompat void finishAffinity(android.app.Activity) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContentInfo(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setSmallIcon(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.Fragment java.lang.CharSequence getText(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailCc(java.lang.String[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NavUtils android.content.Intent getParentActivityIntent(android.content.Context, java.lang.Class&lt;?&gt;) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.FragmentTabHost FragmentTabHost(android.content.Context, android.util.AttributeSet) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.content.Intent createChooserIntent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.FragmentActivity void onConfigurationChanged(android.content.res.Configuration) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews)'>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction add(int, android.support.v4.app.Fragment)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setChooserTitle(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder setChooserTitle(java.lang.CharSequence)'>
+    <item name='android.support.v4.app.ActivityCompat void finishAffinity(android.app.Activity) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction replace(int, android.support.v4.app.Fragment) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder addAction(int, java.lang.CharSequence, android.app.PendingIntent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setOnlyAlertOnce(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.Fragment void onAttach(android.app.Activity) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setTicker(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NavUtils android.content.Intent getParentActivityIntent(android.content.Context, java.lang.Class&lt;?&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction setBreadCrumbTitle(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTabHost FragmentTabHost(android.content.Context, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder from(android.app.Activity)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.app.DialogFragment android.app.Dialog onCreateDialog(android.os.Bundle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailBcc(java.lang.String)'>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setContentInfo(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setLights(int, int, int)'>
+    <item name='android.support.v4.app.FragmentActivity void onConfigurationChanged(android.content.res.Configuration) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction setBreadCrumbTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setDefaults(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setVibrate(long[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction setTransition(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.BigPictureStyle android.support.v4.app.NotificationCompat.BigPictureStyle bigLargeIcon(android.graphics.Bitmap)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setSound(android.net.Uri, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setWhen(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction detach(android.support.v4.app.Fragment)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.NotificationCompat.Builder android.support.v4.app.NotificationCompat.Builder setPriority(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction add(android.support.v4.app.Fragment, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.Fragment java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentTransaction attach(android.support.v4.app.Fragment)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.app.ShareCompat.IntentBuilder android.support.v4.app.ShareCompat.IntentBuilder addEmailCc(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/support/v4/content/annotations.xml b/android-sdk-annotations/android/support/v4/content/annotations.xml
index d17202425bc..a9cca1194ab 100644
--- a/android-sdk-annotations/android/support/v4/content/annotations.xml
+++ b/android-sdk-annotations/android/support/v4/content/annotations.xml
@@ -1,16 +1,52 @@
 <root>
-    <item name='android.support.v4.content.FileProvider java.lang.String getType(android.net.Uri)'>
+    <item name='android.support.v4.content.FileProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.FileProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.FileProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.FileProvider int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.Loader java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.WakefulBroadcastReceiver android.content.ComponentName startWakefulService(android.content.Context, android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.CursorLoader void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.content.Loader java.lang.String dataToString(D)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.content.CursorLoader CursorLoader(android.content.Context, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
+    <item name='android.support.v4.content.Loader void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.AsyncTaskLoader void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.FileProvider java.lang.String getType(android.net.Uri) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.content.ModernAsyncTask.Status android.support.v4.content.ModernAsyncTask.Status valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.content.FileProvider int delete(android.net.Uri, java.lang.String, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.AsyncTaskLoader AsyncTaskLoader(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.LocalBroadcastManager boolean sendBroadcast(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.content.CursorLoader CursorLoader(android.content.Context, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.content.ModernAsyncTask.Status android.support.v4.content.ModernAsyncTask.Status valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,28 +62,19 @@
     <item name='android.support.v4.content.WakefulBroadcastReceiver boolean completeWakefulIntent(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.content.FileProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)'>
+    <item name='android.support.v4.content.FileProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.content.WakefulBroadcastReceiver android.content.ComponentName startWakefulService(android.content.Context, android.content.Intent) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.content.CursorLoader void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+    <item name='android.support.v4.content.FileProvider int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.content.Loader Loader(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.content.Loader void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+    <item name='android.support.v4.content.FileProvider java.lang.String getType(android.net.Uri)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.content.AsyncTaskLoader void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.content.Loader java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.content.AsyncTaskLoader AsyncTaskLoader(android.content.Context) 0'>
+    <item name='android.support.v4.content.FileProvider int delete(android.net.Uri, java.lang.String, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.content.CursorLoader CursorLoader(android.content.Context) 0'>
@@ -56,7 +83,4 @@
     <item name='android.support.v4.content.LocalBroadcastManager void sendBroadcastSync(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.content.LocalBroadcastManager boolean sendBroadcast(android.content.Intent) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/support/v4/hardware/display/annotations.xml b/android-sdk-annotations/android/support/v4/hardware/display/annotations.xml
index 1bc7eec0281..0e542f6c03e 100644
--- a/android-sdk-annotations/android/support/v4/hardware/display/annotations.xml
+++ b/android-sdk-annotations/android/support/v4/hardware/display/annotations.xml
@@ -1,5 +1,11 @@
 <root>
+    <item name='android.support.v4.hardware.display.DisplayManagerCompat android.view.Display[] getDisplays(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.hardware.display.DisplayManagerCompat android.support.v4.hardware.display.DisplayManagerCompat getInstance(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.hardware.display.DisplayManagerCompat android.view.Display[] getDisplays()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/support/v4/os/annotations.xml b/android-sdk-annotations/android/support/v4/os/annotations.xml
index 74c722cf882..85925f252dc 100644
--- a/android-sdk-annotations/android/support/v4/os/annotations.xml
+++ b/android-sdk-annotations/android/support/v4/os/annotations.xml
@@ -1,5 +1,14 @@
 <root>
+    <item name='android.support.v4.os.ParcelableCompatCreatorCallbacks T createFromParcel(android.os.Parcel, java.lang.ClassLoader)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.os.ParcelableCompatCreatorCallbacks T createFromParcel(android.os.Parcel, java.lang.ClassLoader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.os.ParcelableCompat android.os.Parcelable.Creator&lt;T&gt; newCreator(android.support.v4.os.ParcelableCompatCreatorCallbacks&lt;T&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.os.ParcelableCompatCreatorCallbacks T[] newArray(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/support/v4/text/annotations.xml b/android-sdk-annotations/android/support/v4/text/annotations.xml
index 1f1cd80d122..69a95ecc046 100644
--- a/android-sdk-annotations/android/support/v4/text/annotations.xml
+++ b/android-sdk-annotations/android/support/v4/text/annotations.xml
@@ -1,35 +1,47 @@
 <root>
-    <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.support.v4.text.TextDirectionHeuristicCompat)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.text.BidiFormatter android.support.v4.text.BidiFormatter getInstance(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.text.BidiFormatter boolean isRtl(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, boolean)'>
+    <item name='android.support.v4.text.BidiFormatter android.support.v4.text.BidiFormatter getInstance(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.support.v4.text.TextDirectionHeuristicCompat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.text.BidiFormatter.Builder android.support.v4.text.BidiFormatter build()'>
+    <item name='android.support.v4.text.BidiFormatter android.support.v4.text.BidiFormatter getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.text.TextDirectionHeuristicCompat boolean isRtl(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.text.BidiFormatter.Builder android.support.v4.text.BidiFormatter.Builder stereoReset(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.text.BidiFormatter.Builder android.support.v4.text.BidiFormatter build()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.text.TextDirectionHeuristicCompat boolean isRtl(java.lang.CharSequence, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.text.TextUtilsCompat java.lang.String htmlEncode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.text.BidiFormatter android.support.v4.text.BidiFormatter getInstance()'>
+    <item name='android.support.v4.text.BidiFormatter.Builder android.support.v4.text.BidiFormatter.Builder setTextDirectionHeuristic(android.support.v4.text.TextDirectionHeuristicCompat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.text.BidiFormatter android.support.v4.text.BidiFormatter getInstance(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.support.v4.text.TextDirectionHeuristicCompat, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.support.v4.text.TextDirectionHeuristicCompat, boolean)'>
@@ -38,15 +50,6 @@
     <item name='android.support.v4.text.TextUtilsCompat java.lang.String htmlEncode(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.support.v4.text.TextDirectionHeuristicCompat, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.text.BidiFormatter.Builder android.support.v4.text.BidiFormatter.Builder setTextDirectionHeuristic(android.support.v4.text.TextDirectionHeuristicCompat)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.text.BidiFormatter android.support.v4.text.BidiFormatter getInstance(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.support.v4.text.TextDirectionHeuristicCompat, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -56,4 +59,7 @@
     <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.support.v4.text.TextDirectionHeuristicCompat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/support/v4/util/annotations.xml b/android-sdk-annotations/android/support/v4/util/annotations.xml
index d9bc96611b7..38872d0f519 100644
--- a/android-sdk-annotations/android/support/v4/util/annotations.xml
+++ b/android-sdk-annotations/android/support/v4/util/annotations.xml
@@ -1,16 +1,22 @@
 <root>
-    <item name='android.support.v4.util.AtomicFile java.io.FileInputStream openRead()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.util.AtomicFile byte[] readFully()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.util.LruCache V put(K, V) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.util.LruCache java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.util.LruCache V put(K, V) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.util.AtomicFile java.io.File getBaseFile()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.util.AtomicFile java.io.FileInputStream openRead()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.util.AtomicFile AtomicFile(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,9 +26,6 @@
     <item name='android.support.v4.util.TimeUtils void formatDuration(long, long, java.io.PrintWriter) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.util.AtomicFile java.io.FileOutputStream startWrite()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.util.LruCache V remove(K) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,16 +35,16 @@
     <item name='android.support.v4.util.DebugUtils void buildShortClassTag(java.lang.Object, java.lang.StringBuilder) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.util.LruCache java.lang.String toString()'>
+    <item name='android.support.v4.util.LruCache java.util.Map&lt;K,V&gt; snapshot()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.util.AtomicFile java.io.File getBaseFile()'>
+    <item name='android.support.v4.util.AtomicFile java.io.FileOutputStream startWrite()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.util.LruCache V get(K) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.util.LruCache java.util.Map&lt;K,V&gt; snapshot()'>
+    <item name='android.support.v4.util.LogWriter void write(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.util.TimeUtils void formatDuration(long, java.lang.StringBuilder) 1'>
diff --git a/android-sdk-annotations/android/support/v4/view/accessibility/annotations.xml b/android-sdk-annotations/android/support/v4/view/accessibility/annotations.xml
index fdccdb40ed9..d2d7f3f252a 100644
--- a/android-sdk-annotations/android/support/v4/view/accessibility/annotations.xml
+++ b/android-sdk-annotations/android/support/v4/view/accessibility/annotations.xml
@@ -1,28 +1,28 @@
 <root>
-    <item name='android.support.v4.view.accessibility.AccessibilityEventCompat android.support.v4.view.accessibility.AccessibilityRecordCompat getRecord(android.view.accessibility.AccessibilityEvent, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.view.accessibility.AccessibilityEventCompat android.support.v4.view.accessibility.AccessibilityRecordCompat asRecord(android.view.accessibility.AccessibilityEvent)'>
+    <item name='android.support.v4.view.accessibility.AccessibilityNodeInfoCompat java.util.List&lt;android.support.v4.view.accessibility.AccessibilityNodeInfoCompat&gt; findAccessibilityNodeInfosByText(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.accessibility.AccessibilityNodeInfoCompat android.support.v4.view.accessibility.AccessibilityNodeInfoCompat obtain(android.support.v4.view.accessibility.AccessibilityNodeInfoCompat) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.accessibility.AccessibilityRecordCompat android.support.v4.view.accessibility.AccessibilityRecordCompat obtain(android.support.v4.view.accessibility.AccessibilityRecordCompat)'>
+    <item name='android.support.v4.view.accessibility.AccessibilityRecordCompat android.support.v4.view.accessibility.AccessibilityRecordCompat obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.accessibility.AccessibilityEventCompat android.support.v4.view.accessibility.AccessibilityRecordCompat getRecord(android.view.accessibility.AccessibilityEvent, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.accessibility.AccessibilityNodeInfoCompat java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.accessibility.AccessibilityRecordCompat android.support.v4.view.accessibility.AccessibilityRecordCompat obtain()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.view.accessibility.AccessibilityNodeInfoCompat java.util.List&lt;android.support.v4.view.accessibility.AccessibilityNodeInfoCompat&gt; findAccessibilityNodeInfosByText(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.view.accessibility.AccessibilityEventCompat void appendRecord(android.view.accessibility.AccessibilityEvent, android.support.v4.view.accessibility.AccessibilityRecordCompat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.view.accessibility.AccessibilityEventCompat android.support.v4.view.accessibility.AccessibilityRecordCompat asRecord(android.view.accessibility.AccessibilityEvent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.accessibility.AccessibilityRecordCompat android.support.v4.view.accessibility.AccessibilityRecordCompat obtain(android.support.v4.view.accessibility.AccessibilityRecordCompat)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.view.accessibility.AccessibilityRecordCompat android.support.v4.view.accessibility.AccessibilityRecordCompat obtain(android.support.v4.view.accessibility.AccessibilityRecordCompat) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/support/v4/view/annotations.xml b/android-sdk-annotations/android/support/v4/view/annotations.xml
index 346bf1d50d5..64e4d93fc06 100644
--- a/android-sdk-annotations/android/support/v4/view/annotations.xml
+++ b/android-sdk-annotations/android/support/v4/view/annotations.xml
@@ -1,98 +1,236 @@
 <root>
-    <item name='android.support.v4.view.ViewPager.SavedState void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompat void onInitializeAccessibilityNodeInfo(android.view.View, android.support.v4.view.accessibility.AccessibilityNodeInfoCompat) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.ViewPager.SavedState SavedState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.view.ViewPager void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.view.ViewPager boolean onTouchEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge void sendAccessibilityEventUnchecked(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.view.PagerTitleStrip PagerTitleStrip(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.PagerTitleStrip PagerTitleStrip(android.content.Context, android.util.AttributeSet) 1'>
+    <item name='android.support.v4.view.ViewPager void onDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.ViewPager android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompat android.support.v4.view.accessibility.AccessibilityNodeProviderCompat getAccessibilityNodeProvider(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.ViewPager boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.view.KeyEventCompat boolean hasNoModifiers(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompat boolean performAccessibilityAction(android.view.View, int, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.view.ViewParentCompatICS boolean requestSendAccessibilityEvent(android.view.ViewParent, android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.PagerTabStrip PagerTabStrip(android.content.Context, android.util.AttributeSet) 1'>
+    <item name='android.support.v4.view.PagerTitleStrip PagerTitleStrip(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.PagerTitleStrip PagerTitleStrip(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.PagerTabStrip boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.ViewPager boolean onInterceptTouchEvent(android.view.MotionEvent) 0'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.ViewPager.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean java.lang.Object getAccessibilityNodeProvider(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.ViewPager ViewPager(android.content.Context, android.util.AttributeSet) 1'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompat void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.ViewPager android.os.Parcelable onSaveInstanceState()'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.ViewPager android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean void onPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager void removeView(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge void onPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge void sendAccessibilityEventUnchecked(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompat boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.PagerAdapter java.lang.Object instantiateItem(android.view.ViewGroup, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean void sendAccessibilityEventUnchecked(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.ViewPager boolean executeKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.MotionEventCompat int getActionMasked(android.view.MotionEvent) 0'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean boolean performAccessibilityAction(android.view.View, int, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.ViewPager.SavedState java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.view.ViewPager void addFocusables(java.util.ArrayList&lt;android.view.View&gt;, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.view.ViewPager ViewPager(android.content.Context) 0'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.KeyEventCompat boolean hasModifiers(android.view.KeyEvent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.ViewPager android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.view.PagerTabStrip PagerTabStrip(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.ViewPager android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.ViewPager.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.view.MotionEventCompat int getActionIndex(android.view.MotionEvent) 0'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.ViewPager boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.PagerTabStrip PagerTabStrip(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge void onPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.view.PagerTabStrip void onDraw(android.graphics.Canvas) 0'>
+    <item name='android.support.v4.view.MotionEventCompat int getActionIndex(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.PagerTabStrip PagerTabStrip(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.view.ViewPager ViewPager(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean void sendAccessibilityEvent(android.view.View, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager.SavedState void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.PagerAdapter boolean isViewFromObject(android.view.View, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean void sendAccessibilityEventUnchecked(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.PagerTitleStrip PagerTitleStrip(android.content.Context, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge void sendAccessibilityEvent(android.view.View, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.PagerAdapter java.lang.Object instantiateItem(android.view.ViewGroup, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.PagerTabStrip PagerTabStrip(android.content.Context, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager boolean onInterceptTouchEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompat boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager ViewPager(android.content.Context, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager void addTouchables(java.util.ArrayList&lt;android.view.View&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean void onPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompat void onInitializeAccessibilityNodeInfo(android.view.View, android.support.v4.view.accessibility.AccessibilityNodeInfoCompat) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager void addFocusables(java.util.ArrayList&lt;android.view.View&gt;, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.MotionEventCompat int getActionMasked(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager ViewPager(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatIcs.AccessibilityDelegateBridge void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompat boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager.SavedState java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompat void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.ViewPager void draw(android.graphics.Canvas) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.AccessibilityDelegateCompatJellyBean.AccessibilityDelegateBridgeJellyBean boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.view.PagerTabStrip void onDraw(android.graphics.Canvas) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/support/v4/widget/annotations.xml b/android-sdk-annotations/android/support/v4/widget/annotations.xml
index bb79b05ebb7..3750d832fe3 100644
--- a/android-sdk-annotations/android/support/v4/widget/annotations.xml
+++ b/android-sdk-annotations/android/support/v4/widget/annotations.xml
@@ -1,32 +1,35 @@
 <root>
-    <item name='android.support.v4.widget.ScrollerCompat android.support.v4.widget.ScrollerCompat create(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.widget.ResourceCursorAdapter ResourceCursorAdapter(android.content.Context, int, android.database.Cursor, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.SimpleCursorAdapter SimpleCursorAdapter(android.content.Context, int, android.database.Cursor, java.lang.String[], int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.ViewDragHelper.Callback boolean tryCaptureView(android.view.View, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.DrawerLayout boolean onInterceptTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.SlidingPaneLayout.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.SimpleCursorAdapter void setViewImage(android.widget.ImageView, java.lang.String) 0'>
+    <item name='android.support.v4.widget.SlidingPaneLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.DrawerLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.support.v4.widget.DrawerLayout boolean onKeyDown(int, android.view.KeyEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.widget.SimpleCursorAdapter void setViewImage(android.widget.ImageView, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.SimpleCursorAdapter SimpleCursorAdapter(android.content.Context, int, android.database.Cursor, java.lang.String[], int[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.DrawerLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+    <item name='android.support.v4.widget.SlidingPaneLayout android.os.Parcelable onSaveInstanceState()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.DrawerLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+    <item name='android.support.v4.widget.ViewDragHelper.Callback int clampViewPositionVertical(android.view.View, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.SlidingPaneLayout SlidingPaneLayout(android.content.Context, android.util.AttributeSet) 1'>
@@ -38,13 +41,7 @@
     <item name='android.support.v4.widget.SearchViewCompatIcs.MySearchView MySearchView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.SlidingPaneLayout android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.widget.ScrollerCompat android.support.v4.widget.ScrollerCompat create(android.content.Context, android.view.animation.Interpolator)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.widget.SlidingPaneLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+    <item name='android.support.v4.widget.CursorAdapter java.lang.CharSequence convertToString(android.database.Cursor)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.SlidingPaneLayout.LayoutParams LayoutParams(android.view.ViewGroup.MarginLayoutParams) 0'>
@@ -53,15 +50,36 @@
     <item name='android.support.v4.widget.ViewDragHelper android.support.v4.widget.ViewDragHelper create(android.view.ViewGroup, android.support.v4.widget.ViewDragHelper.Callback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.ViewDragHelper.Callback void onViewPositionChanged(android.view.View, int, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.widget.SlidingPaneLayout void draw(android.graphics.Canvas) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.DrawerLayout DrawerLayout(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.ResourceCursorAdapter ResourceCursorAdapter(android.content.Context, int, android.database.Cursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.DrawerLayout boolean onKeyUp(int, android.view.KeyEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.widget.ViewDragHelper.Callback int getViewHorizontalDragRange(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.DrawerLayout void openDrawer(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.ExploreByTouchHelper android.support.v4.view.accessibility.AccessibilityNodeProviderCompat getAccessibilityNodeProvider(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.widget.ScrollerCompat android.support.v4.widget.ScrollerCompat create(android.content.Context, android.view.animation.Interpolator)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.widget.CursorAdapter void bindView(android.view.View, android.content.Context, android.database.Cursor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.ViewDragHelper android.support.v4.widget.ViewDragHelper create(android.view.ViewGroup, float, android.support.v4.widget.ViewDragHelper.Callback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -71,21 +89,30 @@
     <item name='android.support.v4.widget.DrawerLayout void setDrawerLockMode(int, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.ViewDragHelper android.support.v4.widget.ViewDragHelper create(android.view.ViewGroup, float, android.support.v4.widget.ViewDragHelper.Callback)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.widget.SlidingPaneLayout boolean drawChild(android.graphics.Canvas, android.view.View, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.ViewDragHelper.Callback void onViewCaptured(android.view.View, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.SlidingPaneLayout.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.SimpleCursorAdapter void bindView(android.view.View, android.content.Context, android.database.Cursor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.SlidingPaneLayout.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.DrawerLayout.LayoutParams LayoutParams(android.view.ViewGroup.MarginLayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.ViewDragHelper.Callback int clampViewPositionHorizontal(android.view.View, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.widget.ViewDragHelper android.support.v4.widget.ViewDragHelper create(android.view.ViewGroup, float, android.support.v4.widget.ViewDragHelper.Callback)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.SlidingPaneLayout SlidingPaneLayout(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -95,13 +122,13 @@
     <item name='android.support.v4.widget.SearchViewCompat void setOnQueryTextListener(android.view.View, android.support.v4.widget.SearchViewCompat.OnQueryTextListenerCompat) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.DrawerLayout boolean isDrawerOpen(android.view.View) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.widget.DrawerLayout.SavedState void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.SlidingPaneLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.support.v4.widget.DrawerLayout boolean isDrawerOpen(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v4.widget.DrawerLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.SearchViewCompat void setOnCloseListener(android.view.View, android.support.v4.widget.SearchViewCompat.OnCloseListenerCompat) 1'>
@@ -110,6 +137,9 @@
     <item name='android.support.v4.widget.ViewDragHelper android.support.v4.widget.ViewDragHelper create(android.view.ViewGroup, android.support.v4.widget.ViewDragHelper.Callback) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.SlidingPaneLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.DrawerLayout boolean drawChild(android.graphics.Canvas, android.view.View, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -119,9 +149,15 @@
     <item name='android.support.v4.widget.DrawerLayout DrawerLayout(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.DrawerLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.DrawerLayout.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.ViewDragHelper.Callback void onViewReleased(android.view.View, float, float) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.SlidingPaneLayout boolean onInterceptTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -131,9 +167,6 @@
     <item name='android.support.v4.widget.DrawerLayout.SavedState SavedState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.DrawerLayout android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v4.widget.SlidingPaneLayout boolean drawChild(android.graphics.Canvas, android.view.View, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -149,18 +182,24 @@
     <item name='android.support.v4.widget.DrawerLayout.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.CursorAdapter java.lang.CharSequence convertToString(android.database.Cursor)'>
+    <item name='android.support.v4.widget.SlidingPaneLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.DrawerLayout boolean isDrawerVisible(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.ScrollerCompat android.support.v4.widget.ScrollerCompat create(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.SlidingPaneLayout void onRestoreInstanceState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.SlidingPaneLayout.LayoutParams LayoutParams(android.support.v4.widget.SlidingPaneLayout.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.ViewDragHelper android.support.v4.widget.ViewDragHelper create(android.view.ViewGroup, android.support.v4.widget.ViewDragHelper.Callback)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.DrawerLayout DrawerLayout(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -179,6 +218,9 @@
     <item name='android.support.v4.widget.SlidingPaneLayout SlidingPaneLayout(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.SimpleCursorAdapter void bindView(android.view.View, android.content.Context, android.database.Cursor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.ResourceCursorAdapter ResourceCursorAdapter(android.content.Context, int, android.database.Cursor, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -188,6 +230,9 @@
     <item name='android.support.v4.widget.ExploreByTouchHelper ExploreByTouchHelper(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.CursorAdapter void bindView(android.view.View, android.content.Context, android.database.Cursor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.ViewDragHelper void captureChildView(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -197,10 +242,7 @@
     <item name='android.support.v4.widget.DrawerLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v4.widget.SlidingPaneLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v4.widget.ViewDragHelper android.support.v4.widget.ViewDragHelper create(android.view.ViewGroup, android.support.v4.widget.ViewDragHelper.Callback)'>
+    <item name='android.support.v4.widget.SlidingPaneLayout boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v4.widget.SimpleCursorAdapter void setViewText(android.widget.TextView, java.lang.String) 0'>
@@ -209,9 +251,15 @@
     <item name='android.support.v4.widget.DrawerLayout.LayoutParams LayoutParams(android.support.v4.widget.DrawerLayout.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.DrawerLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.DrawerLayout DrawerLayout(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v4.widget.DrawerLayout android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v4.widget.SlidingPaneLayout void requestChildFocus(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/support/v8/renderscript/annotations.xml b/android-sdk-annotations/android/support/v8/renderscript/annotations.xml
index 378ef06b7e1..559fa02d5db 100644
--- a/android-sdk-annotations/android/support/v8/renderscript/annotations.xml
+++ b/android-sdk-annotations/android/support/v8/renderscript/annotations.xml
@@ -14,13 +14,16 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I8_3(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlur android.support.v8.renderscript.Script.FieldID getFieldID_Input()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element.DataKind android.support.v8.renderscript.Element.DataKind valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.RenderScript.Priority android.support.v8.renderscript.RenderScript.Priority valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.SamplerThunker.Builder android.support.v8.renderscript.Sampler create()'>
+    <item name='android.support.v8.renderscript.Script.LaunchOptions android.support.v8.renderscript.Script.LaunchOptions setY(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptC ScriptC(android.support.v8.renderscript.RenderScript, android.content.res.Resources, int) 1'>
@@ -41,9 +44,18 @@
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createCubemapFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setZ(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U8_4(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlur android.support.v8.renderscript.Script.KernelID getKernelID()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptGroup.Builder android.support.v8.renderscript.ScriptGroup create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createFromBitmapResource(android.support.v8.renderscript.RenderScript, android.content.res.Resources, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -65,13 +77,10 @@
     <item name='android.support.v8.renderscript.Allocation.MipmapControl android.support.v8.renderscript.Allocation.MipmapControl valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setY(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U16(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type create()'>
+    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element createVector(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element.DataType, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptC ScriptC(android.support.v8.renderscript.RenderScript, android.content.res.Resources, int) 0'>
@@ -83,18 +92,12 @@
     <item name='android.support.v8.renderscript.Allocation void copyFrom(android.support.v8.renderscript.BaseObj[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v8.renderscript.Matrix3f float[] getArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v8.renderscript.RenderScript android.support.v8.renderscript.RenderScript create(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.Allocation void copy1DRangeFromUnchecked(int, int, int[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setYuvFormat(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element F64_3(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -113,7 +116,7 @@
     <item name='android.support.v8.renderscript.Allocation void copy1DRangeFrom(int, int, int[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker create()'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.ScriptIntrinsicBlend create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachSrcOut(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
@@ -122,25 +125,19 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachDstOver(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createFromString(android.support.v8.renderscript.RenderScript, java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setFaces(boolean)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGB android.support.v8.renderscript.Script.FieldID getFieldID_Input()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.KernelID) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.FieldPacker byte[] getData()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachSubtract(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U32_4(android.support.v8.renderscript.RenderScript) 0'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDSrcOver()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.RenderScript android.support.v8.renderscript.RenderScript create(android.content.Context, int, android.support.v8.renderscript.RenderScript.ContextType)'>
+    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U32_4(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.FieldPacker void addF32(android.support.v8.renderscript.Float3) 0'>
@@ -149,16 +146,28 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGB android.support.v8.renderscript.ScriptIntrinsicYuvToRGB create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, int)'>
+    <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker create()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.FieldPacker void addMatrix(android.support.v8.renderscript.Matrix4f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Element boolean isCompatible(android.support.v8.renderscript.Element) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Matrix3f void load(android.support.v8.renderscript.Matrix3f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setZ(int)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve3x3 android.support.v8.renderscript.Script.FieldID getFieldID_Input()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.Type.CubemapFace android.support.v8.renderscript.Type.CubemapFace valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDAdd()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.Script.LaunchOptions android.support.v8.renderscript.Script.LaunchOptions setX(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element BOOLEAN(android.support.v8.renderscript.RenderScript) 0'>
@@ -173,10 +182,22 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachDstOver(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Sampler.Value android.support.v8.renderscript.Sampler.Value valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.Element.DataKind android.support.v8.renderscript.Element.DataKind valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addF64(android.support.v8.renderscript.Double3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Matrix2f float[] getArray()'>
+    <item name='android.support.v8.renderscript.FieldPacker byte[] getData()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.Matrix3f float[] getArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.Sampler.Value android.support.v8.renderscript.Sampler.Value valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation void setFromFieldPacker(int, android.support.v8.renderscript.FieldPacker) 1'>
@@ -185,9 +206,6 @@
     <item name='android.support.v8.renderscript.Allocation void copy1DRangeFromUnchecked(int, int, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Sampler.Value android.support.v8.renderscript.Sampler.Value valueOf(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker void forEach(android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -203,7 +221,7 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsic3DLUT android.support.v8.renderscript.ScriptIntrinsic3DLUT create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker android.support.v8.renderscript.Script.KernelID getKernelID()'>
+    <item name='android.support.v8.renderscript.RenderScript.ContextType android.support.v8.renderscript.RenderScript.ContextType valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachSrc(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
@@ -215,31 +233,58 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element createVector(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element.DataType, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDDstAtop()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I64_3(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsic3DLUT android.support.v8.renderscript.Script.KernelID getKernelID()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createCubemapFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap, android.support.v8.renderscript.Allocation.MipmapControl, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlur void setInput(android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Matrix4f void load(android.support.v8.renderscript.Matrix3f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlur void forEach(android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachSrcOver(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsic3DLUT android.support.v8.renderscript.ScriptIntrinsic3DLUT create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation void copy1DRangeFromUnchecked(int, int, short[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Sampler android.support.v8.renderscript.Sampler CLAMP_NEAREST(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.RenderScript.ContextType android.support.v8.renderscript.RenderScript.ContextType valueOf(java.lang.String)'>
+    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createSized(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDDst()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachDstIn(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicLUT android.support.v8.renderscript.ScriptIntrinsicLUT create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.FieldID)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 android.support.v8.renderscript.Script.FieldID getFieldID_Input()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.Element.Builder android.support.v8.renderscript.Element.Builder add(android.support.v8.renderscript.Element, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation void copy1DRangeFrom(int, int, float[]) 2'>
@@ -248,9 +293,6 @@
     <item name='android.support.v8.renderscript.Allocation void copy3DRangeFrom(int, int, int, int, int, int, android.support.v8.renderscript.Allocation, int, int, int) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setYuvFormat(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.Sampler android.support.v8.renderscript.Sampler MIRRORED_REPEAT_LINEAR(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -263,13 +305,19 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element F64_4(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDSrc()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.Element.Builder android.support.v8.renderscript.Element create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation void setFromFieldPacker(int, int, android.support.v8.renderscript.FieldPacker) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I64_2(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element.Builder android.support.v8.renderscript.Element.Builder add(android.support.v8.renderscript.Element, java.lang.String, int)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDMultiply()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker.Builder addKernel(android.support.v8.renderscript.Script.KernelID) 0'>
@@ -284,9 +332,6 @@
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createCubemapFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap, android.support.v8.renderscript.Allocation.MipmapControl, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Type.CubemapFace android.support.v8.renderscript.Type.CubemapFace valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createFromString(android.support.v8.renderscript.RenderScript, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -296,6 +341,9 @@
     <item name='android.support.v8.renderscript.Sampler android.support.v8.renderscript.Sampler MIRRORED_REPEAT_NEAREST(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Sampler.Builder android.support.v8.renderscript.Sampler create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U64_3(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -305,28 +353,31 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachDstOut(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicColorMatrix android.support.v8.renderscript.ScriptIntrinsicColorMatrix create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.ScriptGroup.Builder android.support.v8.renderscript.ScriptGroup.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.KernelID)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, android.support.v8.renderscript.Allocation.MipmapControl, int)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve3x3 android.support.v8.renderscript.Script.KernelID getKernelID()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.RenderScript android.support.v8.renderscript.RenderScript create(android.content.Context, android.support.v8.renderscript.RenderScript.ContextType)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachDstIn(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createCubemapFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap, android.support.v8.renderscript.Allocation.MipmapControl, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation void copyFrom(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.FieldPacker void addU16(android.support.v8.renderscript.Int3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setX(int)'>
+    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element MATRIX_4X4(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element MATRIX_4X4(android.support.v8.renderscript.RenderScript) 0'>
+    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachSubtract(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
@@ -353,13 +404,10 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I64(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createSized(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachClear(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.FieldID)'>
+    <item name='android.support.v8.renderscript.ScriptGroup void setInput(android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U64(android.support.v8.renderscript.RenderScript) 0'>
@@ -383,7 +431,7 @@
     <item name='android.support.v8.renderscript.FieldPacker void addU8(android.support.v8.renderscript.Short4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDClear()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.FieldPacker void addF64(android.support.v8.renderscript.Double4) 0'>
@@ -395,6 +443,9 @@
     <item name='android.support.v8.renderscript.Allocation void copy1DRangeFromUnchecked(int, int, float[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Script.LaunchOptions android.support.v8.renderscript.Script.LaunchOptions setZ(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation void copy2DRangeFrom(int, int, int, int, byte[]) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -404,16 +455,13 @@
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptGroup.Builder android.support.v8.renderscript.ScriptGroup.Builder addKernel(android.support.v8.renderscript.Script.KernelID)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.Allocation void copy2DRangeFrom(int, int, android.graphics.Bitmap) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap, android.support.v8.renderscript.Allocation.MipmapControl, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker android.support.v8.renderscript.Script.FieldID getFieldID_Input()'>
+    <item name='android.support.v8.renderscript.ScriptGroup void setOutput(android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.FieldID) 2'>
@@ -425,13 +473,22 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachClear(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setMipmaps(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptGroup.Builder android.support.v8.renderscript.ScriptGroup.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.FieldID)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGB void forEach(android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createSized(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createCubemapFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap)'>
+    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element createVector(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element.DataType, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element createVector(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element.DataType, int) 0'>
+    <item name='android.support.v8.renderscript.Element.DataType android.support.v8.renderscript.Element.DataType valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createCubemapFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap, android.support.v8.renderscript.Allocation.MipmapControl, int) 2'>
@@ -443,33 +500,48 @@
     <item name='android.support.v8.renderscript.FieldPacker void addU16(android.support.v8.renderscript.Int4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Script android.support.v8.renderscript.Script.KernelID createKernelID(int, int, android.support.v8.renderscript.Element, android.support.v8.renderscript.Element)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addU32(android.support.v8.renderscript.Long4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.FieldPacker void addU8(android.support.v8.renderscript.Short2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsic3DLUT android.support.v8.renderscript.ScriptIntrinsic3DLUT create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicLUT android.support.v8.renderscript.ScriptIntrinsicLUT create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U32_2(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGB android.support.v8.renderscript.Script.KernelID getKernelID()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation void copy2DRangeFrom(int, int, int, int, int[]) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDSubtract()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I64_4(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation void copy2DRangeFrom(int, int, int, int, float[]) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Matrix4f float[] getArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachDst(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve3x3 android.support.v8.renderscript.ScriptIntrinsicConvolve3x3 create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachMultiply(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -488,27 +560,36 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachSrc(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.ScriptIntrinsicBlend create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createFromString(android.support.v8.renderscript.RenderScript, java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptGroup.Builder android.support.v8.renderscript.ScriptGroup.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.FieldID) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Script android.support.v8.renderscript.Script.FieldID createFieldID(int, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element RGBA_4444(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element RGBA_4444(android.support.v8.renderscript.RenderScript) 0'>
+    <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.KernelID)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation void copyFromUnchecked(float[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 android.support.v8.renderscript.Script.KernelID getKernelID()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.ScriptIntrinsicBlend create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsic3DLUT void forEach(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Sampler android.support.v8.renderscript.Sampler WRAP_LINEAR_MIP_LINEAR(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDSrcAtop()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation void copy1DRangeFrom(int, int, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -521,36 +602,51 @@
     <item name='android.support.v8.renderscript.FieldPacker void addU64(android.support.v8.renderscript.Long4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.RenderScript android.support.v8.renderscript.RenderScript create(android.content.Context, android.support.v8.renderscript.RenderScript.ContextType)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve3x3 android.support.v8.renderscript.ScriptIntrinsicConvolve3x3 create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setX(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachMultiply(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachDst(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDSrcOut()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element RGB_565(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U16_2(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve3x3 void setInput(android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addMatrix(android.support.v8.renderscript.Matrix3f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicLUT ScriptIntrinsicLUT(int, android.support.v8.renderscript.RenderScript) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicColorMatrix void forEach(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addU64(android.support.v8.renderscript.Long2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.RenderScript android.support.v8.renderscript.RenderScript create(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDXor()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.RenderScript.Priority android.support.v8.renderscript.RenderScript.Priority valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.ScriptIntrinsicBlend create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -563,7 +659,10 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element MATRIX_3X3(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element.Builder android.support.v8.renderscript.Element create()'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker android.support.v8.renderscript.Script.KernelID getKernelID()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.Matrix2f float[] getArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I32_4(android.support.v8.renderscript.RenderScript) 0'>
@@ -572,7 +671,7 @@
     <item name='android.support.v8.renderscript.Allocation void copyFrom(android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.KernelID)'>
+    <item name='android.support.v8.renderscript.RenderScript android.support.v8.renderscript.RenderScript create(android.content.Context, int, android.support.v8.renderscript.RenderScript.ContextType)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptC ScriptC(int, android.support.v8.renderscript.RenderScript) 1'>
@@ -587,7 +686,7 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsicColorMatrix android.support.v8.renderscript.ScriptIntrinsicColorMatrix create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element.DataKind android.support.v8.renderscript.Element.DataKind valueOf(java.lang.String)'>
+    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createSized(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachSrcOver(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
@@ -596,28 +695,28 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachDstAtop(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptGroup.Builder android.support.v8.renderscript.ScriptGroup.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.KernelID)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v8.renderscript.Script.LaunchOptions android.support.v8.renderscript.Script.LaunchOptions setX(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addI32(android.support.v8.renderscript.Int3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.FieldPacker void addI8(android.support.v8.renderscript.Byte2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGB void setInput(android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addI8(android.support.v8.renderscript.Byte3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve3x3 void forEach(android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation void copy3DRangeFrom(int, int, int, int, int, int, float[]) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U8(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptGroup.Builder android.support.v8.renderscript.ScriptGroup.Builder addConnection(android.support.v8.renderscript.Type, android.support.v8.renderscript.Script.KernelID, android.support.v8.renderscript.Script.FieldID)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicColorMatrix void forEach(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.FieldPacker void addU32(android.support.v8.renderscript.Long2) 0'>
@@ -629,6 +728,12 @@
     <item name='android.support.v8.renderscript.Script void setVar(int, android.support.v8.renderscript.FieldPacker, android.support.v8.renderscript.Element, int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element getSubElement(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGB android.support.v8.renderscript.ScriptIntrinsicYuvToRGB create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -638,28 +743,22 @@
     <item name='android.support.v8.renderscript.FieldPacker void addI16(android.support.v8.renderscript.Short4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.RenderScript.Priority android.support.v8.renderscript.RenderScript.Priority valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Matrix4f float[] getArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v8.renderscript.ScriptGroup.Builder android.support.v8.renderscript.ScriptGroup create()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I16(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachDstAtop(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element.Builder android.support.v8.renderscript.Element.Builder add(android.support.v8.renderscript.Element, java.lang.String)'>
+    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I32_3(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I32_3(android.support.v8.renderscript.RenderScript) 0'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsic3DLUT void forEach(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptGroup.Builder android.support.v8.renderscript.ScriptGroup.Builder addKernel(android.support.v8.renderscript.Script.KernelID)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Script.FieldBase void init(android.support.v8.renderscript.RenderScript, int) 0'>
@@ -680,37 +779,46 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsic3DLUT void setLUT(android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setFaces(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicLUT android.support.v8.renderscript.Script.KernelID getKernelID()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element createPixel(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element.DataType, android.support.v8.renderscript.Element.DataKind) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createCubemapFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addU8(android.support.v8.renderscript.Short3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element createPixel(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element.DataType, android.support.v8.renderscript.Element.DataKind)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker void setInput(android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element.DataType android.support.v8.renderscript.Element.DataType valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.support.v8.renderscript.Sampler.Builder android.support.v8.renderscript.Sampler create()'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDSrcIn()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicLUT android.support.v8.renderscript.ScriptIntrinsicLUT create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createCubemapFromBitmap(android.support.v8.renderscript.RenderScript, android.graphics.Bitmap, android.support.v8.renderscript.Allocation.MipmapControl, int)'>
+    <item name='android.support.v8.renderscript.Script android.support.v8.renderscript.Script.KernelID createKernelID(int, int, android.support.v8.renderscript.Element, android.support.v8.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation void copyFromUnchecked(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element createVector(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element.DataType, int)'>
+    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element ELEMENT(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element ELEMENT(android.support.v8.renderscript.RenderScript) 0'>
+    <item name='android.support.v8.renderscript.Element.Builder android.support.v8.renderscript.Element.Builder add(android.support.v8.renderscript.Element, java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation void copyTo(android.graphics.Bitmap) 0'>
@@ -722,6 +830,12 @@
     <item name='android.support.v8.renderscript.Sampler android.support.v8.renderscript.Sampler CLAMP_LINEAR(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlur android.support.v8.renderscript.ScriptIntrinsicBlur create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicLUT void forEach(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addI64(android.support.v8.renderscript.Long4) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -740,7 +854,7 @@
     <item name='android.support.v8.renderscript.FieldPacker void addI16(android.support.v8.renderscript.Short3) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element createPixel(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element.DataType, android.support.v8.renderscript.Element.DataKind)'>
+    <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker.Builder addKernel(android.support.v8.renderscript.Script.KernelID)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation void copyFrom(short[]) 0'>
@@ -749,9 +863,6 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U64_2(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setMipmaps(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicColorMatrix android.support.v8.renderscript.ScriptIntrinsicColorMatrix create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -773,24 +884,27 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element F64(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Allocation.MipmapControl android.support.v8.renderscript.Allocation.MipmapControl valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I16_2(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.RenderScript android.support.v8.renderscript.RenderScript create(android.content.Context, int)'>
+    <item name='android.support.v8.renderscript.RenderScript android.support.v8.renderscript.RenderScript create(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element F32(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicLUT void forEach(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element F32_2(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlur android.support.v8.renderscript.ScriptIntrinsicBlur create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createSized(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I8(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -800,7 +914,7 @@
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, android.support.v8.renderscript.Allocation.MipmapControl, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGB android.support.v8.renderscript.ScriptIntrinsicYuvToRGB create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicColorMatrix android.support.v8.renderscript.ScriptIntrinsicColorMatrix create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element A_8(android.support.v8.renderscript.RenderScript) 0'>
@@ -815,13 +929,19 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsic3DLUT ScriptIntrinsic3DLUT(int, android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type.Builder setY(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 void setInput(android.support.v8.renderscript.Allocation) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addI16(android.support.v8.renderscript.Short2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U16_3(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Script.LaunchOptions android.support.v8.renderscript.Script.LaunchOptions setZ(int, int)'>
+    <item name='android.support.v8.renderscript.RenderScript android.support.v8.renderscript.RenderScript create(android.content.Context, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Sampler android.support.v8.renderscript.Sampler WRAP_NEAREST(android.support.v8.renderscript.RenderScript) 0'>
@@ -830,7 +950,7 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element ALLOCATION(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptIntrinsicBlur android.support.v8.renderscript.ScriptIntrinsicBlur create(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Element)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicConvolve5x5 void forEach(android.support.v8.renderscript.Allocation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I16_4(android.support.v8.renderscript.RenderScript) 0'>
@@ -851,12 +971,21 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element U8_2(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.SamplerThunker.Builder android.support.v8.renderscript.Sampler create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Matrix2f void load(android.support.v8.renderscript.Matrix2f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation void copyFromUnchecked(short[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Type.Builder android.support.v8.renderscript.Type create()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, android.support.v8.renderscript.Allocation.MipmapControl, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -869,15 +998,30 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element MATRIX_2X2(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.ScriptGroupThunker.Builder android.support.v8.renderscript.ScriptGroupThunker.Builder addKernel(android.support.v8.renderscript.Script.KernelID)'>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDDstOver()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDDstIn()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicBlend android.support.v8.renderscript.Script.KernelID getKernelIDDstOut()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.support.v8.renderscript.Script android.support.v8.renderscript.Script.FieldID createFieldID(int, android.support.v8.renderscript.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.support.v8.renderscript.Allocation void copy2DRangeFrom(int, int, int, int, short[]) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicYuvToRGBThunker android.support.v8.renderscript.Script.FieldID getFieldID_Input()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.ScriptIntrinsicBlend void forEachXor(android.support.v8.renderscript.Allocation, android.support.v8.renderscript.Allocation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.Allocation android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, android.support.v8.renderscript.Allocation.MipmapControl, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.FieldPacker void addF64(android.support.v8.renderscript.Double2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -893,18 +1037,15 @@
     <item name='android.support.v8.renderscript.ScriptIntrinsicColorMatrix void setColorMatrix(android.support.v8.renderscript.Matrix3f) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.support.v8.renderscript.ScriptIntrinsicColorMatrix android.support.v8.renderscript.Script.KernelID getKernelID()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element F64_2(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Script.LaunchOptions android.support.v8.renderscript.Script.LaunchOptions setY(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element F32_4(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Allocation.MipmapControl android.support.v8.renderscript.Allocation.MipmapControl valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.support.v8.renderscript.Allocation void copy1DRangeFrom(int, int, short[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -920,7 +1061,4 @@
     <item name='android.support.v8.renderscript.Element android.support.v8.renderscript.Element I32(android.support.v8.renderscript.RenderScript) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.support.v8.renderscript.Sampler.Value android.support.v8.renderscript.Sampler.Value valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/telephony/annotations.xml b/android-sdk-annotations/android/telephony/annotations.xml
index a043393a174..cf4c3970ec8 100644
--- a/android-sdk-annotations/android/telephony/annotations.xml
+++ b/android-sdk-annotations/android/telephony/annotations.xml
@@ -2,18 +2,18 @@
     <item name='android.telephony.SmsCbMessage void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellSignalStrengthGsm android.telephony.CellSignalStrengthGsm copy()'>
+    <item name='android.telephony.TelephonyManager java.lang.String getNetworkTypeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String replaceUnicodeDigits(java.lang.String)'>
+    <item name='android.telephony.CellInfoLte java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.SignalStrength android.telephony.SignalStrength makeSignalStrengthFromRilParcel(android.os.Parcel)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellSignalStrengthCdma CellSignalStrengthCdma(android.telephony.CellSignalStrengthCdma) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsMessage int[] calculateLength(java.lang.CharSequence, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.PhoneNumberUtils void formatJapaneseNumber(android.text.Editable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,22 +26,22 @@
     <item name='android.telephony.CellSignalStrengthLte CellSignalStrengthLte(android.telephony.CellSignalStrengthLte) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.NeighboringCellInfo java.lang.String toString()'>
+    <item name='android.telephony.CellInfoWcdma android.telephony.CellInfoWcdma createFromParcelBody(android.os.Parcel)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellInfoGsm void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.SmsMessage.SubmitPdu java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.SmsCbEtwsInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsMessage.MessageClass android.telephony.SmsMessage.MessageClass valueOf(java.lang.String)'>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String calledPartyBCDToString(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsCbCmasInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.SmsMessage android.telephony.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, java.lang.String, boolean)'>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String replaceUnicodeDigits(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellSignalStrengthWcdma CellSignalStrengthWcdma(android.telephony.CellSignalStrengthWcdma) 0'>
@@ -56,96 +56,75 @@
     <item name='android.telephony.SmsCbCmasInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.PhoneNumberUtils java.lang.String getUsernameFromUriNumber(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellBroadcastMessage android.telephony.CellBroadcastMessage createFromCursor(android.database.Cursor)'>
+    <item name='android.telephony.SignalStrength android.telephony.SignalStrength newFromBundle(android.os.Bundle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellInfoWcdma android.telephony.CellInfoWcdma createFromParcelBody(android.os.Parcel)'>
+    <item name='android.telephony.ServiceState android.telephony.ServiceState newFromBundle(android.os.Bundle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellInfoLte void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.PhoneNumberUtils byte[] numberToCalledPartyBCD(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellBroadcastMessage java.lang.String getDateString(android.content.Context)'>
+    <item name='android.telephony.SmsManager android.telephony.SmsManager getDefault()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.ServiceState android.telephony.ServiceState newFromBundle(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellBroadcastMessage android.content.ContentValues getContentValues()'>
+    <item name='android.telephony.SmsCbCmasInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellInfo void writeToParcel(android.os.Parcel, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsManager java.util.ArrayList&lt;android.telephony.SmsMessage&gt; getAllMessagesFromIcc()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.SignalStrength android.telephony.SignalStrength makeSignalStrengthFromRilParcel(android.os.Parcel)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.SignalStrength android.telephony.SignalStrength makeSignalStrengthFromRilParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellSignalStrengthLte android.telephony.CellSignalStrength copy()'>
+    <item name='android.telephony.CellInfoGsm java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.SmsCbLocation void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.SmsMessage android.telephony.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellSignalStrengthCdma android.telephony.CellSignalStrength copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.CellInfoWcdma CellInfoWcdma(android.telephony.CellInfoWcdma) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellInfoCdma CellInfoCdma(android.telephony.CellInfoCdma) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.SmsManager java.util.ArrayList&lt;android.telephony.SmsMessage&gt; getAllMessagesFromIcc()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.CellSignalStrengthCdma void copyFrom(android.telephony.CellSignalStrengthCdma) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellBroadcastMessage java.lang.String getSpokenDateString(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellSignalStrengthGsm android.telephony.CellSignalStrength copy()'>
+    <item name='android.telephony.ServiceState java.lang.String rilRadioTechnologyToString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.SignalStrength SignalStrength(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsCbEtwsInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellSignalStrengthCdma android.telephony.CellSignalStrength copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.PhoneNumberUtils int getFormatTypeForLocale(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.ServiceState java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellInfoLte java.lang.String toString()'>
+    <item name='android.telephony.CellIdentityGsm java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellInfoWcdma android.telephony.CellInfoWcdma createFromParcelBody(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsMessage.SubmitPdu java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -155,22 +134,13 @@
     <item name='android.telephony.CellBroadcastMessage void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellInfoGsm java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellIdentityLte java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.CellInfoLte android.telephony.CellInfoLte createFromParcelBody(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsMessage android.telephony.SmsMessage newFromCMT(java.lang.String[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.CellIdentityWcdma void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellSignalStrengthGsm java.lang.String toString()'>
+    <item name='android.telephony.CellSignalStrengthWcdma android.telephony.CellSignalStrengthWcdma copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.PhoneNumberUtils java.lang.String getNumberFromIntent(android.content.Intent, android.content.Context) 0'>
@@ -179,18 +149,27 @@
     <item name='android.telephony.TelephonyManager TelephonyManager(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.SmsMessage android.telephony.SmsMessage newFromCMT(java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.CellInfoWcdma void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellInfoLte android.telephony.CellInfoLte createFromParcelBody(android.os.Parcel)'>
+    <item name='android.telephony.CellBroadcastMessage java.lang.String getDateString(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.PhoneNumberUtils void formatNumber(android.text.Editable, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.SmsManager java.util.ArrayList&lt;java.lang.String&gt; divideMessage(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.SmsMessage.SubmitPdu SubmitPdu(com.android.internal.telephony.SmsMessageBase.SubmitPduBase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.CellInfoCdma android.telephony.CellInfoCdma createFromParcelBody(android.os.Parcel)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.ServiceState ServiceState(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -203,6 +182,9 @@
     <item name='android.telephony.SmsMessage android.telephony.SmsMessage newFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.SmsMessage int[] calculateLength(java.lang.CharSequence, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.SmsMessage.MessageClass android.telephony.SmsMessage.MessageClass valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -212,22 +194,25 @@
     <item name='android.telephony.CellInfoCdma android.telephony.CellInfoCdma createFromParcelBody(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsMessage android.telephony.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, short, byte[], boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellInfoGsm android.telephony.CellInfoGsm createFromParcelBody(android.os.Parcel) 0'>
+    <item name='android.telephony.CellBroadcastMessage android.content.ContentValues getContentValues()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.ServiceState void copyFrom(android.telephony.ServiceState) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsMessage android.telephony.SmsMessage.MessageClass getMessageClass()'>
+    <item name='android.telephony.CellInfoGsm android.telephony.CellInfoGsm createFromParcelBody(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellSignalStrengthWcdma java.lang.String toString()'>
+    <item name='android.telephony.CellBroadcastMessage java.lang.String getSpokenDateString(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.ServiceState android.telephony.ServiceState newFromBundle(android.os.Bundle)'>
+    <item name='android.telephony.CellIdentityLte java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellSignalStrengthGsm android.telephony.CellSignalStrength copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellSignalStrengthLte android.telephony.CellSignalStrengthLte copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellSignalStrengthLte void writeToParcel(android.os.Parcel, int) 0'>
@@ -242,13 +227,13 @@
     <item name='android.telephony.SmsMessage int[] calculateLength(java.lang.CharSequence, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.ServiceState java.lang.String rilRadioTechnologyToString(int)'>
+    <item name='android.telephony.SmsMessage.MessageClass android.telephony.SmsMessage.MessageClass valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellIdentityGsm void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellIdentityGsm java.lang.String toString()'>
+    <item name='android.telephony.NeighboringCellInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellSignalStrengthGsm void copyFrom(android.telephony.CellSignalStrengthGsm) 0'>
@@ -260,13 +245,19 @@
     <item name='android.telephony.CellSignalStrengthLte void initialize(android.telephony.SignalStrength, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.CellSignalStrengthLte java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.SmsCbEtwsInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.SignalStrength SignalStrength(android.telephony.SignalStrength) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellSignalStrengthWcdma android.telephony.CellSignalStrengthWcdma copy()'>
+    <item name='android.telephony.SignalStrength void fillInNotifierBundle(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SignalStrength void fillInNotifierBundle(android.os.Bundle) 0'>
+    <item name='android.telephony.SmsMessage android.telephony.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, short, byte[], boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellInfoLte CellInfoLte(android.telephony.CellInfoLte) 0'>
@@ -275,33 +266,39 @@
     <item name='android.telephony.NeighboringCellInfo NeighboringCellInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SignalStrength android.telephony.SignalStrength newFromBundle(android.os.Bundle) 0'>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellSignalStrengthCdma java.lang.String toString()'>
+    <item name='android.telephony.SignalStrength android.telephony.SignalStrength newFromBundle(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.SmsMessage int[] calculateLength(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellSignalStrengthWcdma android.telephony.CellSignalStrength copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellIdentityWcdma java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.CellInfo CellInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.CellInfoLte android.telephony.CellInfoLte createFromParcelBody(android.os.Parcel)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellSignalStrengthLte android.telephony.CellSignalStrength copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.SmsManager void sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList&lt;java.lang.String&gt;, java.util.ArrayList&lt;android.app.PendingIntent&gt;, java.util.ArrayList&lt;android.app.PendingIntent&gt;) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.SmsMessage android.telephony.SmsMessage.MessageClass getMessageClass()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.CellInfoCdma void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.PhoneNumberFormattingTextWatcher PhoneNumberFormattingTextWatcher(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.CellIdentityCdma java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.CellInfo CellInfo(android.telephony.CellInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -311,73 +308,76 @@
     <item name='android.telephony.CellIdentityCdma void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.CellSignalStrength android.telephony.CellSignalStrength copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.CellIdentityLte void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsMessage android.telephony.SmsMessage newFromParcel(android.os.Parcel)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellSignalStrengthCdma void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellSignalStrengthCdma android.telephony.CellSignalStrengthCdma copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.SmsMessage java.util.ArrayList&lt;java.lang.String&gt; fragmentText(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellSignalStrengthLte android.telephony.CellSignalStrengthLte copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.ServiceState ServiceState(android.telephony.ServiceState) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellInfoCdma java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.SignalStrength java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellInfoGsm android.telephony.CellInfoGsm createFromParcelBody(android.os.Parcel)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellSignalStrengthGsm void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.CellSignalStrengthLte java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.PhoneNumberUtils boolean compare(android.content.Context, java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.SmsMessage int[] calculateLength(java.lang.String, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String replaceUnicodeDigits(java.lang.String) 0'>
+    <item name='android.telephony.CellSignalStrengthCdma void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsCbMessage java.lang.String toString()'>
+    <item name='android.telephony.CellSignalStrengthWcdma android.telephony.CellSignalStrength copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String, int) 0'>
+    <item name='android.telephony.SmsCbLocation java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.TelephonyManager java.lang.String getNetworkTypeName(int)'>
+    <item name='android.telephony.CellSignalStrengthCdma android.telephony.CellSignalStrengthCdma copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellSignalStrengthLte void copyFrom(android.telephony.CellSignalStrengthLte) 0'>
+    <item name='android.telephony.CellLocation void fillInNotifierBundle(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsManager java.util.ArrayList&lt;java.lang.String&gt; divideMessage(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String normalizeNumber(java.lang.String) 0'>
+    <item name='android.telephony.ServiceState ServiceState(android.telephony.ServiceState) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellInfoWcdma java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellInfoCdma android.telephony.CellInfoCdma createFromParcelBody(android.os.Parcel)'>
+    <item name='android.telephony.CellSignalStrengthCdma java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellBroadcastMessage android.telephony.CellBroadcastMessage createFromCursor(android.database.Cursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellInfoCdma java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellSignalStrengthGsm void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.PhoneNumberUtils boolean compare(android.content.Context, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String replaceUnicodeDigits(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellSignalStrengthLte void copyFrom(android.telephony.CellSignalStrengthLte) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellInfoGsm android.telephony.CellInfoGsm createFromParcelBody(android.os.Parcel)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellSignalStrengthWcdma java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String normalizeNumber(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.ServiceState java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.PhoneNumberUtils boolean isPotentialLocalEmergencyNumber(java.lang.String, android.content.Context) 1'>
@@ -389,10 +389,7 @@
     <item name='android.telephony.SmsCbLocation SmsCbLocation(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SignalStrength android.telephony.SignalStrength newFromBundle(android.os.Bundle)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.TelephonyManager java.lang.String getNetworkTypeName()'>
+    <item name='android.telephony.SignalStrength java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.NeighboringCellInfo void writeToParcel(android.os.Parcel, int) 0'>
@@ -401,16 +398,10 @@
     <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String calledPartyBCDToString(byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.SmsManager void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellIdentityCdma java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String getUsernameFromUriNumber(java.lang.String)'>
+    <item name='android.telephony.CellSignalStrengthGsm java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellSignalStrengthWcdma void copyFrom(android.telephony.CellSignalStrengthWcdma) 0'>
@@ -419,19 +410,31 @@
     <item name='android.telephony.PhoneNumberUtils void formatNanpNumber(android.text.Editable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.CellSignalStrengthGsm CellSignalStrengthGsm(android.telephony.CellSignalStrengthGsm) 0'>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsManager android.telephony.SmsManager getDefault()'>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String calledPartyBCDFragmentToString(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellSignalStrengthGsm CellSignalStrengthGsm(android.telephony.CellSignalStrengthGsm) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.PhoneNumberUtils boolean isLocalEmergencyNumber(java.lang.String, android.content.Context) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.SmsCbMessage java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.CellIdentityWcdma java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.TelephonyManager java.lang.String getNetworkTypeName(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.SmsCbMessage SmsCbMessage(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String formatNumber(java.lang.String, int)'>
+    <item name='android.telephony.CellSignalStrengthGsm android.telephony.CellSignalStrengthGsm copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.CellInfoGsm CellInfoGsm(android.telephony.CellInfoGsm) 0'>
@@ -440,10 +443,13 @@
     <item name='android.telephony.SignalStrength void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.PhoneNumberUtils java.lang.String calledPartyBCDFragmentToString(byte[], int, int)'>
+    <item name='android.telephony.SmsMessage java.util.ArrayList&lt;java.lang.String&gt; fragmentText(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.SmsCbLocation java.lang.String toString()'>
+    <item name='android.telephony.SmsMessage android.telephony.SmsMessage newFromParcel(android.os.Parcel)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.PhoneNumberUtils java.lang.String getUsernameFromUriNumber(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/telephony/cdma/annotations.xml b/android-sdk-annotations/android/telephony/cdma/annotations.xml
index b82a5b69840..0a80cc039f9 100644
--- a/android-sdk-annotations/android/telephony/cdma/annotations.xml
+++ b/android-sdk-annotations/android/telephony/cdma/annotations.xml
@@ -1,13 +1,13 @@
 <root>
-    <item name='android.telephony.cdma.CdmaSmsCbProgramResults java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.telephony.cdma.CdmaCellLocation void fillInNotifierBundle(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.cdma.CdmaSmsCbProgramData java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.cdma.CdmaSmsCbProgramResults java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.cdma.CdmaCellLocation java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/telephony/gsm/annotations.xml b/android-sdk-annotations/android/telephony/gsm/annotations.xml
index 9c054409c75..1ec4fd7f4f9 100644
--- a/android-sdk-annotations/android/telephony/gsm/annotations.xml
+++ b/android-sdk-annotations/android/telephony/gsm/annotations.xml
@@ -1,8 +1,8 @@
 <root>
-    <item name='android.telephony.gsm.SmsMessage.SubmitPdu SubmitPdu(com.android.internal.telephony.SmsMessageBase.SubmitPduBase) 0'>
+    <item name='android.telephony.gsm.SmsMessage int[] calculateLength(java.lang.CharSequence, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.gsm.GsmCellLocation java.lang.String toString()'>
+    <item name='android.telephony.gsm.SmsMessage.SubmitPdu SubmitPdu(com.android.internal.telephony.SmsMessageBase.SubmitPduBase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.gsm.SmsMessage int[] calculateLength(java.lang.String, boolean) 0'>
@@ -11,19 +11,7 @@
     <item name='android.telephony.gsm.SmsMessage int[] calculateLength(java.lang.CharSequence, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.gsm.SmsMessage android.telephony.gsm.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, short, byte[], boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.gsm.SmsMessage android.telephony.gsm.SmsMessage createFromPdu(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.gsm.SmsMessage android.telephony.gsm.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, java.lang.String, boolean, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.gsm.SmsMessage android.telephony.gsm.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, java.lang.String, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.telephony.gsm.SmsMessage int[] calculateLength(java.lang.String, boolean)'>
+    <item name='android.telephony.gsm.SmsMessage.MessageClass android.telephony.gsm.SmsMessage.MessageClass valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.gsm.GsmCellLocation GsmCellLocation(android.os.Bundle) 0'>
@@ -35,13 +23,22 @@
     <item name='android.telephony.gsm.SmsManager java.util.ArrayList&lt;android.telephony.SmsMessage&gt; getAllMessagesFromSim()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.gsm.SmsMessage android.telephony.gsm.SmsMessage createFromPdu(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.gsm.SmsManager java.util.ArrayList&lt;java.lang.String&gt; divideMessage(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.gsm.SmsMessage.MessageClass android.telephony.gsm.SmsMessage.MessageClass valueOf(java.lang.String)'>
+    <item name='android.telephony.gsm.SmsMessage android.telephony.gsm.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, java.lang.String, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.gsm.SmsMessage int[] calculateLength(java.lang.CharSequence, boolean)'>
+    <item name='android.telephony.gsm.SmsMessage android.telephony.gsm.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, short, byte[], boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.gsm.SmsMessage int[] calculateLength(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.telephony.gsm.SmsMessage android.telephony.gsm.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, java.lang.String, boolean, byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.telephony.gsm.SmsManager void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent) 3'>
@@ -50,13 +47,16 @@
     <item name='android.telephony.gsm.SmsManager void sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList&lt;java.lang.String&gt;, java.util.ArrayList&lt;android.app.PendingIntent&gt;, java.util.ArrayList&lt;android.app.PendingIntent&gt;) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.gsm.SmsMessage.SubmitPdu java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.gsm.GsmCellLocation void fillInNotifierBundle(android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.telephony.gsm.GsmCellLocation java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.telephony.gsm.SmsMessage.MessageClass android.telephony.gsm.SmsMessage.MessageClass valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.telephony.gsm.SmsMessage.SubmitPdu java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/test/annotations.xml b/android-sdk-annotations/android/test/annotations.xml
index 7757235c561..494369c652d 100644
--- a/android-sdk-annotations/android/test/annotations.xml
+++ b/android-sdk-annotations/android/test/annotations.xml
@@ -1,7 +1,4 @@
 <root>
-    <item name='android.test.TestCaseUtil java.util.List&lt;java.lang.String&gt; getTestCaseNames(junit.framework.Test, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.MoreAsserts void assertEquals(double[], double[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,22 +20,19 @@
     <item name='android.test.ViewAsserts void assertTopAligned(android.view.View, android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.ProviderTestCase android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.Class&lt;T&gt;, java.lang.String, java.lang.String, int, java.lang.String)'>
+    <item name='android.test.RenamingDelegatingContext android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.TouchUtils void scrollToTop(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.MoreAsserts void assertEquals(java.lang.String, double[], double[]) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.ViewAsserts void assertBottomAligned(android.view.View, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.ViewAsserts void assertRightAligned(android.view.View, android.view.View, int) 1'>
+    <item name='android.test.MoreAsserts void assertEquals(java.lang.String, double[], double[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.InstrumentationTestCase T launchActivity(java.lang.String, java.lang.Class&lt;T&gt;, android.os.Bundle)'>
+    <item name='android.test.ViewAsserts void assertRightAligned(android.view.View, android.view.View, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.ViewAsserts void assertGroupContains(android.view.ViewGroup, android.view.View) 0'>
@@ -53,7 +47,7 @@
     <item name='android.test.MoreAsserts void assertContentsInAnyOrder(java.lang.String, java.lang.Iterable&lt;?&gt;, java.lang.Object...) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String)'>
+    <item name='android.test.TestPrinter void addError(junit.framework.Test, java.lang.Throwable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.ViewAsserts void assertRightAligned(android.view.View, android.view.View) 1'>
@@ -65,10 +59,10 @@
     <item name='android.test.MoreAsserts void assertContentsInOrder(java.lang.String, java.lang.Iterable&lt;?&gt;, java.lang.Object...) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TouchUtils void scrollToTop(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup) 1'>
+    <item name='android.test.ViewAsserts void assertBottomAligned(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.ViewAsserts void assertBottomAligned(android.view.View, android.view.View) 1'>
+    <item name='android.test.TouchUtils void scrollToTop(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.TouchUtils void scrollToTop(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup) 1'>
@@ -77,6 +71,9 @@
     <item name='android.test.InstrumentationTestCase T launchActivity(java.lang.String, java.lang.Class&lt;T&gt;, android.os.Bundle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.TestCaseUtil java.util.List&lt;java.lang.String&gt; getTestCaseNames(junit.framework.Test, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TouchUtils void dragQuarterScreenUp(android.test.InstrumentationTestCase, android.app.Activity) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -86,6 +83,9 @@
     <item name='android.test.ViewAsserts void assertBaselineAligned(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.ProviderTestCase2 android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.String, java.lang.Class&lt;T&gt;, java.lang.String, java.lang.String, int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.ViewAsserts void assertRightAligned(android.view.View, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -95,16 +95,19 @@
     <item name='android.test.ViewAsserts void assertTopAligned(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.MoreAsserts void assertContentsInAnyOrder(java.lang.String, java.lang.Iterable&lt;?&gt;, java.lang.Object...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.MoreAsserts void assertEquals(java.lang.String, java.util.Set&lt;? extends java.lang.Object&gt;, java.util.Set&lt;? extends java.lang.Object&gt;) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TouchUtils int dragViewToX(android.test.ActivityInstrumentationTestCase, android.view.View, int, int) 0'>
+    <item name='android.test.RenamingDelegatingContext T providerWithRenamedContext(java.lang.Class&lt;T&gt;, android.content.Context, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TestRunner java.lang.String[] getTestChildren(java.lang.Class)'>
+    <item name='android.test.TouchUtils int dragViewToX(android.test.ActivityInstrumentationTestCase, android.view.View, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.TouchUtils void dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int) 2'>
@@ -113,6 +116,9 @@
     <item name='android.test.InstrumentationTestCase T launchActivity(java.lang.String, java.lang.Class&lt;T&gt;, android.os.Bundle) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.RenamingDelegatingContext T providerWithRenamedContext(java.lang.Class&lt;T&gt;, android.content.Context, java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.MoreAsserts void assertEquals(java.lang.String, byte[], byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -122,13 +128,19 @@
     <item name='android.test.TouchUtils int dragViewBy(android.test.InstrumentationTestCase, android.view.View, int, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.ClassPathPackageInfo java.util.Set&lt;android.test.ClassPathPackageInfo&gt; getSubpackages()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.ViewAsserts void assertOffScreenBelow(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.AndroidTestRunner junit.framework.TestResult createTestResult()'>
+    <item name='android.test.InstrumentationTestSuite InstrumentationTestSuite(java.lang.Class, android.app.Instrumentation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.InstrumentationTestSuite InstrumentationTestSuite(java.lang.Class, android.app.Instrumentation) 0'>
+    <item name='android.test.IsolatedContext void unregisterReceiver(android.content.BroadcastReceiver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.TestCaseUtil junit.framework.TestSuite createTestSuite(java.lang.Class&lt;? extends junit.framework.Test&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.TouchUtils void dragViewToBottom(android.test.ActivityInstrumentationTestCase, android.view.View, int) 0'>
@@ -155,9 +167,6 @@
     <item name='android.test.TouchUtils void dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.InstrumentationTestCase T launchActivityWithIntent(java.lang.String, java.lang.Class&lt;T&gt;, android.content.Intent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.TouchUtils int dragViewBy(android.test.InstrumentationTestCase, android.view.View, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -167,6 +176,9 @@
     <item name='android.test.TouchUtils void dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.AndroidTestRunner junit.framework.TestResult createTestResult()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.InstrumentationTestCase T launchActivityWithIntent(java.lang.String, java.lang.Class&lt;T&gt;, android.content.Intent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -179,6 +191,9 @@
     <item name='android.test.MoreAsserts void assertEmpty(java.lang.String, java.util.Map&lt;?,?&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.RenamingDelegatingContext android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TestRunner.JunitTestSuite void run(junit.framework.TestResult) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -188,7 +203,7 @@
     <item name='android.test.IsolatedContext boolean bindService(android.content.Intent, android.content.ServiceConnection, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TestRunner java.lang.reflect.Method[] getAllTestMethods(java.lang.Class)'>
+    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.MoreAsserts void assertNotMatchesRegex(java.lang.String, java.lang.String, java.lang.String) 2'>
@@ -203,30 +218,27 @@
     <item name='android.test.MoreAsserts java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.ProviderTestCase android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.Class&lt;T&gt;, java.lang.String, java.lang.String, int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TestRunner java.lang.String getTitle(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.RenamingDelegatingContext java.io.FileOutputStream openFileOutput(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TouchUtils int dragViewToY(android.test.InstrumentationTestCase, android.view.View, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.AndroidTestRunner void setTest(junit.framework.Test) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.RenamingDelegatingContext T providerWithRenamedContext(java.lang.Class&lt;T&gt;, android.content.Context, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.TouchUtils void clickView(android.test.InstrumentationTestCase, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TestRunner java.lang.String getTitle(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.TestRunner boolean isJunitTest(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.ClassPathPackageInfo java.util.Set&lt;android.test.ClassPathPackageInfo&gt; getSubpackages()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.TouchUtils int dragViewTo(android.test.InstrumentationTestCase, android.view.View, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -236,7 +248,7 @@
     <item name='android.test.ProviderTestCase2 android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.String, java.lang.Class&lt;T&gt;, java.lang.String, java.lang.String, int, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TestCaseUtil junit.framework.TestSuite createTestSuite(java.lang.Class&lt;? extends junit.framework.Test&gt;)'>
+    <item name='android.test.TestCaseUtil java.util.List&lt;? extends junit.framework.Test&gt; getTests(junit.framework.Test, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.MoreAsserts void assertNotMatchesRegex(java.lang.String, java.lang.String, java.lang.String) 1'>
@@ -254,19 +266,19 @@
     <item name='android.test.TouchUtils void dragQuarterScreenUp(android.test.InstrumentationTestCase, android.app.Activity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.InstrumentationTestCase T launchActivityWithIntent(java.lang.String, java.lang.Class&lt;T&gt;, android.content.Intent) 0'>
+    <item name='android.test.ViewAsserts void assertBottomAligned(android.view.View, android.view.View, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.ViewAsserts void assertBottomAligned(android.view.View, android.view.View, int) 1'>
+    <item name='android.test.InstrumentationTestCase T launchActivityWithIntent(java.lang.String, java.lang.Class&lt;T&gt;, android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.TouchUtils int dragViewToY(android.test.InstrumentationTestCase, android.view.View, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.RenamingDelegatingContext T providerWithRenamedContext(java.lang.Class&lt;T&gt;, android.content.Context, java.lang.String, boolean)'>
+    <item name='android.test.TouchUtils void longClickView(android.test.ActivityInstrumentationTestCase, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TouchUtils void longClickView(android.test.ActivityInstrumentationTestCase, android.view.View) 0'>
+    <item name='android.test.TestPrinter void addFailure(junit.framework.Test, junit.framework.AssertionFailedError) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.MoreAsserts void assertEmpty(java.util.Map&lt;?,?&gt;) 0'>
@@ -293,16 +305,22 @@
     <item name='android.test.ViewAsserts void assertHasScreenCoordinates(android.view.View, android.view.View, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.TestRunner java.lang.String[] getTestChildren(java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TouchUtils void touchAndCancelView(android.test.InstrumentationTestCase, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.ViewAsserts void assertBottomAligned(android.view.View, android.view.View, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.InstrumentationTestCase void sendKeys(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.InstrumentationTestCase T launchActivityWithIntent(java.lang.String, java.lang.Class&lt;T&gt;, android.content.Intent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.ViewAsserts void assertBottomAligned(android.view.View, android.view.View, int) 0'>
+    <item name='android.test.InstrumentationCoreTestRunner android.test.AndroidTestRunner getAndroidTestRunner()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.TouchUtils int dragViewBy(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int) 0'>
@@ -314,10 +332,10 @@
     <item name='android.test.TouchUtils void touchAndCancelView(android.test.InstrumentationTestCase, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TouchUtils void dragViewToTop(android.test.InstrumentationTestCase, android.view.View, int) 0'>
+    <item name='android.test.AndroidTestRunner java.lang.Class loadSuiteClass(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TestCaseUtil java.util.List&lt;? extends junit.framework.Test&gt; getTests(junit.framework.Test, boolean)'>
+    <item name='android.test.TouchUtils void dragViewToTop(android.test.InstrumentationTestCase, android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.TestPrinter void startTest(junit.framework.Test) 0'>
@@ -341,6 +359,9 @@
     <item name='android.test.MoreAsserts void assertContentsInAnyOrder(java.lang.Iterable&lt;?&gt;, java.lang.Object...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.RenamingDelegatingContext java.io.File getFileStreamPath(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.MoreAsserts void assertEquals(java.util.Set&lt;? extends java.lang.Object&gt;, java.util.Set&lt;? extends java.lang.Object&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -377,6 +398,9 @@
     <item name='android.test.MoreAsserts void assertAssignableFrom(java.lang.Class&lt;?&gt;, java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.RenamingDelegatingContext java.io.File getDatabasePath(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TouchUtils void dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -386,6 +410,9 @@
     <item name='android.test.TestRunner.JunitTestSuite void addError(junit.framework.Test, java.lang.Throwable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.RenamingDelegatingContext boolean deleteFile(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.MoreAsserts void assertNotEmpty(java.lang.String, java.lang.Iterable&lt;?&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -395,6 +422,9 @@
     <item name='android.test.DatabaseTestUtils void assertSchemaEquals(android.database.sqlite.SQLiteDatabase, android.database.sqlite.SQLiteDatabase) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.IsolatedContext void sendBroadcast(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TouchUtils void scrollToTop(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -416,9 +446,15 @@
     <item name='android.test.MoreAsserts void assertEquals(int[], int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.ViewAsserts void assertGroupNotContains(android.view.ViewGroup, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.TestRunner java.lang.String getTitle(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.ViewAsserts void assertVerticalCenterAligned(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -428,13 +464,19 @@
     <item name='android.test.MoreAsserts void assertAssignableFrom(java.lang.Class&lt;?&gt;, java.lang.Class&lt;?&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.ClassPathPackageInfo java.util.Set&lt;java.lang.Class&lt;?&gt;&gt; getTopLevelClassesRecursive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.TestRunner.JunitTestSuite void addError(junit.framework.Test, java.lang.Throwable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.MoreAsserts void assertNotContainsRegex(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.InstrumentationTestCase void sendRepeatedKeys(int...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.IsolatedContext java.io.File getFilesDir()'>
+    <item name='android.test.ComparisonFailure java.lang.String getMessage()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.MoreAsserts void assertNotContainsRegex(java.lang.String, java.lang.String, java.lang.String) 2'>
@@ -464,7 +506,7 @@
     <item name='android.test.MoreAsserts void assertNotContainsRegex(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.ClassPathPackageInfo java.util.Set&lt;java.lang.Class&lt;?&gt;&gt; getTopLevelClassesRecursive()'>
+    <item name='android.test.TestRunner java.lang.reflect.Method[] getAllTestMethods(java.lang.Class)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.MoreAsserts java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String, java.lang.String) 2'>
@@ -485,7 +527,10 @@
     <item name='android.test.TouchUtils void drag(android.test.InstrumentationTestCase, float, float, float, float, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.ProviderTestCase2 android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.String, java.lang.Class&lt;T&gt;, java.lang.String, java.lang.String, int, java.lang.String)'>
+    <item name='android.test.InstrumentationTestRunner android.test.AndroidTestRunner getAndroidTestRunner()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.IsolatedContext int checkUriPermission(android.net.Uri, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.TouchUtils int dragViewTo(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int) 0'>
@@ -497,10 +542,13 @@
     <item name='android.test.TouchUtils int dragViewToY(android.test.ActivityInstrumentationTestCase, android.view.View, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String, java.lang.String)'>
+    <item name='android.test.ViewAsserts void assertOffScreenAbove(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.ViewAsserts void assertOffScreenAbove(android.view.View, android.view.View) 1'>
+    <item name='android.test.IsolatedContext void sendOrderedBroadcast(android.content.Intent, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.IsolatedContext java.io.File getFilesDir()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.MoreAsserts void assertAssignableFrom(java.lang.Class&lt;?&gt;, java.lang.Object) 1'>
@@ -509,10 +557,10 @@
     <item name='android.test.TestRunner.JunitTestSuite void addFailure(junit.framework.Test, junit.framework.AssertionFailedError) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.TouchUtils void dragQuarterScreenUp(android.test.ActivityInstrumentationTestCase) 0'>
+    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.InstrumentationTestRunner android.test.AndroidTestRunner getAndroidTestRunner()'>
+    <item name='android.test.TouchUtils void dragQuarterScreenUp(android.test.ActivityInstrumentationTestCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.TestRunner int countJunitTests(java.lang.Class) 0'>
@@ -524,6 +572,9 @@
     <item name='android.test.MoreAsserts void assertEquals(java.lang.String, double[], double[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.RenamingDelegatingContext java.io.FileInputStream openFileInput(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TouchUtils void scrollToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -557,6 +608,9 @@
     <item name='android.test.ViewAsserts void assertLeftAligned(android.view.View, android.view.View, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.InstrumentationTestCase T launchActivityWithIntent(java.lang.String, java.lang.Class&lt;T&gt;, android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TouchUtils void scrollToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -575,12 +629,6 @@
     <item name='android.test.ViewAsserts void assertOffScreenBelow(android.view.View, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.ComparisonFailure java.lang.String getMessage()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.ViewAsserts void assertGroupIntegrity(android.view.ViewGroup) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -593,15 +641,12 @@
     <item name='android.test.TouchUtils void dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String)'>
+    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.ProviderTestCase android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.Class&lt;T&gt;, java.lang.String, java.lang.String, int, java.lang.String) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.MoreAsserts java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String, java.lang.String) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.ViewAsserts void assertLeftAligned(android.view.View, android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -611,21 +656,24 @@
     <item name='android.test.TouchUtils void scrollToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.TestRunner.JunitTestSuite void addFailure(junit.framework.Test, junit.framework.AssertionFailedError) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.MoreAsserts void assertEquals(java.util.Set&lt;? extends java.lang.Object&gt;, java.util.Set&lt;? extends java.lang.Object&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.MoreAsserts void assertEquals(java.lang.Object[], java.lang.Object[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.InstrumentationCoreTestRunner android.test.AndroidTestRunner getAndroidTestRunner()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.ViewAsserts void assertLeftAligned(android.view.View, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.MoreAsserts void assertAssignableFrom(java.lang.Class&lt;?&gt;, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.InstrumentationTestCase T launchActivity(java.lang.String, java.lang.Class&lt;T&gt;, android.os.Bundle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.TouchUtils void dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/test/mock/annotations.xml b/android-sdk-annotations/android/test/mock/annotations.xml
index 06ac251415b..161927cc622 100644
--- a/android-sdk-annotations/android/test/mock/annotations.xml
+++ b/android-sdk-annotations/android/test/mock/annotations.xml
@@ -1,32 +1,20 @@
 <root>
-    <item name='android.test.mock.MockContext void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContext void enforcePermission(java.lang.String, int, int, java.lang.String) 0'>
+    <item name='android.test.mock.MockResources int getIdentifier(java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.mock.MockContext void enforceCallingPermission(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.mock.MockCursor int getColumnIndex(java.lang.String) 0'>
+    <item name='android.test.mock.MockResources void getValue(java.lang.String, android.util.TypedValue, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.mock.MockContentProvider java.lang.String getType(android.net.Uri) 0'>
+    <item name='android.test.mock.MockPackageManager java.lang.CharSequence getApplicationLabel(android.content.pm.ApplicationInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.mock.MockCursor int getColumnIndexOrThrow(java.lang.String) 0'>
+    <item name='android.test.mock.MockContext void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.mock.MockContext android.content.Context createDisplayContext(android.view.Display) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockApplication void onConfigurationChanged(android.content.res.Configuration) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContentProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContext int checkCallingPermission(java.lang.String) 0'>
+    <item name='android.test.mock.MockIContentProvider android.content.ContentProviderResult[] applyBatch(java.lang.String, java.util.ArrayList&lt;android.content.ContentProviderOperation&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.mock.MockContext boolean startInstrumentation(android.content.ComponentName, java.lang.String, android.os.Bundle) 0'>
@@ -35,46 +23,310 @@
     <item name='android.test.mock.MockContentProvider int bulkInsert(android.net.Uri, android.content.ContentValues[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.mock.MockContentProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 0'>
+    <item name='android.test.mock.MockContext void startActivities(android.content.Intent[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.mock.MockContext android.content.Context createConfigurationContext(android.content.res.Configuration) 0'>
+    <item name='android.test.mock.MockContentProvider int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.mock.MockResources android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]) 1'>
+    <item name='android.test.mock.MockPackageManager android.content.pm.ResolveInfo resolveActivity(android.content.Intent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.mock.MockCursor void copyStringToBuffer(int, android.database.CharArrayBuffer) 1'>
+    <item name='android.test.mock.MockContext void sendBroadcast(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.mock.MockContext void enforceCallingOrSelfPermission(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContentProvider android.content.ContentProviderResult[] applyBatch(java.util.ArrayList&lt;android.content.ContentProviderOperation&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContentProvider android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContext boolean bindService(android.content.Intent, android.content.ServiceConnection, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContext int checkPermission(java.lang.String, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContext void unbindService(android.content.ServiceConnection) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContext java.lang.Object getSystemService(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.mock.MockContext int checkCallingOrSelfPermission(java.lang.String) 0'>
+    <item name='android.test.mock.MockContext java.io.FileInputStream openFileInput(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.mock.MockContentProvider int delete(android.net.Uri, java.lang.String, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.mock.MockIContentProvider android.net.Uri insert(java.lang.String, android.net.Uri, android.content.ContentValues) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentServicesAsUser(android.content.Intent, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void enforcePermission(java.lang.String, int, int, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager int getPreferredActivities(java.util.List&lt;android.content.IntentFilter&gt;, java.util.List&lt;android.content.ComponentName&gt;, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendBroadcast(android.content.Intent, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager android.graphics.drawable.Drawable getApplicationIcon(android.content.pm.ApplicationInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendStickyOrderedBroadcast(android.content.Intent, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider int bulkInsert(java.lang.String, android.net.Uri, android.content.ContentValues[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendOrderedBroadcast(android.content.Intent, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext int checkPermission(java.lang.String, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider android.content.res.AssetFileDescriptor openTypedAssetFile(java.lang.String, android.net.Uri, java.lang.String, android.os.Bundle) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider int update(java.lang.String, android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void setWallpaper(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryBroadcastReceivers(android.content.Intent, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider int bulkInsert(java.lang.String, android.net.Uri, android.content.ContentValues[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockCursor void copyStringToBuffer(int, android.database.CharArrayBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider android.content.ContentProviderResult[] applyBatch(java.util.ArrayList&lt;android.content.ContentProviderOperation&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext int checkCallingOrSelfPermission(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendBroadcast(android.content.Intent, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider java.lang.String getType(android.net.Uri) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider int update(java.lang.String, android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext android.content.Context createPackageContext(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void removeStickyBroadcast(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext java.io.FileOutputStream openFileOutput(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendOrderedBroadcast(android.content.Intent, java.lang.String, int, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext android.content.Context createConfigurationContext(android.content.res.Configuration) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext java.io.File getFileStreamPath(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext java.io.File getDatabasePath(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendStickyBroadcast(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider android.net.Uri insert(java.lang.String, android.net.Uri, android.content.ContentValues) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider java.lang.String[] getStreamTypes(android.net.Uri, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockCursor int getColumnIndexOrThrow(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager void replacePreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext boolean deleteFile(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.mock.MockContentProvider android.content.IContentProvider getIContentProvider()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.mock.MockIContentProvider android.os.ParcelFileDescriptor openFile(java.lang.String, android.net.Uri, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider java.lang.String getType(android.net.Uri) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext boolean bindServiceAsUser(android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void enforceCallingOrSelfPermission(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext android.content.Intent registerReceiverAsUser(android.content.BroadcastReceiver, android.os.UserHandle, android.content.IntentFilter, java.lang.String, android.os.Handler) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider void attachInfo(android.content.Context, android.content.pm.ProviderInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext java.lang.Object getSystemService(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager android.graphics.drawable.Drawable getApplicationLogo(android.content.pm.ApplicationInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockApplication void onConfigurationChanged(android.content.res.Configuration) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider android.database.Cursor query(java.lang.String, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.ICancellationSignal) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider java.lang.String[] getStreamTypes(android.net.Uri, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void unregisterReceiver(android.content.BroadcastReceiver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext android.content.Context createPackageContextAsUser(java.lang.String, int, android.os.UserHandle) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void setWallpaper(android.graphics.Bitmap) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext int checkUriPermission(android.net.Uri, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager int getPreferredActivities(java.util.List&lt;android.content.IntentFilter&gt;, java.util.List&lt;android.content.ComponentName&gt;, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext boolean bindService(android.content.Intent, android.content.ServiceConnection, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager android.content.res.Resources getResourcesForApplication(android.content.pm.ApplicationInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockResources java.lang.String getQuantityString(int, int, java.lang.Object...) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void unbindService(android.content.ServiceConnection) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider android.content.res.AssetFileDescriptor openAssetFile(java.lang.String, android.net.Uri, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockCursor int getColumnIndex(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager android.content.pm.ResolveInfo resolveService(android.content.Intent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void startActivities(android.content.Intent[], android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager void removePermission(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentServices(android.content.Intent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager android.content.pm.PackageInfo getPackageArchiveInfo(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager android.content.pm.ResolveInfo resolveActivityAsUser(android.content.Intent, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockResources android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider android.content.res.AssetFileDescriptor openTypedAssetFile(java.lang.String, android.net.Uri, java.lang.String, android.os.Bundle) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentActivitiesAsUser(android.content.Intent, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentActivityOptions(android.content.ComponentName, android.content.Intent[], android.content.Intent, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext android.content.Context getApplicationContext()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryBroadcastReceivers(android.content.Intent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentResolver void unstableProviderDied(android.content.IContentProvider) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockCursor void registerContentObserver(android.database.ContentObserver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext android.content.Context createDisplayContext(android.view.Display) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockIContentProvider int delete(java.lang.String, android.net.Uri, java.lang.String, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext android.content.Context createPackageContextAsUser(java.lang.String, int, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext int checkCallingPermission(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContext void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager java.util.List&lt;android.content.pm.ResolveInfo&gt; queryIntentActivities(android.content.Intent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager java.lang.String[] canonicalToCurrentPackageNames(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockContentProvider int delete(android.net.Uri, java.lang.String, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockResources android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockPackageManager android.graphics.drawable.Drawable getActivityLogo(android.content.Intent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.mock.MockResources java.lang.String getString(int, java.lang.Object...) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/test/suitebuilder/annotation/annotations.xml b/android-sdk-annotations/android/test/suitebuilder/annotation/annotations.xml
new file mode 100644
index 00000000000..0d9cbf6d99e
--- /dev/null
+++ b/android-sdk-annotations/android/test/suitebuilder/annotation/annotations.xml
@@ -0,0 +1,5 @@
+<root>
+    <item name='android.test.suitebuilder.annotation.HasAnnotation boolean apply(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/android-sdk-annotations/android/test/suitebuilder/annotations.xml b/android-sdk-annotations/android/test/suitebuilder/annotations.xml
index d81d1a395f7..b389d4977ea 100644
--- a/android-sdk-annotations/android/test/suitebuilder/annotations.xml
+++ b/android-sdk-annotations/android/test/suitebuilder/annotations.xml
@@ -2,55 +2,67 @@
     <item name='android.test.suitebuilder.TestSuiteBuilder TestSuiteBuilder(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestGrouping java.util.List&lt;android.test.suitebuilder.TestMethod&gt; getTests()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.TestMethod java.lang.String getEnclosingClassname()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.TestGrouping java.util.List&lt;java.lang.reflect.Method&gt; getTestMethods(java.lang.Class&lt;? extends junit.framework.TestCase&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder includePackages(java.lang.String...) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestGrouping getTestGrouping()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.UnitTestSuiteBuilder UnitTestSuiteBuilder(java.lang.Class) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.TestMethod java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addRequirements(com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.suitebuilder.TestGrouping android.test.suitebuilder.TestGrouping addPackagesRecursive(java.lang.String...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestGrouping android.test.suitebuilder.TestGrouping removePackagesRecursive(java.lang.String...) 0'>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestGrouping getTestGrouping()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List&lt;com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;&gt;)'>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder includePackages(java.lang.String...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestMethod TestMethod(java.lang.reflect.Method, java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 1'>
+    <item name='android.test.suitebuilder.TestGrouping android.test.suitebuilder.TestGrouping removePackagesRecursive(java.lang.String...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder named(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder includeAllPackagesUnderHere()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.suitebuilder.TestMethod java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.UnitTestSuiteBuilder UnitTestSuiteBuilder(java.lang.Class) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addRequirements(com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder excludePackages(java.lang.String...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.TestGrouping android.test.suitebuilder.TestGrouping removePackagesRecursive(java.lang.String...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addTestClassByName(java.lang.String, java.lang.String, android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder includePackages(java.lang.String...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.TestMethod TestMethod(java.lang.reflect.Method, java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List&lt;com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addRequirements(com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.suitebuilder.TestGrouping android.test.suitebuilder.TestGrouping addPackagesRecursive(java.lang.String...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.test.suitebuilder.TestMethod java.lang.Class&lt;? extends junit.framework.TestCase&gt; getEnclosingClass()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.test.suitebuilder.InstrumentationTestSuiteBuilder InstrumentationTestSuiteBuilder(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestGrouping java.util.List&lt;java.lang.reflect.Method&gt; getTestMethods(java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 0'>
+    <item name='android.test.suitebuilder.TestGrouping java.util.List&lt;android.test.suitebuilder.TestMethod&gt; getTests()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder excludePackages(java.lang.String...)'>
+    <item name='android.test.suitebuilder.TestGrouping java.util.List&lt;java.lang.reflect.Method&gt; getTestMethods(java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.suitebuilder.TestMethod TestMethod(junit.framework.TestCase) 0'>
@@ -59,10 +71,10 @@
     <item name='android.test.suitebuilder.TestMethod TestMethod(java.lang.String, java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestMethod java.lang.Class&lt;? extends junit.framework.TestCase&gt; getEnclosingClass()'>
+    <item name='android.test.suitebuilder.TestMethod java.lang.String getEnclosingClassname()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addRequirements(com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...)'>
+    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addTestSuite(junit.framework.TestSuite)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder excludePackages(java.lang.String...) 0'>
@@ -71,22 +83,10 @@
     <item name='android.test.suitebuilder.TestMethod TestMethod(java.lang.reflect.Method, java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestGrouping android.test.suitebuilder.TestGrouping removePackagesRecursive(java.lang.String...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.test.suitebuilder.SmokeTestSuiteBuilder SmokeTestSuiteBuilder(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder includePackages(java.lang.String...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder named(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addTestSuite(junit.framework.TestSuite)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.test.suitebuilder.TestSuiteBuilder android.test.suitebuilder.TestSuiteBuilder addTestClassByName(java.lang.String, java.lang.String, android.content.Context)'>
+    <item name='android.test.suitebuilder.TestGrouping java.util.List&lt;java.lang.reflect.Method&gt; getTestMethods(java.lang.Class&lt;? extends junit.framework.TestCase&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/text/annotations.xml b/android-sdk-annotations/android/text/annotations.xml
index adbeaed8128..782ba6905a4 100644
--- a/android-sdk-annotations/android/text/annotations.xml
+++ b/android-sdk-annotations/android/text/annotations.xml
@@ -1,19 +1,28 @@
 <root>
-    <item name='android.text.BidiFormatter java.lang.String markAfter(java.lang.String, android.text.TextDirectionHeuristic)'>
+    <item name='android.text.Spannable.Factory android.text.Spannable.Factory getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.CharSequence join(java.lang.Iterable&lt;java.lang.CharSequence&gt;)'>
+    <item name='android.text.TextUtils java.lang.String htmlEncode(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.Spanned T[] getSpans(int, int, java.lang.Class&lt;T&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.TextUtils.SimpleStringSplitter java.lang.String next()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection void selectAll(android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter.Builder android.text.BidiFormatter.Builder setTextDirectionHeuristic(android.text.TextDirectionHeuristic)'>
+    <item name='android.text.TextDirectionHeuristic boolean isRtl(java.lang.CharSequence, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, android.text.TextUtils.EllipsizeCallback) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.SpannedString java.lang.CharSequence subSequence(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, android.text.TextUtils.EllipsizeCallback, android.text.TextDirectionHeuristic, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,15 +32,15 @@
     <item name='android.text.DynamicLayout DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, android.text.TextDirectionHeuristic, float, float, boolean, android.text.TextUtils.TruncateAt, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.TextUtils T[] removeEmptySpans(T[], android.text.Spanned, java.lang.Class&lt;T&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.BoringLayout android.text.BoringLayout replaceOrMake(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.BoringLayout android.text.BoringLayout make(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder java.lang.Appendable append(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder valueOf(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -50,7 +59,10 @@
     <item name='android.text.Layout void getSelectionPath(int, int, android.graphics.Path) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.Editable replace(int, int, java.lang.CharSequence, int, int)'>
+    <item name='android.text.SpannableStringBuilder java.lang.Appendable append(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.GetChars void getChars(int, int, char[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.SpannableStringBuilder SpannableStringBuilder(java.lang.CharSequence) 0'>
@@ -62,7 +74,13 @@
     <item name='android.text.TextUtils java.lang.CharSequence expandTemplate(java.lang.CharSequence, java.lang.CharSequence...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Editable android.text.Editable insert(int, java.lang.CharSequence, int, int)'>
+    <item name='android.text.GraphicsOperations int getTextRunCursor(int, int, int, int, int, android.graphics.Paint) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.TextUtils.SimpleStringSplitter java.lang.Object next()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.Editable android.text.Editable append(java.lang.CharSequence, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.DynamicLayout DynamicLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean) 1'>
@@ -74,30 +92,33 @@
     <item name='android.text.SpannableStringBuilder java.lang.Appendable append(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannedString SpannedString(java.lang.CharSequence) 0'>
+    <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.text.TextDirectionHeuristic, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.String join(java.lang.CharSequence, java.lang.Iterable)'>
+    <item name='android.text.SpannedString SpannedString(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.StaticLayout StaticLayout(java.lang.CharSequence, int, int, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.AlteredCharSequence java.lang.CharSequence subSequence(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.TextUtils java.lang.CharSequence concat(java.lang.CharSequence...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.TextUtils java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String, android.text.TextDirectionHeuristic)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.DynamicLayout DynamicLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Editable android.text.Editable append(java.lang.CharSequence, int, int)'>
+    <item name='android.text.GraphicsOperations void drawText(android.graphics.Canvas, int, int, float, float, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils boolean regionMatches(java.lang.CharSequence, int, java.lang.CharSequence, int, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder java.lang.String substring(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.SpannableStringBuilder void setFilters(android.text.InputFilter[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -107,22 +128,22 @@
     <item name='android.text.InputFilter java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.AlteredCharSequence java.lang.CharSequence subSequence(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.TextUtils int indexOf(java.lang.CharSequence, java.lang.CharSequence, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.Editable insert(int, java.lang.CharSequence, int, int)'>
+    <item name='android.text.SpannableStringBuilder java.lang.Appendable append(java.lang.CharSequence, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils.SimpleStringSplitter java.util.Iterator&lt;java.lang.String&gt; iterator()'>
+    <item name='android.text.TextUtils java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.DynamicLayout DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, android.text.TextDirectionHeuristic, float, float, boolean, android.text.TextUtils.TruncateAt, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String)'>
+    <item name='android.text.SpannableString java.lang.Object[] getSpans(int, int, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.Editable android.text.Editable delete(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection boolean moveToLeftEdge(android.text.Spannable, android.text.Layout) 1'>
@@ -137,16 +158,16 @@
     <item name='android.text.SpanWatcher void onSpanChanged(android.text.Spannable, java.lang.Object, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils.SimpleStringSplitter java.lang.String next()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.BoringLayout android.text.BoringLayout replaceOrMake(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean)'>
+    <item name='android.text.TextUtils java.lang.CharSequence join(java.lang.Iterable&lt;java.lang.CharSequence&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.SpannableStringBuilder android.text.Editable append(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder append(java.lang.CharSequence)'>
+    <item name='android.text.Editable android.text.Editable append(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.GraphicsOperations void drawTextRun(android.graphics.Canvas, int, int, int, int, float, float, int, android.graphics.Paint) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils int getCapsMode(java.lang.CharSequence, int, int) 0'>
@@ -155,13 +176,13 @@
     <item name='android.text.Layout void getCursorPath(int, android.graphics.Path, java.lang.CharSequence) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder insert(int, java.lang.CharSequence, int, int)'>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder delete(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder valueOf(java.lang.CharSequence)'>
+    <item name='android.text.SpannableStringBuilder java.lang.String substring(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter java.lang.String markBefore(java.lang.String, android.text.TextDirectionHeuristic)'>
+    <item name='android.text.SpannableStringBuilder android.text.Editable replace(int, int, java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.AutoText java.lang.String get(java.lang.CharSequence, int, int, android.view.View) 0'>
@@ -170,6 +191,9 @@
     <item name='android.text.StaticLayout StaticLayout(java.lang.CharSequence, int, int, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean, android.text.TextUtils.TruncateAt, int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.SpannableStringBuilder android.text.Editable delete(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder replace(int, int, java.lang.CharSequence) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -179,27 +203,18 @@
     <item name='android.text.TextUtils java.lang.String[] split(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter android.text.BidiFormatter getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.TextUtils java.lang.CharSequence getReverse(java.lang.CharSequence, int, int)'>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder valueOf(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.SpannableStringBuilder float measureText(int, int, android.graphics.Paint) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Editable android.text.Editable replace(int, int, java.lang.CharSequence, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.BidiFormatter java.lang.String markBefore(java.lang.String, android.text.TextDirectionHeuristic) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Html java.lang.String toHtml(android.text.Spanned) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Editable android.text.Editable insert(int, java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.BoringLayout android.text.BoringLayout make(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -224,21 +239,12 @@
     <item name='android.text.StaticLayout StaticLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.String substring(java.lang.CharSequence, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.TextUtils int indexOf(java.lang.CharSequence, java.lang.CharSequence, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.CharSequence expandTemplate(java.lang.CharSequence, java.lang.CharSequence...)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.BidiFormatter java.lang.String markBefore(java.lang.String, android.text.TextDirectionHeuristic) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder java.lang.Appendable append(char)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.InputFilter.AllCaps java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -248,46 +254,52 @@
     <item name='android.text.TextUtils int indexOf(java.lang.CharSequence, java.lang.CharSequence) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannedString java.lang.Object[] getSpans(int, int, java.lang.Class)'>
+    <item name='android.text.AlteredCharSequence java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.TextUtils.TruncateAt android.text.TextUtils.TruncateAt valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.AutoText int getSize(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.AlteredCharSequence java.lang.String toString()'>
+    <item name='android.text.SpannableStringBuilder android.text.Editable insert(int, java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils int indexOf(java.lang.CharSequence, java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt)'>
+    <item name='android.text.BoringLayout android.text.BoringLayout make(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection boolean extendUp(android.text.Spannable, android.text.Layout) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder java.lang.CharSequence subSequence(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.BoringLayout android.text.BoringLayout make(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int)'>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder replace(int, int, java.lang.CharSequence, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.text.TextDirectionHeuristic, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Spannable.Factory android.text.Spannable.Factory getInstance()'>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder replace(int, int, java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.Layout android.text.Layout.Directions getLineDirections(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.TextUtils java.lang.CharSequence replace(java.lang.CharSequence, java.lang.String[], java.lang.CharSequence[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.Editable.Factory android.text.Editable newEditable(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection boolean extendDown(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Editable.Factory android.text.Editable.Factory getInstance()'>
+    <item name='android.text.Editable void setFilters(android.text.InputFilter[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter.Builder android.text.BidiFormatter build()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder insert(int, java.lang.CharSequence)'>
+    <item name='android.text.SpannableStringBuilder android.text.Editable replace(int, int, java.lang.CharSequence, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.InputFilter.AllCaps java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int) 0'>
@@ -296,7 +308,10 @@
     <item name='android.text.Layout void draw(android.graphics.Canvas, android.graphics.Path, android.graphics.Paint, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Editable android.text.Editable append(java.lang.CharSequence)'>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder append(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.Editable android.text.Editable replace(int, int, java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection void extendSelection(android.text.Spannable, int) 0'>
@@ -308,9 +323,6 @@
     <item name='android.text.TextUtils int indexOf(java.lang.CharSequence, char, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BoringLayout android.text.Layout.Directions getLineDirections(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.TextUtils boolean isGraphic(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -320,10 +332,16 @@
     <item name='android.text.Selection boolean extendToRightEdge(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder append(char)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.Selection boolean extendUp(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannedString java.lang.CharSequence subSequence(int, int)'>
+    <item name='android.text.SpannableStringBuilder android.text.Editable append(java.lang.CharSequence, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.SpannableStringBuilder void getChars(int, int, char[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.BoringLayout android.text.BoringLayout replaceOrMake(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int) 1'>
@@ -332,6 +350,9 @@
     <item name='android.text.TextUtils T[] removeEmptySpans(T[], android.text.Spanned, java.lang.Class&lt;T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -341,13 +362,19 @@
     <item name='android.text.TextUtils void dumpSpans(java.lang.CharSequence, android.util.Printer, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder append(java.lang.CharSequence, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, android.text.TextUtils.EllipsizeCallback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.BidiFormatter.Builder android.text.BidiFormatter.Builder setTextDirectionHeuristic(android.text.TextDirectionHeuristic)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.SpannableStringBuilder void drawText(android.graphics.Canvas, int, int, float, float, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannedString android.text.SpannedString valueOf(java.lang.CharSequence)'>
+    <item name='android.text.SpannableString android.text.SpannableString valueOf(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils void writeToParcel(java.lang.CharSequence, android.os.Parcel, int) 1'>
@@ -359,19 +386,22 @@
     <item name='android.text.TextUtils java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter.Builder android.text.BidiFormatter.Builder stereoReset(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.SpannableStringBuilder int getTextRunCursor(int, int, int, int, int, android.graphics.Paint) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection boolean moveUp(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.text.TextDirectionHeuristic)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.Selection boolean extendToRightEdge(android.text.Spannable, android.text.Layout) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Html java.lang.String escapeHtml(java.lang.CharSequence)'>
+    <item name='android.text.BidiFormatter android.text.BidiFormatter getInstance(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.TextDirectionHeuristic boolean isRtl(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection boolean moveToRightEdge(android.text.Spannable, android.text.Layout) 0'>
@@ -380,30 +410,51 @@
     <item name='android.text.TextPaint void set(android.text.TextPaint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.TextUtils java.lang.String join(java.lang.CharSequence, java.lang.Iterable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.SpannableStringBuilder SpannableStringBuilder(java.lang.CharSequence, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.SpannableStringBuilder void drawTextRun(android.graphics.Canvas, int, int, int, int, float, float, int, android.graphics.Paint) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils T[] removeEmptySpans(T[], android.text.Spanned, java.lang.Class&lt;T&gt;)'>
+    <item name='android.text.SpannableStringBuilder java.lang.CharSequence subSequence(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.BidiFormatter android.text.BidiFormatter getInstance(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, android.text.TextUtils.EllipsizeCallback)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.GraphicsOperations int getTextWidths(int, int, float[], android.graphics.Paint) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.DynamicLayout DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String, android.text.TextDirectionHeuristic)'>
+    <item name='android.text.BoringLayout android.text.BoringLayout make(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection void removeSelection(android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.BoringLayout android.text.BoringLayout replaceOrMake(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.SpannableStringBuilder java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.Selection boolean moveToRightEdge(android.text.Spannable, android.text.Layout) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.BoringLayout android.text.BoringLayout.Metrics isBoring(java.lang.CharSequence, android.text.TextPaint, android.text.TextDirectionHeuristic, android.text.BoringLayout.Metrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.TextUtils.SimpleStringSplitter java.util.Iterator&lt;java.lang.String&gt; iterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.text.TextDirectionHeuristic) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -413,21 +464,15 @@
     <item name='android.text.SpannableStringBuilder android.text.Editable insert(int, java.lang.CharSequence) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils.SimpleStringSplitter java.lang.Object next()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.SpannableStringBuilder android.text.Editable replace(int, int, java.lang.CharSequence) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.Editable replace(int, int, java.lang.CharSequence)'>
+    <item name='android.text.BoringLayout android.text.BoringLayout.Metrics isBoring(java.lang.CharSequence, android.text.TextPaint, android.text.BoringLayout.Metrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.LoginFilter java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BoringLayout android.text.BoringLayout.Metrics isBoring(java.lang.CharSequence, android.text.TextPaint, android.text.BoringLayout.Metrics) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.Spannable.Factory android.text.Spannable newSpannable(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -437,10 +482,10 @@
     <item name='android.text.BidiFormatter java.lang.String markAfter(java.lang.String, android.text.TextDirectionHeuristic) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, android.text.TextUtils.EllipsizeCallback, android.text.TextDirectionHeuristic, java.lang.String)'>
+    <item name='android.text.GraphicsOperations int getTextWidths(int, int, float[], android.graphics.Paint) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.text.TextDirectionHeuristic)'>
+    <item name='android.text.SpannableStringBuilder android.text.Editable append(char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder append(java.lang.CharSequence) 0'>
@@ -452,16 +497,13 @@
     <item name='android.text.TextUtils java.lang.String join(java.lang.CharSequence, java.lang.Object[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.text.TextDirectionHeuristic, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder append(java.lang.CharSequence, int, int)'>
+    <item name='android.text.Layout.Alignment android.text.Layout.Alignment valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.SpannedString android.text.SpannedString valueOf(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder java.lang.String toString()'>
+    <item name='android.text.SpannableStringBuilder java.lang.Appendable append(char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Layout void draw(android.graphics.Canvas) 0'>
@@ -470,21 +512,21 @@
     <item name='android.text.Selection boolean extendRight(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Layout android.text.Layout.Directions getLineDirections(int)'>
+    <item name='android.text.GraphicsOperations float measureText(int, int, android.graphics.Paint) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.Editable append(char)'>
+    <item name='android.text.GraphicsOperations float getTextRunAdvances(int, int, int, int, int, float[], int, android.graphics.Paint) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Spannable.Factory android.text.Spannable newSpannable(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.InputFilter.LengthFilter java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int) 3'>
+    <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, android.text.TextUtils.EllipsizeCallback, android.text.TextDirectionHeuristic, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Annotation Annotation(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.InputFilter.LengthFilter java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.BoringLayout BoringLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -494,18 +536,24 @@
     <item name='android.text.TextUtils int getTrimmedLength(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.Editable android.text.Editable append(char)'>
+    <item name='android.text.Html java.lang.String escapeHtml(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils int indexOf(java.lang.CharSequence, java.lang.CharSequence, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.SpannedString java.lang.Object[] getSpans(int, int, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.BidiFormatter java.lang.String markAfter(java.lang.String, android.text.TextDirectionHeuristic)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String, android.text.TextDirectionHeuristic, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder insert(int, java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.Selection boolean moveRight(android.text.Spannable, android.text.Layout) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -515,15 +563,21 @@
     <item name='android.text.TextUtils int indexOf(java.lang.CharSequence, char) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, android.text.TextUtils.EllipsizeCallback)'>
+    <item name='android.text.Spannable.Factory android.text.Spannable newSpannable(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection boolean moveToPreceding(android.text.Spannable, android.text.Selection.PositionIterator, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.Html.ImageGetter android.graphics.drawable.Drawable getDrawable(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.SpannableStringBuilder float getTextRunAdvances(int, int, int, int, int, float[], int, android.graphics.Paint) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.DynamicLayout DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean, android.text.TextUtils.TruncateAt, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -536,19 +590,16 @@
     <item name='android.text.BoringLayout BoringLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableString java.lang.Object[] getSpans(int, int, java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.BidiFormatter java.lang.String unicodeWrap(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils int indexOf(java.lang.CharSequence, java.lang.CharSequence, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder insert(int, java.lang.CharSequence) 1'>
+    <item name='android.text.GraphicsOperations void drawTextRun(android.graphics.Canvas, int, int, int, int, float, float, int, android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BoringLayout.Metrics java.lang.String toString()'>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder insert(int, java.lang.CharSequence) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextWatcher void onTextChanged(java.lang.CharSequence, int, int, int) 0'>
@@ -560,28 +611,31 @@
     <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String)'>
+    <item name='android.text.Editable android.text.Editable insert(int, java.lang.CharSequence, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableString java.lang.CharSequence subSequence(int, int)'>
+    <item name='android.text.AlteredCharSequence void getChars(int, int, char[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.BoringLayout android.text.Layout.Directions getLineDirections(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils void copySpansFrom(android.text.Spanned, int, int, java.lang.Class, android.text.Spannable, int) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.Editable append(java.lang.CharSequence, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.TextPaint TextPaint(android.graphics.Paint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils.TruncateAt android.text.TextUtils.TruncateAt valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.SpannableStringBuilder android.text.Editable append(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Layout.Alignment android.text.Layout.Alignment valueOf(java.lang.String)'>
+    <item name='android.text.Html java.lang.String toHtml(android.text.Spanned)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.BidiFormatter java.lang.String markBefore(java.lang.String, android.text.TextDirectionHeuristic)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.BidiFormatter.Builder android.text.BidiFormatter.Builder stereoReset(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.LoginFilter java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int) 3'>
@@ -596,19 +650,13 @@
     <item name='android.text.Selection boolean extendLeft(android.text.Spannable, android.text.Layout) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter android.text.BidiFormatter getInstance(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.Editable.Factory android.text.Editable newEditable(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder replace(int, int, java.lang.CharSequence, int, int)'>
+    <item name='android.text.AlteredCharSequence android.text.AlteredCharSequence make(java.lang.CharSequence, char[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils int lastIndexOf(java.lang.CharSequence, char) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.String htmlEncode(java.lang.String)'>
+    <item name='android.text.SpannableStringBuilder android.text.Editable insert(int, java.lang.CharSequence, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils int indexOf(java.lang.CharSequence, char, int) 0'>
@@ -623,51 +671,48 @@
     <item name='android.text.AutoText java.lang.String get(java.lang.CharSequence, int, int, android.view.View) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder replace(int, int, java.lang.CharSequence)'>
+    <item name='android.text.BoringLayout.Metrics java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.Editable android.text.Editable replace(int, int, java.lang.CharSequence, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.TextUtils java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils int lastIndexOf(java.lang.CharSequence, char, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.Editable delete(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.SpannableStringBuilder void drawText(android.graphics.Canvas, int, int, float, float, android.graphics.Paint) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Editable android.text.Editable replace(int, int, java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder delete(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.TextUtils java.lang.CharSequence replace(java.lang.CharSequence, java.lang.String[], java.lang.CharSequence[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.BoringLayout android.text.BoringLayout make(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BoringLayout android.text.BoringLayout replaceOrMake(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.SpannableStringBuilder java.lang.Appendable append(java.lang.CharSequence, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.DynamicLayout DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean, android.text.TextUtils.TruncateAt, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Selection boolean extendLeft(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BidiFormatter android.text.BidiFormatter getInstance(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.SpannableString SpannableString(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.SpannedString android.text.SpannedString valueOf(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.BidiFormatter.Builder android.text.BidiFormatter build()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.TextUtils java.lang.String join(java.lang.CharSequence, java.lang.Iterable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.BidiFormatter android.text.BidiFormatter getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.Selection boolean moveLeft(android.text.Spannable, android.text.Layout) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -683,6 +728,9 @@
     <item name='android.text.Selection boolean moveToLeftEdge(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.TextUtils java.lang.String substring(java.lang.CharSequence, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.TextUtils int getOffsetAfter(java.lang.CharSequence, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -695,6 +743,12 @@
     <item name='android.text.BoringLayout BoringLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.GraphicsOperations void drawText(android.graphics.Canvas, int, int, float, float, android.graphics.Paint) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder insert(int, java.lang.CharSequence, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.DynamicLayout DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -710,42 +764,42 @@
     <item name='android.text.TextUtils java.lang.String[] split(java.lang.String, java.util.regex.Pattern) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.TextUtils java.lang.CharSequence expandTemplate(java.lang.CharSequence, java.lang.CharSequence...)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.Editable android.text.Editable replace(int, int, java.lang.CharSequence) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.BoringLayout android.text.BoringLayout replaceOrMake(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.BoringLayout android.text.BoringLayout replaceOrMake(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.AlteredCharSequence android.text.AlteredCharSequence make(java.lang.CharSequence, char[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.SpannableString android.text.SpannableString valueOf(java.lang.CharSequence)'>
+    <item name='android.text.Editable android.text.Editable insert(int, java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils int getOffsetBefore(java.lang.CharSequence, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.SpannableStringBuilder android.text.SpannableStringBuilder append(char)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.SpannableStringBuilder android.text.Editable insert(int, java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.Selection boolean moveLeft(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.CharSequence replace(java.lang.CharSequence, java.lang.String[], java.lang.CharSequence[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.BoringLayout void draw(android.graphics.Canvas, android.graphics.Path, android.graphics.Paint, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.BoringLayout android.text.BoringLayout make(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean)'>
+    <item name='android.text.TextUtils java.lang.String join(java.lang.CharSequence, java.lang.Object[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.TextUtils java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String, android.text.TextDirectionHeuristic) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.TextUtils java.lang.CharSequence getReverse(java.lang.CharSequence, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.Editable.Factory android.text.Editable.Factory getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.Selection boolean moveDown(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -755,16 +809,13 @@
     <item name='android.text.Selection boolean extendToLeftEdge(android.text.Spannable, android.text.Layout) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Html java.lang.String toHtml(android.text.Spanned)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.TextUtils java.lang.String[] split(java.lang.String, java.util.regex.Pattern) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Layout long getLineRangeForDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.Editable android.text.Editable delete(int, int)'>
+    <item name='android.text.Editable android.text.Editable append(char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.Annotation void writeToParcel(android.os.Parcel, int) 0'>
@@ -773,7 +824,7 @@
     <item name='android.text.SpanSet void init(android.text.Spanned, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.TextUtils java.lang.String join(java.lang.CharSequence, java.lang.Object[])'>
+    <item name='android.text.SpannableString java.lang.CharSequence subSequence(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.SpannableStringBuilder void drawTextRun(android.graphics.Canvas, int, int, int, int, float, float, int, android.graphics.Paint) 0'>
diff --git a/android-sdk-annotations/android/text/format/annotations.xml b/android-sdk-annotations/android/text/format/annotations.xml
index 8b9d7085235..ed45dff208e 100644
--- a/android-sdk-annotations/android/text/format/annotations.xml
+++ b/android-sdk-annotations/android/text/format/annotations.xml
@@ -1,8 +1,14 @@
 <root>
+    <item name='android.text.format.Time java.lang.String format3339(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.format.DateFormat char[] getDateFormatOrder(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateUtils java.lang.CharSequence formatSameDayTime(long, long, int, int)'>
+    <item name='android.text.format.DateUtils java.lang.CharSequence formatDuration(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.format.DateFormat java.text.DateFormat getLongDateFormat(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.DateFormat java.lang.String getTimeFormatString(android.content.Context) 0'>
@@ -17,7 +23,13 @@
     <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, java.util.Date) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.Time java.lang.String format2445()'>
+    <item name='android.text.format.DateFormat java.text.DateFormat getTimeFormat(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.format.DateFormat java.text.DateFormat getDateFormatForSetting(android.content.Context, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.DateFormat java.lang.String getBestDateTimePattern(java.util.Locale, java.lang.String) 0'>
@@ -26,34 +38,25 @@
     <item name='android.text.format.Time int compare(android.text.format.Time, android.text.format.Time) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateFormat char[] getDateFormatOrder(android.content.Context)'>
+    <item name='android.text.format.DateUtils java.lang.CharSequence formatSameDayTime(long, long, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateUtils java.lang.String formatElapsedTime(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.format.DateUtils java.lang.CharSequence getRelativeTimeSpanString(android.content.Context, long)'>
+    <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, java.util.Calendar)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.Time java.lang.String format(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateUtils java.lang.CharSequence formatDuration(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.format.DateFormat java.text.DateFormat getMediumDateFormat(android.content.Context)'>
+    <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, java.util.Date)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, java.util.Calendar) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateUtils java.util.Formatter formatDateRange(android.content.Context, java.util.Formatter, long, long, int, java.lang.String)'>
+    <item name='android.text.format.Time java.lang.String format2445()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, java.util.Date)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.format.DateUtils java.lang.CharSequence getRelativeDateTimeString(android.content.Context, long, long, long, int)'>
+    <item name='android.text.format.Time java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.Time Time(android.text.format.Time) 0'>
@@ -71,43 +74,40 @@
     <item name='android.text.format.Time int compare(android.text.format.Time, android.text.format.Time) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.Formatter java.lang.String formatFileSize(android.content.Context, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.format.DateFormat java.text.DateFormat getTimeFormat(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.format.Time boolean parse3339(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.format.DateFormat java.text.DateFormat getTimeFormat(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.DateUtils java.util.Formatter formatDateRange(android.content.Context, java.util.Formatter, long, long, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.format.DateUtils java.lang.CharSequence getRelativeTimeSpanString(android.content.Context, long, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateFormat java.text.DateFormat getDateFormat(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.format.DateUtils java.lang.String formatDateTime(android.content.Context, long, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.format.Time void clear(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.Time boolean parse(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.format.DateUtils java.lang.String formatDateTime(android.content.Context, long, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.format.DateUtils java.lang.String formatElapsedTime(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.format.DateUtils java.lang.CharSequence getRelativeTimeSpanString(android.content.Context, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.format.DateFormat boolean is24HourFormat(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.Time java.lang.String format3339(boolean)'>
+    <item name='android.text.format.DateFormat char[] getDateFormatOrder(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.DateUtils java.lang.CharSequence getRelativeDateTimeString(android.content.Context, long, long, long, int) 0'>
@@ -116,28 +116,25 @@
     <item name='android.text.format.Time boolean before(android.text.format.Time) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateFormat java.text.DateFormat getLongDateFormat(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.format.Time void set(android.text.format.Time) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.Time boolean after(android.text.format.Time) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateUtils java.lang.CharSequence getRelativeTimeSpanString(android.content.Context, long, boolean)'>
+    <item name='android.text.format.DateUtils java.util.Formatter formatDateRange(android.content.Context, java.util.Formatter, long, long, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateUtils java.util.Formatter formatDateRange(android.content.Context, java.util.Formatter, long, long, int)'>
+    <item name='android.text.format.Formatter java.lang.String formatShortFileSize(android.content.Context, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateFormat java.text.DateFormat getDateFormat(android.content.Context) 0'>
+    <item name='android.text.format.DateUtils java.lang.CharSequence getRelativeDateTimeString(android.content.Context, long, long, long, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateFormat java.lang.CharSequence format(java.lang.CharSequence, java.util.Calendar)'>
+    <item name='android.text.format.DateFormat java.text.DateFormat getDateFormat(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.DateUtils java.util.Formatter formatDateRange(android.content.Context, java.util.Formatter, long, long, int, java.lang.String) 1'>
@@ -149,10 +146,16 @@
     <item name='android.text.format.DateUtils java.lang.String formatElapsedTime(java.lang.StringBuilder, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.DateFormat java.text.DateFormat getDateFormatForSetting(android.content.Context, java.lang.String)'>
+    <item name='android.text.format.Formatter java.lang.String formatFileSize(android.content.Context, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.format.Formatter java.lang.String formatShortFileSize(android.content.Context, long)'>
+    <item name='android.text.format.DateUtils java.util.Formatter formatDateRange(android.content.Context, java.util.Formatter, long, long, int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.format.DateFormat java.text.DateFormat getMediumDateFormat(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.format.DateFormat java.text.DateFormat getDateFormat(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.format.Time boolean isEpoch(android.text.format.Time) 0'>
diff --git a/android-sdk-annotations/android/text/method/annotations.xml b/android-sdk-annotations/android/text/method/annotations.xml
index 47d05d28487..3f3774a1fcb 100644
--- a/android-sdk-annotations/android/text/method/annotations.xml
+++ b/android-sdk-annotations/android/text/method/annotations.xml
@@ -1,4 +1,7 @@
 <root>
+    <item name='android.text.method.BaseMovementMethod boolean pageDown(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.LinkMovementMethod boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,6 +14,9 @@
     <item name='android.text.method.ArrowKeyMovementMethod boolean lineStart(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.MovementMethod boolean onKeyDown(android.widget.TextView, android.text.Spannable, int, android.view.KeyEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.TextKeyListener boolean onKeyOther(android.view.View, android.text.Editable, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,6 +29,9 @@
     <item name='android.text.method.DigitsKeyListener android.text.method.DigitsKeyListener getInstance(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.ScrollingMovementMethod boolean top(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.MovementMethod boolean onGenericMotionEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,9 +50,6 @@
     <item name='android.text.method.LinkMovementMethod void initialize(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.PasswordTransformationMethod java.lang.CharSequence getTransformation(java.lang.CharSequence, android.view.View)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.method.ArrowKeyMovementMethod void initialize(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,16 +86,19 @@
     <item name='android.text.method.LinkMovementMethod boolean handleMovementKey(android.widget.TextView, android.text.Spannable, int, int, android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.BaseMovementMethod boolean lineEnd(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.ScrollingMovementMethod boolean end(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.MetaKeyKeyListener boolean onKeyDown(android.view.View, android.text.Editable, int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.ArrowKeyMovementMethod boolean top(android.widget.TextView, android.text.Spannable) 0'>
+    <item name='android.text.method.ScrollingMovementMethod boolean up(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.ScrollingMovementMethod boolean up(android.widget.TextView, android.text.Spannable) 1'>
+    <item name='android.text.method.ArrowKeyMovementMethod boolean top(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.LinkMovementMethod boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent) 2'>
@@ -125,27 +134,42 @@
     <item name='android.text.method.ScrollingMovementMethod boolean end(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.LinkMovementMethod boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.method.ScrollingMovementMethod boolean up(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.LinkMovementMethod boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.BaseMovementMethod boolean pageDown(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.NumberKeyListener boolean onKeyDown(android.view.View, android.text.Editable, int, android.view.KeyEvent) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.method.ScrollingMovementMethod boolean lineEnd(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.BaseKeyListener boolean forwardDelete(android.view.View, android.text.Editable, int, android.view.KeyEvent) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.BaseMovementMethod boolean down(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.BaseMovementMethod boolean up(android.widget.TextView, android.text.Spannable) 0'>
+    <item name='android.text.method.MovementMethod boolean onKeyDown(android.widget.TextView, android.text.Spannable, int, android.view.KeyEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.method.BaseMovementMethod boolean pageUp(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.ArrowKeyMovementMethod boolean lineStart(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.BaseMovementMethod boolean up(android.widget.TextView, android.text.Spannable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.method.NumberKeyListener char[] getAcceptedChars()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.MetaKeyKeyListener boolean onKeyUp(android.view.View, android.text.Editable, int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -158,9 +182,6 @@
     <item name='android.text.method.DigitsKeyListener java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.TimeKeyListener char[] getAcceptedChars()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.method.MetaKeyKeyListener boolean onKeyDown(android.view.View, android.text.Editable, int, android.view.KeyEvent) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -173,10 +194,10 @@
     <item name='android.text.method.ScrollingMovementMethod boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.DigitsKeyListener android.text.method.DigitsKeyListener getInstance(java.lang.String)'>
+    <item name='android.text.method.BaseMovementMethod boolean down(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.BaseMovementMethod boolean down(android.widget.TextView, android.text.Spannable) 0'>
+    <item name='android.text.method.DateTimeKeyListener char[] getAcceptedChars()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.ArrowKeyMovementMethod boolean bottom(android.widget.TextView, android.text.Spannable) 1'>
@@ -185,6 +206,9 @@
     <item name='android.text.method.ArrowKeyMovementMethod boolean down(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.BaseMovementMethod boolean leftWord(android.widget.TextView, android.text.Spannable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.LinkMovementMethod boolean up(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -212,6 +236,9 @@
     <item name='android.text.method.ArrowKeyMovementMethod boolean bottom(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.BaseMovementMethod boolean leftWord(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.ArrowKeyMovementMethod boolean down(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -236,6 +263,9 @@
     <item name='android.text.method.BaseMovementMethod boolean scrollPageUp(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.BaseMovementMethod boolean lineStart(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.KeyListener boolean onKeyUp(android.view.View, android.text.Editable, int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -245,6 +275,9 @@
     <item name='android.text.method.KeyListener boolean onKeyOther(android.view.View, android.text.Editable, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.PasswordTransformationMethod java.lang.CharSequence getTransformation(java.lang.CharSequence, android.view.View)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.BaseMovementMethod boolean scrollLineStart(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -284,6 +317,9 @@
     <item name='android.text.method.BaseMovementMethod boolean scrollTop(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.TimeKeyListener char[] getAcceptedChars()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.ScrollingMovementMethod boolean down(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -293,15 +329,15 @@
     <item name='android.text.method.ScrollingMovementMethod void onTakeFocus(android.widget.TextView, android.text.Spannable, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.DateKeyListener char[] getAcceptedChars()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.ArrowKeyMovementMethod boolean pageDown(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.TextKeyListener boolean onKeyUp(android.view.View, android.text.Editable, int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.TextKeyListener.Capitalize android.text.method.TextKeyListener.Capitalize valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.method.MetaKeyKeyListener void clearMetaKeyState(android.text.Editable, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -353,6 +389,9 @@
     <item name='android.text.method.ArrowKeyMovementMethod void onTakeFocus(android.widget.TextView, android.text.Spannable, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.ScrollingMovementMethod boolean home(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.MovementMethod boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -380,9 +419,6 @@
     <item name='android.text.method.ArrowKeyMovementMethod void onTakeFocus(android.widget.TextView, android.text.Spannable, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.DateTimeKeyListener char[] getAcceptedChars()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.method.ArrowKeyMovementMethod boolean pageUp(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -392,9 +428,6 @@
     <item name='android.text.method.ScrollingMovementMethod boolean pageDown(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.DateKeyListener char[] getAcceptedChars()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.method.BaseMovementMethod boolean handleMovementKey(android.widget.TextView, android.text.Spannable, int, int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -413,7 +446,7 @@
     <item name='android.text.method.ScrollingMovementMethod boolean home(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.TransformationMethod java.lang.CharSequence getTransformation(java.lang.CharSequence, android.view.View)'>
+    <item name='android.text.method.BaseMovementMethod boolean rightWord(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.TextKeyListener android.text.method.TextKeyListener getInstance(boolean, android.text.method.TextKeyListener.Capitalize) 1'>
@@ -422,7 +455,7 @@
     <item name='android.text.method.CharacterPickerDialog CharacterPickerDialog(android.content.Context, android.view.View, android.text.Editable, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.DialerKeyListener char[] getAcceptedChars()'>
+    <item name='android.text.method.BaseMovementMethod boolean top(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.MultiTapKeyListener boolean onKeyDown(android.view.View, android.text.Editable, int, android.view.KeyEvent) 1'>
@@ -440,15 +473,24 @@
     <item name='android.text.method.ScrollingMovementMethod boolean right(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.ScrollingMovementMethod boolean pageDown(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.ArrowKeyMovementMethod boolean pageDown(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.ScrollingMovementMethod boolean right(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.BaseMovementMethod boolean home(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.BaseMovementMethod boolean onKeyDown(android.widget.TextView, android.text.Spannable, int, android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.BaseMovementMethod boolean rightWord(android.widget.TextView, android.text.Spannable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.NumberKeyListener int lookup(android.view.KeyEvent, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -491,10 +533,13 @@
     <item name='android.text.method.TextKeyListener void clear(android.text.Editable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.MultiTapKeyListener void onSpanChanged(android.text.Spannable, java.lang.Object, int, int, int, int) 0'>
+    <item name='android.text.method.ScrollingMovementMethod boolean pageUp(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.method.ScrollingMovementMethod boolean pageUp(android.widget.TextView, android.text.Spannable) 0'>
+    <item name='android.text.method.MovementMethod boolean onKeyDown(android.widget.TextView, android.text.Spannable, int, android.view.KeyEvent) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.method.MultiTapKeyListener void onSpanChanged(android.text.Spannable, java.lang.Object, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.method.LinkMovementMethod boolean down(android.widget.TextView, android.text.Spannable) 1'>
@@ -539,9 +584,15 @@
     <item name='android.text.method.WordIterator WordIterator(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.ScrollingMovementMethod boolean pageUp(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.BaseMovementMethod boolean end(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.DigitsKeyListener android.text.method.DigitsKeyListener getInstance(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.ArrowKeyMovementMethod boolean lineEnd(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -551,6 +602,9 @@
     <item name='android.text.method.ScrollingMovementMethod boolean bottom(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.ScrollingMovementMethod boolean lineStart(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.ArrowKeyMovementMethod boolean leftWord(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -560,6 +614,9 @@
     <item name='android.text.method.ArrowKeyMovementMethod boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.BaseMovementMethod boolean end(android.widget.TextView, android.text.Spannable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.BaseMovementMethod boolean onKeyOther(android.widget.TextView, android.text.Spannable, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -581,9 +638,15 @@
     <item name='android.text.method.BaseMovementMethod boolean scrollLeft(android.widget.TextView, android.text.Spannable, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.TextKeyListener.Capitalize android.text.method.TextKeyListener.Capitalize valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.ArrowKeyMovementMethod boolean leftWord(android.widget.TextView, android.text.Spannable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.method.DialerKeyListener char[] getAcceptedChars()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.method.ScrollingMovementMethod boolean lineStart(android.widget.TextView, android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/android/text/style/annotations.xml b/android-sdk-annotations/android/text/style/annotations.xml
index 709cfcb2c8d..15d537fa470 100644
--- a/android-sdk-annotations/android/text/style/annotations.xml
+++ b/android-sdk-annotations/android/text/style/annotations.xml
@@ -14,9 +14,6 @@
     <item name='android.text.style.ReplacementSpan void draw(android.graphics.Canvas, java.lang.CharSequence, int, int, float, int, int, int, android.graphics.Paint) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.style.MetricAffectingSpan android.text.style.MetricAffectingSpan getUnderlying()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.style.LeadingMarginSpan.Standard void drawLeadingMargin(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, java.lang.CharSequence, int, int, boolean, android.text.Layout) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -38,6 +35,9 @@
     <item name='android.text.style.ForegroundColorSpan void updateDrawState(android.text.TextPaint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.style.LineHeightSpan.WithDensity void chooseHeight(java.lang.CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt, android.text.TextPaint) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.style.TypefaceSpan void updateMeasureState(android.text.TextPaint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -110,6 +110,9 @@
     <item name='android.text.style.AbsoluteSizeSpan void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.style.MetricAffectingSpan android.text.style.CharacterStyle getUnderlying()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.style.RelativeSizeSpan void updateMeasureState(android.text.TextPaint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -203,9 +206,6 @@
     <item name='android.text.style.ReplacementSpan void updateDrawState(android.text.TextPaint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.style.CharacterStyle android.text.style.CharacterStyle wrap(android.text.style.CharacterStyle)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.style.LeadingMarginSpan void drawLeadingMargin(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, java.lang.CharSequence, int, int, boolean, android.text.Layout) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -263,9 +263,6 @@
     <item name='android.text.style.IconMarginSpan void chooseHeight(java.lang.CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.style.MetricAffectingSpan android.text.style.CharacterStyle getUnderlying()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.style.StrikethroughSpan void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -299,6 +296,9 @@
     <item name='android.text.style.SuggestionSpan void updateDrawState(android.text.TextPaint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.style.CharacterStyle android.text.style.CharacterStyle wrap(android.text.style.CharacterStyle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.text.style.EasyEditSpan void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -353,4 +353,7 @@
     <item name='android.text.style.TextAppearanceSpan TextAppearanceSpan(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.text.style.MetricAffectingSpan android.text.style.MetricAffectingSpan getUnderlying()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/text/util/annotations.xml b/android-sdk-annotations/android/text/util/annotations.xml
index 9adaeb22b64..23d36be8d99 100644
--- a/android-sdk-annotations/android/text/util/annotations.xml
+++ b/android-sdk-annotations/android/text/util/annotations.xml
@@ -1,14 +1,38 @@
 <root>
-    <item name='android.text.util.Rfc822Token java.lang.String quoteNameIfNecessary(java.lang.String)'>
+    <item name='android.text.util.Rfc822Token java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.util.Rfc822Token java.lang.String quoteComment(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Rfc822Token java.lang.String quoteComment(java.lang.String)'>
+    <item name='android.text.util.Rfc822Tokenizer java.lang.CharSequence terminateToken(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Rfc822Tokenizer java.lang.CharSequence terminateToken(java.lang.CharSequence) 0'>
+    <item name='android.text.util.Linkify boolean addLinks(android.widget.TextView, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.util.Linkify boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.util.Linkify.TransformFilter java.lang.String transformUrl(java.util.regex.Matcher, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.util.Linkify void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.util.Rfc822Tokenizer void tokenize(java.lang.CharSequence, java.util.Collection&lt;android.text.util.Rfc822Token&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.util.Linkify.TransformFilter java.lang.String transformUrl(java.util.regex.Matcher, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.util.Linkify boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.util.Linkify void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.util.Rfc822Token java.lang.String quoteNameIfNecessary(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.util.Linkify void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String) 1'>
@@ -17,40 +41,28 @@
     <item name='android.text.util.Linkify boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Linkify boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.util.Linkify boolean addLinks(android.widget.TextView, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.util.Linkify void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String) 0'>
+    <item name='android.text.util.Rfc822Token java.lang.String quoteComment(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.util.Rfc822Tokenizer int findTokenStart(java.lang.CharSequence, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Rfc822Tokenizer android.text.util.Rfc822Token[] tokenize(java.lang.CharSequence)'>
+    <item name='android.text.util.Rfc822Token java.lang.String quoteName(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.util.Rfc822Tokenizer void tokenize(java.lang.CharSequence, java.util.Collection&lt;android.text.util.Rfc822Token&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Rfc822Token java.lang.String quoteName(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.util.Rfc822Tokenizer android.text.util.Rfc822Token[] tokenize(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Rfc822Token java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.text.util.Rfc822Tokenizer void tokenize(java.lang.CharSequence, java.util.Collection&lt;android.text.util.Rfc822Token&gt;) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.util.Rfc822Token java.lang.String quoteName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Linkify boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter) 0'>
+    <item name='android.text.util.Rfc822Token java.lang.String quoteNameIfNecessary(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.text.util.Rfc822Tokenizer android.text.util.Rfc822Token[] tokenize(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.util.Linkify boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter) 1'>
@@ -59,19 +71,13 @@
     <item name='android.text.util.Linkify boolean addLinks(android.text.Spannable, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Linkify void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter) 1'>
+    <item name='android.text.util.Linkify void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.text.util.Rfc822Tokenizer int findTokenEnd(java.lang.CharSequence, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Linkify void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.text.util.Rfc822Tokenizer java.lang.CharSequence terminateToken(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.text.util.Rfc822Token java.lang.String quoteNameIfNecessary(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/android/util/annotations.xml b/android-sdk-annotations/android/util/annotations.xml
index f4f4546a573..ec7557444ab 100644
--- a/android-sdk-annotations/android/util/annotations.xml
+++ b/android-sdk-annotations/android/util/annotations.xml
@@ -1,23 +1,38 @@
 <root>
-    <item name='android.util.SparseArray E valueAt(int)'>
+    <item name='android.util.AtomicFile byte[] readFully()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64InputStream Base64InputStream(java.io.InputStream, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.MonthDisplayHelper int[] getDigitsForRow(int)'>
+    <item name='android.util.IntProperty void setValue(T, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml.Encoding android.util.Xml.Encoding valueOf(java.lang.String)'>
+    <item name='android.util.Patterns java.lang.String digitsAndPlusOnly(java.util.regex.Matcher)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter endObject()'>
+    <item name='android.util.Spline java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Log java.lang.String getStackTraceString(java.lang.Throwable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter value(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.StringBuilderPrinter void println(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile java.io.FileInputStream openRead()'>
+    <item name='android.util.Xml.Encoding android.util.Xml.Encoding valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Base64OutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.StateSet int[] trimStateSet(int[], int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.AttributeSet java.lang.String getAttributeName(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TimeUtils void formatDuration(long, java.io.PrintWriter, int) 1'>
@@ -26,12 +41,18 @@
     <item name='android.util.StateSet boolean stateSetMatches(int[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.Xml org.xmlpull.v1.XmlPullParser newPullParser()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.StateSet java.lang.String dump(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonToken android.util.JsonToken valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.Base64 java.lang.String encodeToString(byte[], int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.DisplayMetrics boolean equals(android.util.DisplayMetrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,43 +62,64 @@
     <item name='android.util.IntProperty void set(T, java.lang.Integer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.FastImmutableArraySet java.util.Iterator&lt;T&gt; iterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.FloatProperty void set(T, java.lang.Float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Log int wtf(java.lang.String, java.lang.Throwable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Log java.lang.String getStackTraceString(java.lang.Throwable)'>
+    <item name='android.util.LruCache java.util.Map&lt;K,V&gt; snapshot()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter endObject()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonWriter void setIndent(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.LruCache V put(K, V) 1'>
+    <item name='android.util.TypedValue int complexToDimensionPixelOffset(int, android.util.DisplayMetrics) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.TypedValue int complexToDimensionPixelOffset(int, android.util.DisplayMetrics) 1'>
+    <item name='android.util.DisplayMetrics java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.LruCache V put(K, V) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64 byte[] decode(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter value(boolean)'>
+    <item name='android.util.Xml android.util.Xml.Encoding findEncodingByName(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Base64 java.lang.String encodeToString(byte[], int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.LogPrinter void println(java.lang.String) 0'>
+    <item name='android.util.Property V get(T)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.FloatProperty void set(java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml org.xmlpull.v1.XmlSerializer newSerializer()'>
+    <item name='android.util.LogPrinter void println(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Spline android.util.Spline createMonotoneCubicSpline(float[], float[])'>
+    <item name='android.util.AtomicFile java.io.FileOutputStream startWrite()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.AttributeSet java.lang.String getPositionDescription()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.TimeUtils java.lang.String formatUptime(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.LongSparseArray E valueAt(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.AtomicFile java.io.File getBaseFile()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Property V get(T) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.AtomicFile AtomicFile(java.io.File) 0'>
@@ -92,10 +134,10 @@
     <item name='android.util.TimeUtils void formatDuration(long, java.lang.StringBuilder) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.StateSet int[] trimStateSet(int[], int)'>
+    <item name='android.util.SparseArray E valueAt(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.LongSparseArray E valueAt(int)'>
+    <item name='android.util.LruCache java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TypedValue int complexToDimensionPixelSize(int, android.util.DisplayMetrics) 1'>
@@ -104,22 +146,19 @@
     <item name='android.util.TimeUtils void formatDuration(long, java.io.PrintWriter) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter value(long)'>
+    <item name='android.util.FloatProperty void setValue(T, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.IntProperty void set(java.lang.Object, java.lang.Object) 1'>
+    <item name='android.util.Property void set(T, V) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile java.io.File getBaseFile()'>
+    <item name='android.util.JsonReader java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonWriter android.util.JsonWriter value(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter beginArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.JsonReader java.lang.String toString()'>
+    <item name='android.util.IntProperty void set(java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TimeUtils void formatDuration(long, long, java.io.PrintWriter) 2'>
@@ -128,58 +167,61 @@
     <item name='android.util.JsonWriter android.util.JsonWriter name(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.StateSet java.lang.String dump(int[])'>
+    <item name='android.util.LogWriter void write(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64 byte[] encode(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.PrefixPrinter void println(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.TypedValue float complexToDimensionNoisy(int, android.util.DisplayMetrics) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Xml void parse(java.lang.String, org.xml.sax.ContentHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter name(java.lang.String)'>
+    <item name='android.util.JsonWriter android.util.JsonWriter value(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter nullValue()'>
+    <item name='android.util.Xml org.xmlpull.v1.XmlSerializer newSerializer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml android.util.Xml.Encoding findEncodingByName(java.lang.String)'>
+    <item name='android.util.LruCache void entryRemoved(boolean, K, V, V) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile java.io.FileOutputStream openAppend()'>
+    <item name='android.util.JsonWriter android.util.JsonWriter beginArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter beginObject()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.LruCache V remove(K) 0'>
+    <item name='android.util.TypedValue java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TypedValue float complexToDimension(int, android.util.DisplayMetrics) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile java.io.FileOutputStream startWrite()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Patterns java.lang.String concatGroups(java.util.regex.Matcher) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Log android.util.Log.TerribleFailureHandler setWtfHandler(android.util.Log.TerribleFailureHandler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Base64OutputStream Base64OutputStream(java.io.OutputStream, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.PrintStreamPrinter void println(java.lang.String) 0'>
+    <item name='android.util.LruCache V remove(K) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonWriter android.util.JsonWriter endArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Patterns java.lang.String digitsAndPlusOnly(java.util.regex.Matcher)'>
+    <item name='android.util.Patterns java.lang.String concatGroups(java.util.regex.Matcher) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Base64OutputStream Base64OutputStream(java.io.OutputStream, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Log android.util.Log.TerribleFailureHandler setWtfHandler(android.util.Log.TerribleFailureHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.StateSet java.lang.String dump(int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter value(java.lang.Number)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.PrintStreamPrinter void println(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonReader JsonReader(java.io.Reader) 0'>
@@ -188,46 +230,52 @@
     <item name='android.util.StateSet boolean isWildCard(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml android.util.AttributeSet asAttributeSet(org.xmlpull.v1.XmlPullParser)'>
+    <item name='android.util.JsonToken android.util.JsonToken valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Spline android.util.Spline createMonotoneCubicSpline(float[], float[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.DebugUtils void buildShortClassTag(java.lang.Object, java.lang.StringBuilder) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.FastImmutableArraySet java.util.Iterator&lt;T&gt; iterator()'>
+    <item name='android.util.AtomicFile java.io.FileOutputStream openAppend()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Property android.util.Property&lt;T,V&gt; of(java.lang.Class&lt;T&gt;, java.lang.Class&lt;V&gt;, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Xml android.util.AttributeSet asAttributeSet(org.xmlpull.v1.XmlPullParser)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64InputStream Base64InputStream(java.io.InputStream, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter beginObject()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Base64 java.lang.String encodeToString(byte[], int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Base64InputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.Property android.util.Property&lt;T,V&gt; of(java.lang.Class&lt;T&gt;, java.lang.Class&lt;V&gt;, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Xml.Encoding android.util.Xml.Encoding valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter value(double)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter name(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.Base64OutputStream Base64OutputStream(java.io.OutputStream, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonToken android.util.JsonToken valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter value(java.lang.Number)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.TypedValue java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.LruCache java.util.Map&lt;K,V&gt; snapshot()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Patterns java.lang.String concatGroups(java.util.regex.Matcher)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Spline java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Base64 java.lang.String encodeToString(byte[], int, int, int)'>
+    <item name='android.util.Pair android.util.Pair&lt;A,B&gt; create(A, B)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Spline android.util.Spline createMonotoneCubicSpline(float[], float[]) 1'>
@@ -236,37 +284,28 @@
     <item name='android.util.Xml void parse(java.io.InputStream, android.util.Xml.Encoding, org.xml.sax.ContentHandler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile byte[] readFully()'>
+    <item name='android.util.MonthDisplayHelper int[] getDigitsForRow(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.LruCache V put(K, V) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Pair android.util.Pair&lt;A,B&gt; create(A, B)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.DisplayMetrics java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.util.Printer void println(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64 byte[] decode(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Property android.util.Property&lt;T,V&gt; of(java.lang.Class&lt;T&gt;, java.lang.Class&lt;V&gt;, java.lang.String)'>
+    <item name='android.util.AtomicFile java.io.FileInputStream openRead()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.DebugUtils boolean isObjectSelected(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml org.xmlpull.v1.XmlPullParser newPullParser()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.util.JsonWriter JsonWriter(java.io.Writer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.LruCache java.lang.String toString()'>
+    <item name='android.util.JsonWriter android.util.JsonWriter nullValue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TypedValue float getDimension(android.util.DisplayMetrics) 0'>
@@ -290,10 +329,7 @@
     <item name='android.util.Property android.util.Property&lt;T,V&gt; of(java.lang.Class&lt;T&gt;, java.lang.Class&lt;V&gt;, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.TimeUtils java.lang.String formatUptime(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter value(double)'>
+    <item name='android.util.Patterns java.lang.String concatGroups(java.util.regex.Matcher)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TypedValue float applyDimension(int, float, android.util.DisplayMetrics) 2'>
diff --git a/android-sdk-annotations/android/view/accessibility/annotations.xml b/android-sdk-annotations/android/view/accessibility/annotations.xml
index 6b4138cfdc1..f6ae20897b0 100644
--- a/android-sdk-annotations/android/view/accessibility/annotations.xml
+++ b/android-sdk-annotations/android/view/accessibility/annotations.xml
@@ -1,20 +1,89 @@
 <root>
+    <item name='android.view.accessibility.IAccessibilityInteractionConnectionCallback.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.accessibility.AccessibilityNodeInfo void getBoundsInScreen(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.accessibility.IAccessibilityManager.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityEvent void initFromParcel(android.os.Parcel) 0'>
+    <item name='android.view.accessibility.AccessibilityInteractionClient java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByViewId(int, int, long, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityManager java.util.List&lt;android.accessibilityservice.AccessibilityServiceInfo&gt; getEnabledAccessibilityServiceList(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityManager int addAccessibilityInteractionConnection(android.view.IWindow, android.view.accessibility.IAccessibilityInteractionConnection, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo android.util.SparseLongArray getChildNodeIds()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityManager AccessibilityManager(android.content.Context, android.view.accessibility.IAccessibilityManager, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo void setBoundsInScreen(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityInteractionClient android.view.accessibility.AccessibilityInteractionClient getInstanceForThread(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityManagerClient.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityInteractionConnection.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityManager void registerUiTestAutomationService(android.os.IBinder, android.accessibilityservice.IAccessibilityServiceClient, android.accessibilityservice.AccessibilityServiceInfo) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityEvent java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo void setBoundsInParent(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfoCache void add(android.view.accessibility.AccessibilityNodeInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityInteractionClient void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityEventSource void sendAccessibilityEventUnchecked(android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityManager android.view.accessibility.IAccessibilityManagerClient getClient()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityManagerClient.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityManager java.util.List&lt;android.accessibilityservice.AccessibilityServiceInfo&gt; getInstalledAccessibilityServiceList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityInteractionConnectionCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByText(java.lang.String)'>
+    <item name='android.view.accessibility.AccessibilityEvent void initFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain()'>
+    <item name='android.view.accessibility.AccessibilityNodeInfo java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByText(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityManager void sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
@@ -23,31 +92,22 @@
     <item name='android.view.accessibility.AccessibilityNodeInfoCache void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityInteractionClient android.view.accessibility.AccessibilityInteractionClient getInstance()'>
+    <item name='android.view.accessibility.AccessibilityNodeInfo java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByViewId(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo android.util.SparseLongArray getChildNodeIds()'>
+    <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityManager java.util.List&lt;android.accessibilityservice.AccessibilityServiceInfo&gt; getEnabledAccessibilityServiceList(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo void setBoundsInScreen(android.graphics.Rect) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityManager AccessibilityManager(android.content.Context, android.view.accessibility.IAccessibilityManager, int) 0'>
+    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityManager void createAsSharedAcrossUsers(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.IAccessibilityManagerClient.Stub android.os.IBinder asBinder()'>
+    <item name='android.view.accessibility.IAccessibilityInteractionConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.IAccessibilityInteractionConnection.Stub android.os.IBinder asBinder()'>
+    <item name='android.view.accessibility.AccessibilityManager java.util.List&lt;android.content.pm.ServiceInfo&gt; getAccessibilityServiceList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain(android.view.accessibility.AccessibilityEvent) 0'>
@@ -56,88 +116,64 @@
     <item name='android.view.accessibility.AccessibilityEvent java.lang.String eventTypeToString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityManager android.view.accessibility.IAccessibilityManagerClient getClient()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByViewId(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityRecord java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo void getBoundsInParent(android.graphics.Rect) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityRecord android.view.accessibility.AccessibilityRecord obtain(android.view.accessibility.AccessibilityRecord)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo void setBoundsInParent(android.graphics.Rect) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityInteractionClient java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByText(int, int, long, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfoCache void add(android.view.accessibility.AccessibilityNodeInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityManager java.util.List&lt;android.content.pm.ServiceInfo&gt; getAccessibilityServiceList()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityEventSource void sendAccessibilityEventUnchecked(android.view.accessibility.AccessibilityEvent) 0'>
+    <item name='android.view.accessibility.AccessibilityInteractionClient android.view.accessibility.AccessibilityInteractionClient getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityInteractionClient void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
+    <item name='android.view.accessibility.IAccessibilityManager void removeAccessibilityInteractionConnection(android.view.IWindow) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityInteractionConnectionCallback.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityRecord java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo void getBoundsInParent(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityRecord android.view.accessibility.AccessibilityRecord obtain(android.view.accessibility.AccessibilityRecord) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.accessibility.IAccessibilityManager void unregisterUiTestAutomationService(android.accessibilityservice.IAccessibilityServiceClient) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.accessibility.AccessibilityEvent void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityEvent java.lang.String toString()'>
+    <item name='android.view.accessibility.AccessibilityNodeInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityInteractionClient android.view.accessibility.AccessibilityInteractionClient getInstanceForThread(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityRecord android.view.accessibility.AccessibilityRecord obtain()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.IAccessibilityInteractionConnectionCallback.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityInteractionClient java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByViewId(int, int, long, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.AccessibilityRecord java.util.List&lt;java.lang.CharSequence&gt; getText()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.accessibility.IAccessibilityManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+    <item name='android.view.accessibility.IAccessibilityManagerClient.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.accessibility.AccessibilityEvent android.view.accessibility.AccessibilityEvent obtain(android.view.accessibility.AccessibilityEvent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.accessibility.AccessibilityManager java.util.List&lt;android.accessibilityservice.AccessibilityServiceInfo&gt; getInstalledAccessibilityServiceList()'>
+    <item name='android.view.accessibility.IAccessibilityInteractionConnection.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityRecord java.util.List&lt;java.lang.CharSequence&gt; getText()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityInteractionClient java.util.List&lt;android.view.accessibility.AccessibilityNodeInfo&gt; findAccessibilityNodeInfosByText(int, int, long, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeInfo obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityRecord android.view.accessibility.AccessibilityRecord obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.AccessibilityRecord android.view.accessibility.AccessibilityRecord obtain(android.view.accessibility.AccessibilityRecord)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.accessibility.IAccessibilityManager int addClient(android.view.accessibility.IAccessibilityManagerClient, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/view/animation/annotations.xml b/android-sdk-annotations/android/view/animation/annotations.xml
index 0b78776b712..4d8020b14ff 100644
--- a/android-sdk-annotations/android/view/animation/annotations.xml
+++ b/android-sdk-annotations/android/view/animation/annotations.xml
@@ -17,9 +17,6 @@
     <item name='android.view.animation.AnimationSet AnimationSet(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInAnimation(android.content.Context, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.animation.Animation Animation(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -35,9 +32,15 @@
     <item name='android.view.animation.LayoutAnimationController long getDelayForView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.AnimationSet android.view.animation.Animation clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.AnimationSet void addAnimation(android.view.animation.Animation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInAnimation(android.content.Context, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.ScaleAnimation void applyTransformation(float, android.view.animation.Transformation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -62,12 +65,6 @@
     <item name='android.view.animation.Transformation void compose(android.view.animation.Transformation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.AnimationSet android.view.animation.AnimationSet clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.animation.AnimationSet android.view.animation.Animation clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.animation.AnimationSet AnimationSet(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -83,9 +80,6 @@
     <item name='android.view.animation.LayoutAnimationController void setAnimation(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.AnimationSet java.util.List&lt;android.view.animation.Animation&gt; getAnimations()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.animation.Animation boolean getTransformation(long, android.view.animation.Transformation, float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -101,9 +95,6 @@
     <item name='android.view.animation.Animation void getInvalidateRegion(int, int, int, int, android.graphics.RectF, android.view.animation.Transformation) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.AnimationSet java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.animation.TranslateAnimation void applyTransformation(float, android.view.animation.Transformation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -122,7 +113,10 @@
     <item name='android.view.animation.AnticipateOvershootInterpolator AnticipateOvershootInterpolator(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.Transformation java.lang.String toShortString()'>
+    <item name='android.view.animation.AnimationSet java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.animation.AnimationSet java.util.List&lt;android.view.animation.Animation&gt; getAnimations()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.AlphaAnimation AlphaAnimation(android.content.Context, android.util.AttributeSet) 0'>
@@ -140,9 +134,6 @@
     <item name='android.view.animation.AccelerateInterpolator AccelerateInterpolator(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeOutAnimation(android.content.Context, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.animation.LayoutAnimationController android.view.animation.Animation getAnimationForView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -152,18 +143,15 @@
     <item name='android.view.animation.LayoutAnimationController int getTransformedIndex(android.view.animation.LayoutAnimationController.AnimationParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeOutAnimation(android.content.Context, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.Animation void getInvalidateRegion(int, int, int, int, android.graphics.RectF, android.view.animation.Transformation) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.Transformation java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.animation.AnimationUtils android.view.animation.Animation loadAnimation(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.Animation android.view.animation.Animation clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInAnimation(android.content.Context, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -182,7 +170,7 @@
     <item name='android.view.animation.Transformation void postCompose(android.view.animation.Transformation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInChildBottomAnimation(android.content.Context)'>
+    <item name='android.view.animation.Animation java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.Animation void applyTransformation(float, android.view.animation.Transformation) 1'>
@@ -191,16 +179,28 @@
     <item name='android.view.animation.OvershootInterpolator OvershootInterpolator(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.AnimationUtils android.view.animation.Animation makeInChildBottomAnimation(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.animation.Animation android.view.animation.Animation clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.AlphaAnimation void applyTransformation(float, android.view.animation.Transformation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.Transformation java.lang.String toShortString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.animation.Transformation void printShortString(java.io.PrintWriter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.animation.Animation java.lang.Object clone()'>
+    <item name='android.view.animation.AnimationSet android.view.animation.AnimationSet clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.animation.TranslateAnimation TranslateAnimation(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.animation.Transformation java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/view/annotations.xml b/android-sdk-annotations/android/view/annotations.xml
index 2464dbb50c0..03a3f1b449d 100644
--- a/android-sdk-annotations/android/view/annotations.xml
+++ b/android-sdk-annotations/android/view/annotations.xml
@@ -5,7 +5,16 @@
     <item name='android.view.View void saveHierarchyState(android.util.SparseArray&lt;android.os.Parcelable&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, int, android.view.MotionEvent.PointerProperties[], android.view.MotionEvent.PointerCoords[], int, int, float, float, int, int, int, int)'>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationYBy(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewDebug.RecyclerTraceType android.view.ViewDebug.RecyclerTraceType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Menu android.view.MenuItem add(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.SubMenu android.view.SubMenu setHeaderView(android.view.View)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyEvent android.view.KeyEvent changeTimeRepeat(android.view.KeyEvent, long, int) 0'>
@@ -17,6 +26,12 @@
     <item name='android.view.View void onDrawVerticalScrollBar(android.graphics.Canvas, android.graphics.drawable.Drawable, int, int, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.KeyEvent android.view.KeyEvent copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MenuItem android.view.MenuItem setChecked(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.LayoutInflater.Filter boolean onLoadClass(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,19 +41,31 @@
     <item name='android.view.WindowManagerImpl void removeViewImmediate(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewGroup boolean showContextMenuForChild(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.InputQueue.Callback void onInputQueueCreated(android.view.InputQueue) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.AccessibilityIterators.AbstractTextSegmentIterator void initialize(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.AbsSavedState AbsSavedState(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent clampNoHistory(float, float, float, float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.ScaleGestureDetector ScaleGestureDetector(android.content.Context, android.view.ScaleGestureDetector.OnScaleGestureListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.WindowId java.lang.String toString()'>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator translationXBy(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindowId.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IRotationWatcher.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindowManager android.view.IWindowSession openSession(com.android.internal.view.IInputMethodClient, com.android.internal.view.IInputContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewParent android.view.ViewParent invalidateChildInParent(int[], android.graphics.Rect) 1'>
@@ -47,36 +74,39 @@
     <item name='android.view.View boolean dispatchHoverEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.InputDevice java.util.List&lt;android.view.InputDevice.MotionRange&gt; getMotionRanges()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.IMagnificationCallbacks.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.IOnKeyguardExitResult.Stub android.os.IBinder asBinder()'>
+    <item name='android.view.WindowManagerPolicy void getContentInsetHintLw(android.view.WindowManager.LayoutParams, android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyEvent.Callback boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.Window android.os.Bundle saveHierarchyState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View boolean startDrag(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewGroup android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+    <item name='android.view.MenuItem android.view.MenuItem setIcon(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderView(android.view.View)'>
+    <item name='android.view.InputEvent android.view.InputEvent copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.Display void getSize(android.graphics.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.WindowManager.LayoutParams java.lang.String toString()'>
+    <item name='android.view.View.OnLongClickListener boolean onLongClick(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MenuItem android.view.MenuItem setActionProvider(android.view.ActionProvider)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewParent boolean getChildVisibleRect(android.view.View, android.graphics.Rect, android.graphics.Point) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MenuItem android.view.MenuItem setCheckable(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View.AccessibilityDelegate void onPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -89,7 +119,10 @@
     <item name='android.view.SurfaceControl void screenshot(android.os.IBinder, android.view.Surface, int, int, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator scaleYBy(float)'>
+    <item name='android.view.View.OnHoverListener boolean onHover(android.view.View, android.view.MotionEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ActionMode.Callback boolean onCreateActionMode(android.view.ActionMode, android.view.Menu) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.LayoutInflater android.view.View inflate(org.xmlpull.v1.XmlPullParser, android.view.ViewGroup) 0'>
@@ -101,15 +134,18 @@
     <item name='android.view.Surface void transferFrom(android.view.Surface) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MagnificationSpec android.view.MagnificationSpec obtain(android.view.MagnificationSpec) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.View.AccessibilityDelegate void onInitializeAccessibilityNodeInfo(android.view.View, android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MagnificationSpec android.view.MagnificationSpec obtain(android.view.MagnificationSpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup boolean fitSystemWindows(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.DragEvent java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View boolean performButtonActionOnTouchDown(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -119,16 +155,28 @@
     <item name='android.view.ViewGroup boolean dispatchTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManager.LayoutParams java.lang.String debug(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Menu android.view.MenuItem add(int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowId void registerFocusObserver(android.view.IWindowFocusObserver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceControl void screenshot(android.os.IBinder, android.view.Surface, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MenuItem.OnMenuItemClickListener boolean onMenuItemClick(android.view.MenuItem) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.LayoutInflater android.view.View onCreateView(java.lang.String, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent android.view.KeyEvent changeTimeRepeat(android.view.KeyEvent, long, int, int)'>
+    <item name='android.view.WindowManagerPolicy.WindowState android.graphics.Rect getOverscanFrameLw()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 1'>
@@ -137,7 +185,7 @@
     <item name='android.view.FocusFinderHelper boolean beamsOverlap(int, android.graphics.Rect, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View java.util.ArrayList&lt;android.view.View&gt; getFocusables(int)'>
+    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderTitle(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewRootImpl void onHardwarePreDraw(android.view.HardwareCanvas) 0'>
@@ -146,12 +194,6 @@
     <item name='android.view.InputEventConsistencyVerifier void onTrackballEvent(android.view.MotionEvent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.VelocityTracker android.view.VelocityTracker obtain()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.TextureView android.graphics.Matrix getTransform(android.graphics.Matrix)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.View.AccessibilityDelegate android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -161,43 +203,61 @@
     <item name='android.view.ViewGroup void removeDetachedView(android.view.View, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy boolean doesForceHide(android.view.WindowManagerPolicy.WindowState, android.view.WindowManager.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinderHelper boolean isBetterCandidate(int, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, float, float, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.KeyEvent.Callback boolean onKeyUp(int, android.view.KeyEvent) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.Gravity void apply(int, int, int, android.graphics.Rect, android.graphics.Rect, int) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MagnificationSpec android.view.MagnificationSpec obtain(android.view.MagnificationSpec)'>
+    <item name='android.view.KeyEvent.Callback boolean onKeyUp(int, android.view.KeyEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindowManager android.view.IWindowSession openSession(com.android.internal.view.IInputMethodClient, com.android.internal.view.IInputContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindowId.Stub android.os.IBinder asBinder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.Display void getCurrentSizeRange(android.graphics.Point, android.graphics.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ScaleGestureDetector.SimpleOnScaleGestureListener boolean onScaleBegin(android.view.ScaleGestureDetector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindow.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.View.OnAttachStateChangeListener void onViewDetachedFromWindow(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy void getContentInsetHintLw(android.view.WindowManager.LayoutParams, android.graphics.Rect) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.Gravity void applyDisplay(int, android.graphics.Rect, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ActionMode android.view.MenuInflater getMenuInflater()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean dispatchGenericPointerEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent android.view.KeyEvent obtain(android.view.KeyEvent) 0'>
+    <item name='android.view.View boolean onDragEvent(android.view.DragEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.Display void getRectSize(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View boolean onDragEvent(android.view.DragEvent) 0'>
+    <item name='android.view.KeyEvent android.view.KeyEvent obtain(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewParent void bringChildToFront(android.view.View) 0'>
@@ -206,19 +266,25 @@
     <item name='android.view.ViewGroup boolean getChildStaticTransformation(android.view.View, android.view.animation.Transformation) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator withEndAction(java.lang.Runnable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.OrientationListener OrientationListener(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy.WindowState void computeFrameLw(android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.WindowManagerGlobal void removeView(android.view.View, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void getLocationInWindow(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent java.lang.String toString()'>
+    <item name='android.view.KeyEvent boolean dispatch(android.view.KeyEvent.Callback, android.view.KeyEvent.DispatcherState, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent boolean dispatch(android.view.KeyEvent.Callback, android.view.KeyEvent.DispatcherState, java.lang.Object) 0'>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator setStartDelay(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.GestureDetector.SimpleOnGestureListener boolean onScroll(android.view.MotionEvent, android.view.MotionEvent, float, float) 0'>
@@ -230,6 +296,15 @@
     <item name='android.view.MotionEvent int axisFromString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator scaleY(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IInputFilterHost.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowState android.graphics.Rect getDisplayFrameLw()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.KeyEvent boolean dispatch(android.view.KeyEvent.Callback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -239,31 +314,28 @@
     <item name='android.view.View.AccessibilityDelegate boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.DragEvent android.view.DragEvent obtain(android.view.DragEvent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator withLayer()'>
+    <item name='android.view.View android.view.View findViewByPredicateTraversal(com.android.internal.util.Predicate&lt;android.view.View&gt;, android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View android.view.View findViewByPredicateTraversal(com.android.internal.util.Predicate&lt;android.view.View&gt;, android.view.View) 0'>
+    <item name='android.view.ViewGroup void dispatchThawSelfOnly(android.util.SparseArray&lt;android.os.Parcelable&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewGroup void dispatchThawSelfOnly(android.util.SparseArray&lt;android.os.Parcelable&gt;) 0'>
+    <item name='android.view.WindowManagerPolicy int getSystemDecorRectLw(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void cleanupLayoutState(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.Display void getCurrentSizeRange(android.graphics.Point, android.graphics.Point) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyCharacterMap android.view.KeyEvent[] getEvents(char[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.ActionProvider android.view.View onCreateActionView(android.view.MenuItem)'>
+    <item name='android.view.MotionEvent android.view.InputEvent copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.SurfaceView void dispatchDraw(android.graphics.Canvas) 0'>
@@ -275,9 +347,27 @@
     <item name='android.view.KeyCharacterMap android.view.KeyEvent[] getEvents(char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowSession.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.Gravity void apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ScaleGestureDetector.OnScaleGestureListener void onScaleEnd(android.view.ScaleGestureDetector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Surface java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MotionEvent android.view.MotionEvent obtainNoHistory(android.view.MotionEvent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, int, float, float, float, float, int, float, float, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator alpha(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.Window.Callback boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -290,18 +380,24 @@
     <item name='android.view.ViewDebug void dumpCapturedView(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.InputDevice java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.View.AccessibilityDelegate boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, int, android.view.MotionEvent.PointerProperties[], android.view.MotionEvent.PointerCoords[], int, int, float, float, int, int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void dispatchRestoreInstanceState(android.util.SparseArray&lt;android.os.Parcelable&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.View.AccessibilityDelegate boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindowSession boolean performHapticFeedback(android.view.IWindow, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.DisplayInfo void copyFrom(android.view.DisplayInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ScaleGestureDetector.SimpleOnScaleGestureListener boolean onScale(android.view.ScaleGestureDetector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.WindowManagerImpl void addView(android.view.View, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -317,28 +413,31 @@
     <item name='android.view.Surface void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator scaleX(float)'>
+    <item name='android.view.IInputFilterHost.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, float, float, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowState void computeFrameLw(android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean getLocalVisibleRect(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MenuItem android.view.MenuItem setIntent(android.content.Intent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinder android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.IWindowSession.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.PointerIcon android.view.PointerIcon createCustomIcon(android.graphics.Bitmap, float, float)'>
+    <item name='android.view.Surface java.lang.String rotationToString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean dispatchTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.IWindowSession.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.DisplayInfo java.lang.String toString()'>
+    <item name='android.view.IWindowSession.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.TouchDelegate TouchDelegate(android.graphics.Rect, android.view.View) 1'>
@@ -347,28 +446,79 @@
     <item name='android.view.KeyEvent KeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.KeyEvent android.view.KeyEvent changeTimeRepeat(android.view.KeyEvent, long, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MenuItem android.view.MenuItem setNumericShortcut(char)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.DisplayInfo DisplayInfo(android.view.DisplayInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View.MeasureSpec java.lang.String toString(int)'>
+    <item name='android.view.WindowManagerGlobal java.lang.String[] getViewRootNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean dispatchKeyShortcutEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.LayoutInflater android.view.LayoutInflater from(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.LayoutInflater.Factory2 android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewDebug.HierarchyTraceType android.view.ViewDebug.HierarchyTraceType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.View.OnHoverListener boolean onHover(android.view.View, android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ActionMode.Callback boolean onCreateActionMode(android.view.ActionMode, android.view.Menu) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.HardwareCanvas void setBitmap(android.graphics.Bitmap) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.View.AccessibilityDelegate android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View android.view.inputmethod.InputConnection onCreateInputConnection(android.view.inputmethod.EditorInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ScaleGestureDetector.OnScaleGestureListener boolean onScaleBegin(android.view.ScaleGestureDetector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IOnKeyguardExitResult.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewConfiguration android.view.ViewConfiguration get(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MenuItem android.view.MenuItem setOnMenuItemClickListener(android.view.MenuItem.OnMenuItemClickListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceControl android.os.IBinder createDisplay(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator translationX(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindowManager int watchRotation(android.view.IRotationWatcher) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.DisplayList android.graphics.Matrix getMatrix(android.graphics.Matrix) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup void addView(android.view.View, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.IWindowId.Stub android.os.IBinder asBinder()'>
+    <item name='android.view.View.AccessibilityDelegate void onPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.SubMenu android.view.SubMenu setHeaderIcon(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowState void computeFrameLw(android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.WindowId void registerFocusObserver(android.view.WindowId.FocusObserver) 0'>
@@ -377,13 +527,13 @@
     <item name='android.view.SurfaceView SurfaceView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent android.view.KeyEvent copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.View void onDrawVerticalScrollBar(android.graphics.Canvas, android.graphics.drawable.Drawable, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyCharacterMap.FallbackAction android.view.KeyCharacterMap.FallbackAction obtain()'>
+    <item name='android.view.IWindowSession void reportDropResult(android.view.IWindow, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderTitle(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void removeView(android.view.View) 0'>
@@ -395,55 +545,79 @@
     <item name='android.view.ViewGroup boolean dispatchTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowId java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup boolean drawChild(android.graphics.Canvas, android.view.View, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowSession void setTransparentRegion(android.view.IWindow, android.graphics.Region) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup.LayoutParams void setBaseAttributes(android.content.res.TypedArray, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.View.OnKeyListener boolean onKey(android.view.View, int, android.view.KeyEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.InputEventReceiver void onInputEvent(android.view.InputEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.LayoutInflater.Factory2 android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.SurfaceControl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceControl void screenshot(android.os.IBinder, android.view.Surface) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyCharacterMap void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.LayoutInflater android.view.LayoutInflater from(android.content.Context)'>
+    <item name='android.view.IWindowSession int relayout(android.view.IWindow, int, android.view.WindowManager.LayoutParams, int, int, int, int, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.content.res.Configuration, android.view.Surface) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.IWindowId.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.SubMenu android.view.SubMenu setIcon(int)'>
+    <item name='android.view.MenuItem android.view.MenuItem setEnabled(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void invalidateDrawable(android.graphics.drawable.Drawable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy long interceptKeyBeforeDispatching(android.view.WindowManagerPolicy.WindowState, android.view.KeyEvent, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.DisplayInfo void getLogicalMetrics(android.util.DisplayMetrics, android.view.CompatibilityInfoHolder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator setDuration(long)'>
+    <item name='android.view.PointerIcon android.view.PointerIcon load(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewRootImpl boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewManager void removeView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.VelocityTracker android.view.VelocityTracker obtain(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceView SurfaceView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent android.view.KeyEvent obtain(android.view.KeyEvent)'>
+    <item name='android.view.ViewRootImpl boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.View void getWindowVisibleDisplayFrame(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.SurfaceHolder.Callback2 void surfaceRedrawNeeded(android.view.SurfaceHolder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View void getWindowVisibleDisplayFrame(android.graphics.Rect) 0'>
+    <item name='android.view.MotionEvent android.view.MotionEvent split(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup boolean getChildVisibleRect(android.view.View, android.graphics.Rect, android.graphics.Point) 0'>
@@ -464,25 +638,40 @@
     <item name='android.view.View void addTouchables(java.util.ArrayList&lt;android.view.View&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ActionProvider void onPrepareSubMenu(android.view.SubMenu) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.View boolean computeFitSystemWindows(android.graphics.Rect, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ActionProvider void onPrepareSubMenu(android.view.SubMenu) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IMagnificationCallbacks void onMagnifedBoundsChanged(android.graphics.Region) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewParent void requestChildFocus(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewStub android.view.View inflate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator scaleYBy(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View boolean requestRectangleOnScreen(android.graphics.Rect, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void measureChild(android.view.View, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.View View(android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.KeyEvent char getMatch(char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View View(android.content.Context) 0'>
+    <item name='android.view.TextureView android.graphics.Matrix getTransform(android.graphics.Matrix)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.VelocityTracker android.view.VelocityTracker obtain()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void getDrawingRect(android.graphics.Rect) 0'>
@@ -491,30 +680,12 @@
     <item name='android.view.WindowManagerImpl void updateViewLayout(android.view.View, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator withEndAction(java.lang.Runnable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator alphaBy(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.Surface android.graphics.Canvas lockCanvas(android.graphics.Rect)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.KeyEvent.DispatcherState void handleUpEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.TextureView TextureView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.WindowManagerGlobal java.lang.String[] getViewRootNames()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator setInterpolator(android.animation.TimeInterpolator)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent split(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.VelocityTracker void addMovement(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -527,10 +698,10 @@
     <item name='android.view.ContextThemeWrapper java.lang.Object getSystemService(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View View(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.view.View void addChildrenForAccessibility(java.util.ArrayList&lt;android.view.View&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View void addChildrenForAccessibility(java.util.ArrayList&lt;android.view.View&gt;) 0'>
+    <item name='android.view.View View(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.WindowId void unregisterFocusObserver(android.view.WindowId.FocusObserver) 0'>
@@ -539,18 +710,24 @@
     <item name='android.view.View boolean computeFitSystemWindows(android.graphics.Rect, android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.SubMenu android.view.SubMenu setHeaderIcon(int)'>
+    <item name='android.view.IWindowSession boolean performDrag(android.view.IWindow, android.os.IBinder, float, float, float, float, android.content.ClipData) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyEvent char getMatch(char[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewRootImpl android.view.ViewParent invalidateChildInParent(int[], android.graphics.Rect) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup void attachViewToParent(android.view.View, int, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean fitSystemWindows(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.InputDevice java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewRootImpl void dispatchUnhandledKey(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -560,36 +737,48 @@
     <item name='android.view.PointerIcon android.view.PointerIcon getDefaultIcon(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationXBy(float)'>
+    <item name='android.view.ViewGroup android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.Gravity void apply(int, int, int, android.graphics.Rect, android.graphics.Rect) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.InputChannel java.lang.String getName()'>
+    <item name='android.view.WindowManager.LayoutParams java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.Window.Callback boolean dispatchTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.LayoutInflater android.view.View createView(java.lang.String, java.lang.String, android.util.AttributeSet) 2'>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationXBy(float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.DisplayInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.LayoutInflater android.view.View createView(java.lang.String, java.lang.String, android.util.AttributeSet) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MenuItem android.view.MenuItem setOnActionExpandListener(android.view.MenuItem.OnActionExpandListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup ViewGroup(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.TextureView TextureView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent obtainNoHistory(android.view.MotionEvent)'>
+    <item name='android.view.ActionProvider android.view.View onCreateActionView()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Window.Callback boolean dispatchGenericMotionEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.WindowManagerImpl void removeView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.LayoutInflater android.view.LayoutInflater cloneInContext(android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.InputEventConsistencyVerifier void onTouchEvent(android.view.MotionEvent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -599,6 +788,9 @@
     <item name='android.view.ViewGroup void requestChildFocus(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MenuItem android.view.MenuItem setVisible(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.MotionEvent.PointerCoords void copyFrom(android.view.MotionEvent.PointerCoords) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -608,30 +800,45 @@
     <item name='android.view.ViewConfiguration android.view.ViewConfiguration get(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View java.lang.String toString()'>
+    <item name='android.view.Gravity void apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Gravity void apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect) 3'>
+    <item name='android.view.ViewParent boolean showContextMenuForChild(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.SurfaceControl void unblankDisplay(android.os.IBinder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.LayoutInflater LayoutInflater(android.view.LayoutInflater, android.content.Context) 0'>
+    <item name='android.view.IWindowManager void getWindowFrame(android.os.IBinder, android.graphics.Rect) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Window android.view.WindowManager.LayoutParams getAttributes()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.Gravity void apply(int, int, int, android.graphics.Rect, android.graphics.Rect) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View android.view.View getRootView()'>
+    <item name='android.view.LayoutInflater LayoutInflater(android.view.LayoutInflater, android.content.Context) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationBy(float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewStub ViewStub(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowManager void setAppOrientation(android.view.IApplicationToken, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowState android.graphics.Rect getContentFrameLw()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.InputChannel void transferTo(android.view.InputChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowFocusObserver.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewRootImpl void dumpGfxInfo(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -641,7 +848,19 @@
     <item name='android.view.View.DragShadowBuilder void onProvideShadowMetrics(android.graphics.Point, android.graphics.Point) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, float, float, float, float, int, float, float, int, int)'>
+    <item name='android.view.ActionMode.Callback boolean onActionItemClicked(android.view.ActionMode, android.view.MenuItem) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IMagnificationCallbacks.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy boolean canBeForceHidden(android.view.WindowManagerPolicy.WindowState, android.view.WindowManager.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator alphaBy(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowManagerFuncs android.view.WindowManagerPolicy.FakeWindow addFakeWindow(android.os.Looper, android.view.InputEventReceiver.Factory, java.lang.String, int, int, boolean, boolean, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void addTouchables(java.util.ArrayList&lt;android.view.View&gt;) 0'>
@@ -650,7 +869,7 @@
     <item name='android.view.Surface void copyFrom(android.view.SurfaceControl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewDebug.RecyclerTraceType android.view.ViewDebug.RecyclerTraceType valueOf(java.lang.String)'>
+    <item name='android.view.ViewRootImpl void bringChildToFront(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void onDrawHorizontalScrollBar(android.graphics.Canvas, android.graphics.drawable.Drawable, int, int, int, int) 0'>
@@ -659,7 +878,7 @@
     <item name='android.view.Gravity void applyDisplay(int, android.graphics.Rect, android.graphics.Rect) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MagnificationSpec java.lang.String toString()'>
+    <item name='android.view.InputDevice java.util.List&lt;android.view.InputDevice.MotionRange&gt; getMotionRanges()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void addChildrenForAccessibility(java.util.ArrayList&lt;android.view.View&gt;) 0'>
@@ -668,9 +887,6 @@
     <item name='android.view.View void dispatchConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator yBy(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.InputDevice void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -680,13 +896,19 @@
     <item name='android.view.KeyEvent.DispatcherState boolean isTracking(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy void selectRotationAnimationLw(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IMagnificationCallbacks.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.Choreographer void postFrameCallback(android.view.Choreographer.FrameCallback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewGroup boolean dispatchGenericFocusedEvent(android.view.MotionEvent) 0'>
+    <item name='android.view.PointerIcon android.view.PointerIcon loadCustomIcon(android.content.res.Resources, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.SubMenu android.view.SubMenu setHeaderIcon(android.graphics.drawable.Drawable)'>
+    <item name='android.view.ViewGroup boolean dispatchGenericFocusedEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.TextureView TextureView(android.content.Context, android.util.AttributeSet) 1'>
@@ -695,43 +917,79 @@
     <item name='android.view.ViewStub ViewStub(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MotionEvent android.view.MotionEvent createFromParcelBody(android.os.Parcel)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.PointerIcon android.view.PointerIcon createCustomIcon(android.graphics.Bitmap, float, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup boolean dispatchKeyShortcutEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MotionEvent android.view.MotionEvent copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup void dispatchDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowSession.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.VolumePanel void onClick(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Window boolean performPanelShortcut(int, int, android.view.KeyEvent, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator xBy(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.LayoutInflater void setFactory2(android.view.LayoutInflater.Factory2) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.IApplicationToken.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator translationXBy(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.IWindowManager.Stub android.os.IBinder asBinder()'>
+    <item name='android.view.ViewRootImpl void requestChildFocus(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void endViewTransition(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowManager void addAppToken(int, android.view.IApplicationToken, int, int, boolean, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.MotionEvent void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup boolean dispatchDragEvent(android.view.DragEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IMagnificationCallbacks.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.TextureView TextureView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.InputChannel android.view.InputChannel dup()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup ViewGroup(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.IWindow.Stub android.os.IBinder asBinder()'>
+    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderIcon(android.graphics.drawable.Drawable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindow.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.KeyEvent android.view.KeyEvent obtain(long, long, int, int, int, int, int, int, int, int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewRootImpl boolean showContextMenuForChild(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.InputDevice int[] getDeviceIds()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyCharacterMap boolean[] deviceHasKeys(int[]) 0'>
@@ -740,10 +998,13 @@
     <item name='android.view.ViewDebug android.view.View findView(android.view.View, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.WindowId void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationY(float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderIcon(android.graphics.drawable.Drawable)'>
+    <item name='android.view.Menu boolean performShortcut(int, android.view.KeyEvent, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowId void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View.OnTouchListener boolean onTouch(android.view.View, android.view.MotionEvent) 1'>
@@ -752,7 +1013,7 @@
     <item name='android.view.InputEventReceiver InputEventReceiver(android.view.InputChannel, android.os.Looper) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewDebug.HierarchyTraceType android.view.ViewDebug.HierarchyTraceType valueOf(java.lang.String)'>
+    <item name='android.view.Window void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.IApplicationToken.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
@@ -779,12 +1040,36 @@
     <item name='android.view.InputFilter void onInputEvent(android.view.InputEvent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.Menu android.view.MenuItem add(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceControl SurfaceControl(android.view.SurfaceSession, java.lang.String, int, int, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.KeyCharacterMap android.view.KeyEvent[] getEvents(char[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.HardwareRenderer android.view.DisplayList createDisplayList(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Window void setContentView(android.view.View, android.view.ViewGroup.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy int checkAddPermission(android.view.WindowManager.LayoutParams, int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindowManager void removeRotationWatcher(android.view.IRotationWatcher) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.Gravity void applyDisplay(int, android.graphics.Rect, android.graphics.Rect, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowFocusObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindow.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewDebug android.view.View findView(android.view.View, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -794,12 +1079,24 @@
     <item name='android.view.View boolean dispatchPointerEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MenuItem android.view.MenuItem setShortcut(char, char)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ContextThemeWrapper void onApplyThemeResource(android.content.res.Resources.Theme, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ScaleGestureDetector.SimpleOnScaleGestureListener void onScaleEnd(android.view.ScaleGestureDetector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.KeyCharacterMap char getMatch(int, char[], int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IApplicationToken.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewGroup.LayoutParams java.lang.String debug(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup boolean onInterceptTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -809,13 +1106,22 @@
     <item name='android.view.InputEventReceiver InputEventReceiver(android.view.InputChannel, android.os.Looper) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator scaleX(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceControl boolean getDisplayInfo(android.os.IBinder, android.view.SurfaceControl.PhysicalDisplayInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy.WindowState android.graphics.Rect getVisibleFrameLw()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.VolumePanel void onProgressChanged(android.widget.SeekBar, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewConfiguration android.view.ViewConfiguration get(android.content.Context)'>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator y(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.View java.util.ArrayList&lt;android.view.View&gt; getTouchables()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.InputChannel void writeToParcel(android.os.Parcel, int) 0'>
@@ -827,30 +1133,30 @@
     <item name='android.view.SurfaceControl void screenshot(android.os.IBinder, android.view.Surface, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.PointerIcon android.view.PointerIcon load(android.content.Context)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.SurfaceControl SurfaceControl(android.view.SurfaceSession, java.lang.String, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.WindowManager.LayoutParams java.lang.String debug(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.WindowManagerGlobal void dumpGfxInfo(java.io.FileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup android.view.ViewParent invalidateChildInParent(int[], android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.InputDevice int[] getDeviceIds()'>
+    <item name='android.view.WindowManagerPolicy int checkAddPermission(android.view.WindowManager.LayoutParams, int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.DragEvent android.view.DragEvent obtain(int, float, float, java.lang.Object, android.content.ClipDescription, android.content.ClipData, boolean)'>
+    <item name='android.view.WindowManagerPolicy void dump(java.lang.String, java.io.PrintWriter, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.View void onRestoreInstanceState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.IWindowFocusObserver.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.KeyEvent android.view.KeyEvent changeFlags(android.view.KeyEvent, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup ViewGroup(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -866,30 +1172,24 @@
     <item name='android.view.KeyCharacterMap boolean getKeyData(int, android.view.KeyCharacterMap.KeyData) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, int, float, float, float, float, int, float, float, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.Gravity void applyDisplay(int, android.graphics.Rect, android.graphics.Rect, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.WindowManager.LayoutParams void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.DragEvent java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.MotionEvent void transform(android.graphics.Matrix) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent.PointerProperties android.view.MotionEvent.PointerProperties[] createArray(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.Gravity void apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect, int) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewDebug void setLayoutParameter(android.view.View, java.lang.String, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewRootImpl boolean getChildVisibleRect(android.view.View, android.graphics.Rect, android.graphics.Point) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewDebug void captureLayers(android.view.View, java.io.DataOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -905,19 +1205,19 @@
     <item name='android.view.View android.view.View inflate(android.content.Context, int, android.view.ViewGroup) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.SubMenu android.view.SubMenu setHeaderTitle(int)'>
+    <item name='android.view.ViewGroup void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup boolean addViewInLayout(android.view.View, int, android.view.ViewGroup.LayoutParams, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyCharacterMap boolean[] deviceHasKeys(int[])'>
+    <item name='android.view.IWindowManager void setNewConfiguration(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyEvent android.view.KeyEvent changeAction(android.view.KeyEvent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent java.lang.String toString()'>
+    <item name='android.view.WindowManagerPolicy.WindowManagerFuncs android.view.WindowManagerPolicy.FakeWindow addFakeWindow(android.os.Looper, android.view.InputEventReceiver.Factory, java.lang.String, int, int, boolean, boolean, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
@@ -926,27 +1226,24 @@
     <item name='android.view.WindowManagerGlobal void addView(android.view.View, android.view.ViewGroup.LayoutParams, android.view.Display, android.view.Window) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.PointerIcon android.view.PointerIcon getSystemIcon(android.content.Context, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.View void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.PointerIcon android.view.PointerIcon getSystemIcon(android.content.Context, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup void addView(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IInputFilterHost void sendInputEvent(android.view.InputEvent, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup ViewGroup(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void dispatchVisibilityChanged(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.SurfaceControl java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.View.DragShadowBuilder void onDrawShadow(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -962,6 +1259,9 @@
     <item name='android.view.SurfaceControl void setDisplaySurface(android.os.IBinder, android.view.Surface) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.PointerIcon android.view.PointerIcon getNullIcon()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceControl void setDisplayLayerStack(android.os.IBinder, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -971,28 +1271,13 @@
     <item name='android.view.ViewGroup void invalidateChild(android.view.View, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.IInputFilter.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.MotionEvent android.view.InputEvent copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.ViewRootImpl boolean getChildVisibleRect(android.view.View, android.graphics.Rect, android.graphics.Point) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent.PointerCoords android.view.MotionEvent.PointerCoords[] createArray(int)'>
+    <item name='android.view.WindowManagerPolicy.WindowState android.view.WindowManager.LayoutParams getAttrs()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator alpha(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.KeyEvent android.view.KeyEvent createFromParcelBody(android.os.Parcel)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator x(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator y(float)'>
+    <item name='android.view.View android.os.Parcelable onSaveInstanceState()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup boolean onRequestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
@@ -1016,22 +1301,19 @@
     <item name='android.view.WindowManagerGlobal void addView(android.view.View, android.view.ViewGroup.LayoutParams, android.view.Display, android.view.Window) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Window android.view.WindowManager.LayoutParams getAttributes()'>
+    <item name='android.view.WindowManagerImpl android.view.WindowManagerImpl createLocalWindowManager(android.view.Window)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup boolean addViewInLayout(android.view.View, int, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.IWindowFocusObserver.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.ViewGroup ViewGroup(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.InputEventConsistencyVerifier void onInputEvent(android.view.InputEvent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationX(float)'>
+    <item name='android.view.MenuItem android.view.MenuItem setActionView(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.SurfaceView void draw(android.graphics.Canvas) 0'>
@@ -1043,39 +1325,36 @@
     <item name='android.view.AbsSavedState void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy void setInitialDisplaySize(android.view.Display, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinderHelper boolean beamBeats(int, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void invalidateChild(android.view.View, android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationY(float)'>
+    <item name='android.view.Menu android.view.MenuItem add(int, int, int, java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.SurfaceControl void setDisplayProjection(android.os.IBinder, int, android.graphics.Rect, android.graphics.Rect) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent createFromParcelBody(android.os.Parcel)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.InputChannel android.view.InputChannel dup()'>
+    <item name='android.view.WindowManagerPolicy void setDisplayOverscan(android.view.Display, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerImpl android.view.WindowManagerImpl createPresentationWindowManager(android.view.Display)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewParent boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationBy(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.ViewGroup void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent obtain(android.view.MotionEvent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.SurfaceView SurfaceView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1085,7 +1364,7 @@
     <item name='android.view.DisplayEventReceiver DisplayEventReceiver(android.os.Looper) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator withStartAction(java.lang.Runnable)'>
+    <item name='android.view.KeyCharacterMap.FallbackAction android.view.KeyCharacterMap.FallbackAction obtain()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View View(android.content.Context, android.util.AttributeSet, int) 0'>
@@ -1097,70 +1376,73 @@
     <item name='android.view.InputEventSender boolean sendInputEvent(int, android.view.InputEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.KeyEvent java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ScaleGestureDetector.OnScaleGestureListener boolean onScale(android.view.ScaleGestureDetector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup boolean onRequestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.PointerIcon android.view.PointerIcon load(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator xBy(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.Window.Callback boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void restoreHierarchyState(android.util.SparseArray&lt;android.os.Parcelable&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Surface java.lang.String toString()'>
+    <item name='android.view.WindowManagerPolicy.WindowState android.graphics.Rect getGivenVisibleInsetsLw()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewStub void dispatchDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewGroup android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindowSession void performDeferredDestroy(android.view.IWindow) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup void dispatchFreezeSelfOnly(android.util.SparseArray&lt;android.os.Parcelable&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void dispatchConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.View int[] mergeDrawableStates(int[], int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinderHelper boolean beamBeats(int, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.SurfaceControl.PhysicalDisplayInfo PhysicalDisplayInfo(android.view.SurfaceControl.PhysicalDisplayInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewManager void updateViewLayout(android.view.View, android.view.ViewGroup.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View boolean onGenericMotionEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.WindowManagerImpl android.view.WindowManagerImpl createLocalWindowManager(android.view.Window)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.KeyEvent android.view.KeyEvent changeTimeRepeat(android.view.KeyEvent, long, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationYBy(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.ViewGroup boolean dispatchGenericPointerEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyEvent android.view.KeyEvent createFromParcelBody(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MagnificationSpec android.view.MagnificationSpec obtain()'>
+    <item name='android.view.ViewRootImpl void invalidateChild(android.view.View, android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.PointerIcon android.view.PointerIcon loadCustomIcon(android.content.res.Resources, int)'>
+    <item name='android.view.MotionEvent java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.SubMenu android.view.SubMenu setHeaderView(android.view.View)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.IRotationWatcher.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.SurfaceControl.PhysicalDisplayInfo java.lang.String toString()'>
+    <item name='android.view.View.AccessibilityDelegate boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean dispatchGenericFocusedEvent(android.view.MotionEvent) 0'>
@@ -1172,13 +1454,13 @@
     <item name='android.view.View void initializeScrollbars(android.content.res.TypedArray) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator translationY(float)'>
+    <item name='android.view.MagnificationSpec java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean onFilterTouchEventForSecurity(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderIcon(int)'>
+    <item name='android.view.SubMenu android.view.SubMenu setHeaderIcon(android.graphics.drawable.Drawable)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.GestureDetector.OnGestureListener boolean onScroll(android.view.MotionEvent, android.view.MotionEvent, float, float) 0'>
@@ -1187,61 +1469,106 @@
     <item name='android.view.VelocityTracker boolean getEstimator(int, android.view.VelocityTracker.Estimator) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IInputFilterHost.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MotionEvent android.view.MotionEvent clampNoHistory(float, float, float, float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.SubMenu android.view.SubMenu setIcon(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinderHelper boolean isCandidate(android.graphics.Rect, android.graphics.Rect, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManager void removeViewImmediate(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewRootImpl void invalidateChild(android.view.View, android.graphics.Rect) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MenuItem android.view.MenuItem setTitle(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinderHelper boolean beamBeats(int, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroupOverlay void add(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MenuItem android.view.MenuItem setShowAsActionFlags(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, float, float, float, float, int, float, float, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.View.AccessibilityDelegate boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.KeyEvent android.view.InputEvent copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator setInterpolator(android.animation.TimeInterpolator)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.GestureDetector boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean onKeyShortcut(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.KeyEvent android.view.KeyEvent changeTimeRepeat(android.view.KeyEvent, long, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewDebug void profileViewAndChildren(android.view.View, java.io.BufferedWriter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewStub ViewStub(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent KeyEvent(android.view.KeyEvent, long, int) 0'>
+    <item name='android.view.IWindowSession void finishDrawing(android.view.IWindow) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.GestureDetector.OnGestureListener boolean onScroll(android.view.MotionEvent, android.view.MotionEvent, float, float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Display void getRealMetrics(android.util.DisplayMetrics) 0'>
+    <item name='android.view.KeyEvent KeyEvent(android.view.KeyEvent, long, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, int, int[], android.view.MotionEvent.PointerCoords[], int, float, float, int, int, int, int)'>
+    <item name='android.view.IWindowManager int getAppOrientation(android.view.IApplicationToken) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Display void getRealMetrics(android.util.DisplayMetrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean getGlobalVisibleRect(android.graphics.Rect, android.graphics.Point) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.MagnificationSpec void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.view.View.MeasureSpec java.lang.String toString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MagnificationSpec void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.InputChannel java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinderHelper boolean isCandidate(android.graphics.Rect, android.graphics.Rect, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.MotionEvent.PointerProperties void copyFrom(android.view.MotionEvent.PointerProperties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Surface java.lang.String rotationToString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.TextureView void onDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Window android.view.LayoutInflater getLayoutInflater()'>
+    <item name='android.view.MenuItem android.view.MenuItem setTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IInputFilter.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View.OnClickListener void onClick(android.view.View) 0'>
@@ -1256,6 +1583,9 @@
     <item name='android.view.PointerIcon android.view.PointerIcon createCustomIcon(android.graphics.Bitmap, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.InputEventReceiver.Factory android.view.InputEventReceiver createInputEventReceiver(android.view.InputChannel, android.os.Looper) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinderHelper int majorAxisDistanceToFarEdge(int, android.graphics.Rect, android.graphics.Rect) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1271,9 +1601,6 @@
     <item name='android.view.ViewDebug void profileViewAndChildren(android.view.View, java.io.BufferedWriter) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.InputChannel java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.MotionEvent.PointerCoords PointerCoords(android.view.MotionEvent.PointerCoords) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1286,34 +1613,55 @@
     <item name='android.view.View.AccessibilityDelegate void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewGroup.LayoutParams void onDebugDraw(android.view.View, android.graphics.Canvas, android.graphics.Paint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinder android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.SurfaceView SurfaceView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IInputFilter.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderIcon(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinderHelper int majorAxisDistance(int, android.graphics.Rect, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Display void getOverscanInsets(android.graphics.Rect) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.View void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.Display void getOverscanInsets(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy boolean checkShowToOwnerOnly(android.view.WindowManager.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.View java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceControl void blankDisplay(android.os.IBinder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotation(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.InputEventReceiver.Factory android.view.InputEventReceiver createInputEventReceiver(android.view.InputChannel, android.os.Looper) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.Surface void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.SurfaceControl void setDisplayProjection(android.os.IBinder, int, android.graphics.Rect, android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent android.view.KeyEvent changeFlags(android.view.KeyEvent, int)'>
+    <item name='android.view.MenuItem android.view.MenuItem setTitleCondensed(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewStub void draw(android.graphics.Canvas) 0'>
@@ -1325,13 +1673,10 @@
     <item name='android.view.View.AccessibilityDelegate void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator translationYBy(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.Gravity void apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect, int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.PointerIcon android.view.PointerIcon getNullIcon()'>
+    <item name='android.view.KeyEvent android.view.KeyEvent obtain(android.view.KeyEvent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View.AccessibilityDelegate boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent) 0'>
@@ -1343,6 +1688,12 @@
     <item name='android.view.TouchDelegate boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy.WindowManagerFuncs android.view.WindowManagerPolicy.FakeWindow addFakeWindow(android.os.Looper, android.view.InputEventReceiver.Factory, java.lang.String, int, int, boolean, boolean, boolean) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Window android.view.LayoutInflater getLayoutInflater()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1361,7 +1712,7 @@
     <item name='android.view.FocusFinderHelper int majorAxisDistance(int, android.graphics.Rect, android.graphics.Rect) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.VelocityTracker android.view.VelocityTracker obtain(java.lang.String)'>
+    <item name='android.view.WindowManagerPolicy void init(android.content.Context, android.view.IWindowManager, android.view.WindowManagerPolicy.WindowManagerFuncs) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
@@ -1382,58 +1733,100 @@
     <item name='android.view.View void startAnimation(android.view.animation.Animation) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.DragEvent android.view.DragEvent obtain(int, float, float, java.lang.Object, android.content.ClipDescription, android.content.ClipData, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ScaleGestureDetector boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewManager void addView(android.view.View, android.view.ViewGroup.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.DragEvent void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.VolumePanel void onStopTrackingTouch(android.widget.SeekBar) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Display void getMetrics(android.util.DisplayMetrics) 0'>
+    <item name='android.view.View.AccessibilityDelegate void sendAccessibilityEventUnchecked(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View.AccessibilityDelegate void sendAccessibilityEventUnchecked(android.view.View, android.view.accessibility.AccessibilityEvent) 1'>
+    <item name='android.view.Display void getMetrics(android.util.DisplayMetrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void startViewTransition(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderTitle(int)'>
+    <item name='android.view.KeyCharacterMap boolean[] deviceHasKeys(int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MotionEvent.PointerCoords android.view.MotionEvent.PointerCoords[] createArray(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IWindowManager void moveAppTokensToBottom(java.util.List&lt;android.os.IBinder&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ActionProvider android.view.View onCreateActionView(android.view.MenuItem)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Surface android.graphics.Canvas lockCanvas(android.graphics.Rect)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup.MarginLayoutParams MarginLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.View boolean onTrackballEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.InputChannel java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View.BaseSavedState BaseSavedState(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator x(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IRotationWatcher.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowState void computeFrameLw(android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewParent void invalidateChild(android.view.View, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void onDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.SubMenu android.view.SubMenu setHeaderTitle(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View boolean onKeyPreIme(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyEvent int keyCodeFromString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IApplicationToken.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Window void setContentView(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceControl void screenshot(android.os.IBinder, android.view.Surface) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.IInputFilterHost.Stub android.os.IBinder asBinder()'>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotationX(float)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator scaleXBy(float)'>
+    <item name='android.view.FallbackEventHandler boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderTitle(java.lang.CharSequence)'>
+    <item name='android.view.Menu boolean isShortcutKey(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View java.util.ArrayList&lt;android.view.View&gt; getTouchables()'>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator setDuration(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void sendAccessibilityEventUnchecked(android.view.accessibility.AccessibilityEvent) 0'>
@@ -1442,9 +1835,18 @@
     <item name='android.view.View void dispatchDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.SubMenu android.view.SubMenu setHeaderTitle(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowState void computeFrameLw(android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View void dispatchVisibilityChanged(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MagnificationSpec android.view.MagnificationSpec obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.FocusFinder android.view.View findNextFocusFromRect(android.view.ViewGroup, android.graphics.Rect, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1454,9 +1856,18 @@
     <item name='android.view.MotionEvent android.view.MotionEvent obtain(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowSession boolean outOfMemory(android.view.IWindow) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.Display java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.InputEventConsistencyVerifier void onGenericMotionEvent(android.view.MotionEvent, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.Window void addContentView(android.view.View, android.view.ViewGroup.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewParent void invalidateChild(android.view.View, android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1469,36 +1880,39 @@
     <item name='android.view.View boolean onHoverEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.InputEventReceiver.Factory android.view.InputEventReceiver createInputEventReceiver(android.view.InputChannel, android.os.Looper)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.KeyEvent.Callback boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MagnificationSpec android.view.MagnificationSpec obtain(android.view.MagnificationSpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup void offsetDescendantRectToMyCoords(android.view.View, android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.LayoutInflater android.view.View onCreateView(android.view.View, java.lang.String, android.util.AttributeSet) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View int[] mergeDrawableStates(int[], int[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.KeyEvent android.view.InputEvent copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.FocusFinder android.view.View findNextFocusFromRect(android.view.ViewGroup, android.graphics.Rect, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View android.view.View findViewByPredicate(com.android.internal.util.Predicate&lt;android.view.View&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.WindowManagerImpl android.view.WindowManagerImpl createPresentationWindowManager(android.view.Display)'>
+    <item name='android.view.View android.view.View getRootView()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator setListener(android.animation.Animator.AnimatorListener)'>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator withLayer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewGroup void addView(android.view.View, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IOnKeyguardExitResult.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.VolumePanel VolumePanel(android.content.Context, android.media.AudioService) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1511,16 +1925,34 @@
     <item name='android.view.View boolean dispatchDragEvent(android.view.DragEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MotionEvent android.view.MotionEvent obtain(android.view.MotionEvent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator scaleXBy(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.HardwareCanvas int drawDisplayList(android.view.DisplayList, android.graphics.Rect, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup void offsetDescendantRectToMyCoords(android.view.View, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.ViewDebug java.lang.Object invokeViewMethod(android.view.View, java.lang.reflect.Method, java.lang.Object[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowSession void getDisplayFrame(android.view.IWindow, android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MotionEvent.PointerProperties android.view.MotionEvent.PointerProperties[] createArray(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.InputChannel android.view.InputChannel[] openInputChannelPair(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewGroup android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+    <item name='android.view.IWindowManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowState android.graphics.Rect getGivenContentInsetsLw()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.InputEventConsistencyVerifier void onKeyEvent(android.view.KeyEvent, int) 0'>
@@ -1529,49 +1961,73 @@
     <item name='android.view.Display Display(android.hardware.display.DisplayManagerGlobal, int, android.view.DisplayInfo, android.view.CompatibilityInfoHolder) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewGroup.LayoutParams java.lang.String debug(java.lang.String)'>
+    <item name='android.view.Window boolean isShortcutKey(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View boolean onKeyUp(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IRotationWatcher.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.DragEvent android.view.DragEvent obtain(android.view.DragEvent)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowState android.graphics.RectF getShownFrameLw()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IOnKeyguardExitResult.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.IInputFilter.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.KeyEvent.DispatcherState void performedLongPress(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewGroup android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.view.WindowManagerPolicy android.view.KeyEvent dispatchUnhandledKey(android.view.WindowManagerPolicy.WindowState, android.view.KeyEvent, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyEvent boolean getKeyData(android.view.KeyCharacterMap.KeyData) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy void adjustWindowParamsLw(android.view.WindowManager.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View void findViewsWithText(java.util.ArrayList&lt;android.view.View&gt;, java.lang.CharSequence, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator setStartDelay(long)'>
+    <item name='android.view.ViewGroup void addView(android.view.View, android.view.ViewGroup.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator yBy(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.SurfaceControl.PhysicalDisplayInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator translationY(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator translationYBy(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.MenuItem android.view.MenuItem setAlphabeticShortcut(char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.GestureDetector.SimpleOnGestureListener boolean onDown(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.SubMenu android.view.SubMenu setIcon(android.graphics.drawable.Drawable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator rotation(float)'>
+    <item name='android.view.Display boolean getDisplayInfo(android.view.DisplayInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.KeyEvent.DispatcherState void startTracking(android.view.KeyEvent, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Display boolean getDisplayInfo(android.view.DisplayInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.WindowManagerGlobal void updateViewLayout(android.view.View, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator translationX(float)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.KeyEvent android.view.KeyEvent changeAction(android.view.KeyEvent, int)'>
+    <item name='android.view.IWindowSession void getDisplayFrame(android.view.IWindow, android.graphics.Rect) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void createContextMenu(android.view.ContextMenu) 0'>
@@ -1586,19 +2042,31 @@
     <item name='android.view.LayoutInflater void setFactory(android.view.LayoutInflater.Factory) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator withStartAction(java.lang.Runnable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.Choreographer void postCallbackDelayed(int, java.lang.Runnable, java.lang.Object, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.Window void setAttributes(android.view.WindowManager.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy.WindowState android.graphics.Rect getFrameLw()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.View java.lang.String debugIndent(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.Choreographer void postCallback(int, java.lang.Runnable, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.View void onConfigurationChanged(android.content.res.Configuration) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View android.view.View findViewByPredicateInsideOut(android.view.View, com.android.internal.util.Predicate&lt;android.view.View&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View void onConfigurationChanged(android.content.res.Configuration) 0'>
+    <item name='android.view.IWindowManager void moveAppTokensToTop(java.util.List&lt;android.os.IBinder&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.LayoutInflater android.view.View inflate(org.xmlpull.v1.XmlPullParser, android.view.ViewGroup, boolean) 0'>
@@ -1625,6 +2093,9 @@
     <item name='android.view.KeyCharacterMap char getMatch(int, char[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy int prepareAddWindowLw(android.view.WindowManagerPolicy.WindowState, android.view.WindowManager.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.View void getLocationOnScreen(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1634,25 +2105,34 @@
     <item name='android.view.ViewRootImpl void handleDispatchSystemUiVisibilityChanged(android.view.ViewRootImpl.SystemUiVisibilityInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.KeyEvent android.view.KeyEvent changeAction(android.view.KeyEvent, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.SurfaceView SurfaceView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowSession void remove(android.view.IWindow) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.SurfaceHolder android.view.Surface getSurface()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewDebug.HierarchyTraceType android.view.ViewDebug.HierarchyTraceType valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent android.view.KeyEvent changeTimeRepeat(android.view.KeyEvent, long, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.ContextThemeWrapper void applyOverrideConfiguration(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ActionProvider android.view.View onCreateActionView()'>
+    <item name='android.view.View java.util.ArrayList&lt;android.view.View&gt; getFocusables(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.View void getHitRect(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View android.view.View findViewByPredicateInsideOut(android.view.View, com.android.internal.util.Predicate&lt;android.view.View&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View void getHitRect(android.graphics.Rect) 0'>
+    <item name='android.view.ViewTreeObserver.OnComputeInternalInsetsListener void onComputeInternalInsets(android.view.ViewTreeObserver.InternalInsetsInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.InputQueue.Callback void onInputQueueDestroyed(android.view.InputQueue) 0'>
@@ -1661,33 +2141,42 @@
     <item name='android.view.InputEventSender InputEventSender(android.view.InputChannel, android.os.Looper) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.View java.lang.String debugIndent(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.ViewGroup void removeViewInLayout(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.TextureView void draw(android.graphics.Canvas) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.View void applyDrawableToTransparentRegion(android.graphics.drawable.Drawable, android.graphics.Region) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.TextureView void draw(android.graphics.Canvas) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.WindowManagerPolicy.WindowManagerFuncs android.view.InputChannel monitorInput(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.VolumePanel void handleMessage(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.FallbackEventHandler void preDispatchKeyEvent(android.view.KeyEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.LayoutInflater android.view.LayoutInflater from(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.DisplayInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup void dispatchRestoreInstanceState(android.util.SparseArray&lt;android.os.Parcelable&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewStub android.view.View inflate()'>
+    <item name='android.view.ContextMenu android.view.ContextMenu setHeaderView(android.view.View)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.OrientationEventListener OrientationEventListener(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.View void addFocusables(java.util.ArrayList&lt;android.view.View&gt;, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup void attachLayoutAnimationParameters(android.view.View, android.view.ViewGroup.LayoutParams, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1703,7 +2192,7 @@
     <item name='android.view.ViewRootImpl ViewRootImpl(android.content.Context, android.view.Display) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.KeyEvent android.view.KeyEvent obtain(long, long, int, int, int, int, int, int, int, int, java.lang.String)'>
+    <item name='android.view.MotionEvent android.view.MotionEvent obtain(long, long, int, int, int[], android.view.MotionEvent.PointerCoords[], int, float, float, int, int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void applyDrawableToTransparentRegion(android.graphics.drawable.Drawable, android.graphics.Region) 1'>
@@ -1712,9 +2201,6 @@
     <item name='android.view.Surface Surface(android.graphics.SurfaceTexture) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.Display java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.View boolean dispatchTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1733,21 +2219,33 @@
     <item name='android.view.View boolean getGlobalVisibleRect(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.MenuItem android.view.MenuItem setActionView(android.view.View)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.DisplayInfo void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator scaleY(float)'>
+    <item name='android.view.MenuItem android.view.MenuItem setIcon(android.graphics.drawable.Drawable)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.SubMenu android.view.SubMenu setHeaderTitle(java.lang.CharSequence)'>
+    <item name='android.view.IWindow void dispatchDragEvent(android.view.DragEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.View void invalidate(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator setListener(android.animation.Animator.AnimatorListener)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.SubMenu android.view.SubMenu setIcon(android.graphics.drawable.Drawable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup boolean dispatchHoverEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.IWindowSession void setInsets(android.view.IWindow, int, android.graphics.Rect, android.graphics.Rect, android.graphics.Region) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.PointerIcon void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1757,10 +2255,16 @@
     <item name='android.view.ViewRootImpl ViewRootImpl(android.content.Context, android.view.Display) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.KeyEvent android.view.KeyEvent createFromParcelBody(android.os.Parcel)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.ViewGroup.MarginLayoutParams MarginLayoutParams(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.Choreographer void postFrameCallbackDelayed(android.view.Choreographer.FrameCallback, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.WindowManagerPolicy void adjustConfigurationLw(android.content.res.Configuration, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/android/view/inputmethod/annotations.xml b/android-sdk-annotations/android/view/inputmethod/annotations.xml
index 638fcef1191..e7eb8e9545c 100644
--- a/android-sdk-annotations/android/view/inputmethod/annotations.xml
+++ b/android-sdk-annotations/android/view/inputmethod/annotations.xml
@@ -1,107 +1,137 @@
 <root>
-    <item name='android.view.inputmethod.ExtractedTextRequest void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.view.inputmethod.InputMethodSubtype java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodManager com.android.internal.view.IInputContext getInputContext()'>
+    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getMode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.CompletionInfo void writeToParcel(android.os.Parcel, int) 0'>
+    <item name='android.view.inputmethod.InputConnectionWrapper boolean commitCompletion(android.view.inputmethod.CompletionInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodInfo java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethodManager com.android.internal.view.IInputMethodClient getClient()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethodSubtype void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo, java.util.Map&lt;java.lang.String,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt;) 1'>
+    <item name='android.view.inputmethod.InputMethodSession void dispatchGenericMotionEvent(int, android.view.MotionEvent, android.view.inputmethod.InputMethodSession.EventCallback) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.ExtractedText void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.inputmethod.CompletionInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.inputmethod.InputMethodManager com.android.internal.view.IInputContext getInputContext()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.inputmethod.InputMethodSession void dispatchKeyEvent(int, android.view.KeyEvent, android.view.inputmethod.InputMethodSession.EventCallback) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputBinding java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.inputmethod.InputMethodManager void focusIn(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethod void revokeSession(android.view.inputmethod.InputMethodSession) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.BaseInputConnection void removeComposingSpans(android.text.Spannable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethodInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.inputmethod.BaseInputConnection BaseInputConnection(android.view.View, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.InputMethod void changeInputMethodSubtype(android.view.inputmethod.InputMethodSubtype) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.CompletionInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethodInfo android.content.ComponentName getComponent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.CorrectionInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.CorrectionInfo void writeToParcel(android.os.Parcel, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethod void setSessionEnabled(android.view.inputmethod.InputMethodSession, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.inputmethod.InputMethod void bindInput(android.view.inputmethod.InputBinding) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo, java.util.Map&lt;java.lang.String,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.inputmethod.EditorInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodManager java.util.Map&lt;android.view.inputmethod.InputMethodInfo,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt; getShortcutInputMethodsAndSubtypes()'>
+    <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo, java.util.Map&lt;java.lang.String,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.EditorInfo void dump(android.util.Printer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.BaseInputConnection void setComposingSpans(android.text.Spannable, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethod void createSession(android.view.inputmethod.InputMethod.SessionCallback) 0'>
+    <item name='android.view.inputmethod.BaseInputConnection boolean commitCompletion(android.view.inputmethod.CompletionInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.InputMethodInfo void dump(android.util.Printer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.BaseInputConnection int getComposingSpanEnd(android.text.Spannable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.inputmethod.InputMethodInfo android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.InputMethodManager void onWindowFocus(android.view.View, android.view.View, int, boolean, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getMode()'>
+    <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo) 0'>
+    <item name='android.view.inputmethod.InputBinding InputBinding(android.view.inputmethod.InputConnection, android.view.inputmethod.InputBinding) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.BaseInputConnection void setComposingSpans(android.text.Spannable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.CorrectionInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.ExtractedTextRequest void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.CompletionInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodInfo java.lang.CharSequence loadLabel(android.content.pm.PackageManager) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodSubtype void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo, java.util.Map&lt;java.lang.String,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getExtraValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputBinding java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethod void revokeSession(android.view.inputmethod.InputMethodSession) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.BaseInputConnection void removeComposingSpans(android.text.Spannable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getLocale()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.BaseInputConnection boolean commitCorrection(android.view.inputmethod.CorrectionInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.CorrectionInfo void writeToParcel(android.os.Parcel, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethod void setSessionEnabled(android.view.inputmethod.InputMethodSession, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodManager java.util.Map&lt;android.view.inputmethod.InputMethodInfo,java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;&gt; getShortcutInputMethodsAndSubtypes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.BaseInputConnection void setComposingSpans(android.text.Spannable, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethod void createSession(android.view.inputmethod.InputMethod.SessionCallback) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.BaseInputConnection int getComposingSpanEnd(android.text.Spannable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputConnection boolean commitCorrection(android.view.inputmethod.CorrectionInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodManager com.android.internal.view.IInputMethodClient getClient()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.inputmethod.InputMethodInfo android.content.ComponentName getComponent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.inputmethod.InputBinding void writeToParcel(android.os.Parcel, int) 0'>
@@ -116,22 +146,13 @@
     <item name='android.view.inputmethod.InputMethodInfo InputMethodInfo(android.content.pm.ResolveInfo, boolean, java.lang.String, java.util.List&lt;android.view.inputmethod.InputMethodSubtype&gt;, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.BaseInputConnection void setComposingSpans(android.text.Spannable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputBinding InputBinding(android.view.inputmethod.InputConnection, android.view.inputmethod.InputBinding) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.inputmethod.InputMethodInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getLocale()'>
+    <item name='android.view.inputmethod.InputConnection boolean commitCompletion(android.view.inputmethod.CompletionInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.inputmethod.InputMethodSubtype java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.inputmethod.InputMethodSubtype java.lang.String getExtraValue()'>
+    <item name='android.view.inputmethod.InputConnectionWrapper boolean commitCorrection(android.view.inputmethod.CorrectionInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/android/view/textservice/annotations.xml b/android-sdk-annotations/android/view/textservice/annotations.xml
index 36e7b9216f9..acaf84a4f18 100644
--- a/android-sdk-annotations/android/view/textservice/annotations.xml
+++ b/android-sdk-annotations/android/view/textservice/annotations.xml
@@ -1,56 +1,65 @@
 <root>
-    <item name='android.view.textservice.SpellCheckerInfo SpellCheckerInfo(android.content.Context, android.content.pm.ResolveInfo) 0'>
+    <item name='android.view.textservice.SpellCheckerSubtype java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerInfo android.content.ComponentName getComponent()'>
+    <item name='android.view.textservice.SpellCheckerInfo SpellCheckerInfo(android.content.Context, android.content.pm.ResolveInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SpellCheckerSubtype void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.textservice.SpellCheckerSubtype java.lang.String getLocale()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.textservice.SpellCheckerSession SpellCheckerSession(android.view.textservice.SpellCheckerInfo, com.android.internal.textservice.ITextServicesManager, android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, android.view.textservice.SpellCheckerSubtype) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.view.textservice.SpellCheckerSession android.view.textservice.SpellCheckerInfo getSpellChecker()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.view.textservice.SpellCheckerSession SpellCheckerSession(android.view.textservice.SpellCheckerInfo, com.android.internal.textservice.ITextServicesManager, android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, android.view.textservice.SpellCheckerSubtype) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SpellCheckerInfo android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerSession com.android.internal.textservice.ITextServicesSessionListener getTextServicesSessionListener()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.textservice.TextInfo TextInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.TextInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerSubtype java.lang.String getExtraValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.textservice.SentenceSuggestionsInfo SentenceSuggestionsInfo(android.view.textservice.SuggestionsInfo[], int[], int[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SpellCheckerInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerSession com.android.internal.textservice.ISpellCheckerSessionListener getSpellCheckerSessionListener()'>
+    <item name='android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener void onGetSuggestions(android.view.textservice.SuggestionsInfo[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener void onGetSentenceSuggestions(android.view.textservice.SentenceSuggestionsInfo[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SentenceSuggestionsInfo SentenceSuggestionsInfo(android.view.textservice.SuggestionsInfo[], int[], int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerSubtype java.lang.String getLocale()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.view.textservice.SpellCheckerInfo SpellCheckerInfo(android.content.Context, android.content.pm.ResolveInfo) 1'>
+    <item name='android.view.textservice.SpellCheckerSession com.android.internal.textservice.ITextServicesSessionListener getTextServicesSessionListener()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SuggestionsInfo SuggestionsInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerSession android.view.textservice.SpellCheckerInfo getSpellChecker()'>
+    <item name='android.view.textservice.SpellCheckerInfo SpellCheckerInfo(android.content.Context, android.content.pm.ResolveInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerSession com.android.internal.textservice.ISpellCheckerSessionListener getSpellCheckerSessionListener()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerInfo android.content.ComponentName getComponent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.view.textservice.SpellCheckerSubtype java.lang.String getExtraValue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SentenceSuggestionsInfo void writeToParcel(android.os.Parcel, int) 0'>
@@ -65,13 +74,10 @@
     <item name='android.view.textservice.TextServicesManager android.view.textservice.SpellCheckerSession newSpellCheckerSession(android.os.Bundle, java.util.Locale, android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, boolean) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerInfo SpellCheckerInfo(android.os.Parcel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.view.textservice.SuggestionsInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.view.textservice.SpellCheckerSubtype java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo)'>
+    <item name='android.view.textservice.SpellCheckerInfo SpellCheckerInfo(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.view.textservice.SpellCheckerSubtype java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo) 0'>
diff --git a/android-sdk-annotations/android/webkit/annotations.xml b/android-sdk-annotations/android/webkit/annotations.xml
index 97fcc27b4b9..48e0f2d671b 100644
--- a/android-sdk-annotations/android/webkit/annotations.xml
+++ b/android-sdk-annotations/android/webkit/annotations.xml
@@ -1,32 +1,77 @@
 <root>
+    <item name='android.webkit.WebViewFactoryProvider android.webkit.WebViewProvider createWebView(android.webkit.WebView, android.webkit.WebView.PrivateAccess) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebView.PrivateAccess void super_setLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebView void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettings.PluginState android.webkit.WebSettings.PluginState valueOf(java.lang.String)'>
+    <item name='android.webkit.WebViewProvider.ViewDelegate void onDrawVerticalScrollBar(android.graphics.Canvas, android.graphics.drawable.Drawable, int, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebView android.webkit.PluginList getPluginList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebView boolean onHoverEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewProvider android.webkit.WebViewProvider.ViewDelegate getViewDelegate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewClassic android.webkit.WebViewProvider.ScrollDelegate getScrollDelegate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate android.view.inputmethod.InputConnection onCreateInputConnection(android.view.inputmethod.EditorInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.HTML5VideoFullScreen void onPrepared(android.media.MediaPlayer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate void setLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewClassic void onDraw(android.graphics.Canvas) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebBackForwardList android.webkit.WebBackForwardList clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.HTML5VideoView java.util.Map&lt;java.lang.String,java.lang.String&gt; generateHeaders(java.lang.String, android.webkit.HTML5VideoViewProxy) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.URLUtil byte[] decode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebSettings void setTextSize(android.webkit.WebSettings.TextSize) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.URLUtil java.lang.String stripAnchor(java.lang.String)'>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean onKeyUp(int, android.view.KeyEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate void onDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.FindActionModeCallback FindActionModeCallback(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebViewCore android.webkit.WebSettingsClassic getSettings()'>
+    <item name='android.webkit.WebViewClassic void onVisibilityChanged(android.view.View, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewClassic android.webkit.PluginList getPluginList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewClassic void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.HTML5VideoView void enterFullScreenVideoState(int, android.webkit.HTML5VideoViewProxy, android.webkit.WebViewClassic) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebSettings.ZoomDensity android.webkit.WebSettings.ZoomDensity valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebViewClient void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError) 1'>
@@ -38,22 +83,49 @@
     <item name='android.webkit.WebView boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewCore android.webkit.WebViewInputDispatcher.WebKitCallbacks getInputDispatcherCallbacks()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebViewClient void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebView void dispatchDraw(android.graphics.Canvas) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebChromeClient void onExceededDatabaseQuota(java.lang.String, java.lang.String, long, long, long, android.webkit.WebStorage.QuotaUpdater) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebView android.webkit.PluginList getPluginList()'>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.URLUtil byte[] decode(byte[])'>
+    <item name='android.webkit.WebViewClassic boolean onHoverEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.PluginStub android.view.View getFullScreenView(int, android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean onHoverEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebSettings android.webkit.WebSettings.TextSize getTextSize()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.HTML5VideoView void setVideoURI(java.lang.String, android.webkit.HTML5VideoViewProxy) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettingsClassic java.lang.String getPluginsPath()'>
+    <item name='android.webkit.MimeTypeMap android.webkit.MimeTypeMap getSingleton()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.FindActionModeCallback.NoAction boolean onCreateActionMode(android.view.ActionMode, android.view.Menu) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.ConsoleMessage.MessageLevel android.webkit.ConsoleMessage.MessageLevel valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebViewFragment android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle) 0'>
@@ -62,6 +134,15 @@
     <item name='android.webkit.FindActionModeCallback boolean onActionItemClicked(android.view.ActionMode, android.view.MenuItem) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewClassic android.webkit.WebBackForwardList copyBackForwardList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebSettings.PluginState android.webkit.WebSettings.PluginState valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebViewClient void onReceivedHttpAuthRequest(android.webkit.WebView, android.webkit.HttpAuthHandler, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -71,7 +152,7 @@
     <item name='android.webkit.WebView.PrivateAccess boolean super_onGenericMotionEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.MimeTypeMap java.lang.String getFileExtensionFromUrl(java.lang.String)'>
+    <item name='android.webkit.WebBackForwardList java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebView WebView(android.content.Context, android.util.AttributeSet) 0'>
@@ -80,13 +161,25 @@
     <item name='android.webkit.WebView WebView(android.content.Context, android.util.AttributeSet, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebView.PrivateAccess boolean super_onHoverEvent(android.view.MotionEvent) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.webkit.WebViewClassic void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.URLUtil java.lang.String guessFileName(java.lang.String, java.lang.String, java.lang.String)'>
+    <item name='android.webkit.WebView.PrivateAccess boolean super_onHoverEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.FindActionModeCallback void onClick(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebSettings.RenderPriority android.webkit.WebSettings.RenderPriority valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean onGenericMotionEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebView void setLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewFactoryProvider android.webkit.WebViewProvider createWebView(android.webkit.WebView, android.webkit.WebView.PrivateAccess)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebView boolean onKeyDown(int, android.view.KeyEvent) 1'>
@@ -107,34 +200,46 @@
     <item name='android.webkit.WebViewClientClassicExt void onReceivedClientCertRequest(android.webkit.WebView, android.webkit.ClientCertRequestHandler, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewCore android.webkit.WebSettingsClassic getSettings()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebHistoryItem java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebSettingsClassic java.lang.String getPluginsPath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.ConsoleMessage.MessageLevel android.webkit.ConsoleMessage.MessageLevel valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.HTML5VideoView java.util.Map&lt;java.lang.String,java.lang.String&gt; generateHeaders(java.lang.String, android.webkit.HTML5VideoViewProxy)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.webkit.URLUtil java.lang.String composeSearchUrl(java.lang.String, java.lang.String, java.lang.String) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.webkit.WebViewClassic android.view.inputmethod.InputConnection onCreateInputConnection(android.view.inputmethod.EditorInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.URLUtil java.lang.String composeSearchUrl(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebView WebView(android.content.Context, android.util.AttributeSet, int, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.URLUtil java.lang.String guessFileName(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewClassic android.webkit.WebBackForwardListClassic copyBackForwardList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebHistoryItem android.webkit.WebHistoryItem clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebViewClassic void setLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebViewClassic android.webkit.WebBackForwardList copyBackForwardList()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.webkit.WebViewClassic WebViewClassic(android.webkit.WebView, android.webkit.WebView.PrivateAccess) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettingsClassic java.lang.String getDefaultUserAgentForLocale(android.content.Context, java.util.Locale)'>
+    <item name='android.webkit.WebViewFactoryProvider.Statics java.lang.String getDefaultUserAgent(android.content.Context)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettings.RenderPriority android.webkit.WebSettings.RenderPriority valueOf(java.lang.String)'>
+    <item name='android.webkit.FindActionModeCallback.NoAction boolean onActionItemClicked(android.view.ActionMode, android.view.MenuItem) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebChromeClient boolean onConsoleMessage(android.webkit.ConsoleMessage) 0'>
@@ -146,28 +251,31 @@
     <item name='android.webkit.URLUtil byte[] decode(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebViewClassic android.webkit.PluginList getPluginList()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.webkit.WebSettings.TextSize android.webkit.WebSettings.TextSize valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.webkit.WebView WebView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettings.TextSize android.webkit.WebSettings.TextSize valueOf(java.lang.String) 0'>
+    <item name='android.webkit.WebViewClassic boolean onTouchEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.URLUtil java.lang.String guessUrl(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.URLUtil java.lang.String composeSearchUrl(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebViewClassic android.webkit.WebView getWebView()'>
+    <item name='android.webkit.WebSettings.TextSize android.webkit.WebSettings.TextSize valueOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate void onVisibilityChanged(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.L10nUtils void setApplicationContext(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.PluginStub android.view.View getFullScreenView(int, android.content.Context)'>
+    <item name='android.webkit.CookieManager java.lang.String getCookie(android.net.WebAddress) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebView boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
@@ -176,39 +284,42 @@
     <item name='android.webkit.CookieSyncManager android.webkit.CookieSyncManager createInstance(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.MimeTypeMap java.lang.String getFileExtensionFromUrl(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebSettings.ZoomDensity android.webkit.WebSettings.ZoomDensity valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewClassic android.webkit.WebView getWebView()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.URLUtil java.lang.String stripAnchor(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebViewCore android.webkit.WebViewInputDispatcher.WebKitCallbacks getInputDispatcherCallbacks()'>
+    <item name='android.webkit.WebViewFactoryProvider android.webkit.WebViewFactoryProvider.Statics getStatics()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.OverScrollGlow OverScrollGlow(android.webkit.WebViewClassic) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettings java.lang.String getPluginsPath()'>
+    <item name='android.webkit.WebView void onVisibilityChanged(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebView void onVisibilityChanged(android.view.View, int) 0'>
+    <item name='android.webkit.WebViewClassic boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebSettings.RenderPriority android.webkit.WebSettings.RenderPriority valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebViewClassic android.webkit.WebViewProvider.ScrollDelegate getScrollDelegate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.webkit.WebViewClassic android.webkit.WebViewProvider.ViewDelegate getViewDelegate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.webkit.MimeTypeMap android.webkit.MimeTypeMap getSingleton()'>
+    <item name='android.webkit.WebViewProvider.ViewDelegate void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebViewClassic void onDrawVerticalScrollBar(android.graphics.Canvas, android.graphics.drawable.Drawable, int, int, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebSettingsClassic java.lang.String getDefaultUserAgentForLocale(android.content.Context, java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.MimeTypeMap java.lang.String getFileExtensionFromUrl(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -218,39 +329,54 @@
     <item name='android.webkit.WebViewClassic void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.URLUtil java.lang.String guessUrl(java.lang.String)'>
+    <item name='android.webkit.WebViewClassic boolean onKeyDown(int, android.view.KeyEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean onTouchEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.HTML5VideoView void onPrepared(android.media.MediaPlayer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebView boolean onTrackballEvent(android.view.MotionEvent) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.URLUtil java.lang.String stripAnchor(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.URLUtil java.lang.String guessUrl(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.PluginStub android.view.View getEmbeddedView(int, android.content.Context)'>
+    <item name='android.webkit.WebViewProvider.ViewDelegate boolean onTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettings.LayoutAlgorithm android.webkit.WebSettings.LayoutAlgorithm valueOf(java.lang.String) 0'>
+    <item name='android.webkit.WebViewClassic boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebChromeClient void onReachedMaxAppCacheSize(long, long, android.webkit.WebStorage.QuotaUpdater) 2'>
+    <item name='android.webkit.WebSettings.LayoutAlgorithm android.webkit.WebSettings.LayoutAlgorithm valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebViewClassic boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.ConsoleMessage.MessageLevel android.webkit.ConsoleMessage.MessageLevel valueOf(java.lang.String)'>
+    <item name='android.webkit.WebChromeClient void onReachedMaxAppCacheSize(long, long, android.webkit.WebStorage.QuotaUpdater) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebSettings.LayoutAlgorithm android.webkit.WebSettings.LayoutAlgorithm valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebSettings.PluginState android.webkit.WebSettings.PluginState valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettings android.webkit.WebSettings.TextSize getTextSize()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.webkit.WebChromeClient void openFileChooser(android.webkit.ValueCallback&lt;android.net.Uri&gt;, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebViewClient void onFormResubmission(android.webkit.WebView, android.os.Message, android.os.Message) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebSettings java.lang.String getPluginsPath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebView boolean onGenericMotionEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -260,9 +386,6 @@
     <item name='android.webkit.WebSettingsClassic java.lang.String getDefaultUserAgentForLocale(android.content.Context, java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebViewClassic android.webkit.WebBackForwardListClassic copyBackForwardList()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.webkit.WebView WebView(android.content.Context, android.util.AttributeSet, int, java.util.Map&lt;java.lang.String,java.lang.Object&gt;, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -275,6 +398,9 @@
     <item name='android.webkit.WebView WebView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewProvider android.webkit.WebBackForwardList copyBackForwardList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebView WebView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -284,37 +410,79 @@
     <item name='android.webkit.DateSorter DateSorter(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.HTML5VideoView java.util.Map&lt;java.lang.String,java.lang.String&gt; generateHeaders(java.lang.String, android.webkit.HTML5VideoViewProxy)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebView void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewClassic android.webkit.WebViewProvider.ViewDelegate getViewDelegate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.HTML5VideoView void setVideoURI(java.lang.String, android.webkit.HTML5VideoViewProxy) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewClassic boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.HTML5VideoFullScreen boolean onTouch(android.view.View, android.view.MotionEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebSettings.TextSize android.webkit.WebSettings.TextSize valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.FindActionModeCallback boolean onCreateActionMode(android.view.ActionMode, android.view.Menu) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettings.LayoutAlgorithm android.webkit.WebSettings.LayoutAlgorithm valueOf(java.lang.String)'>
+    <item name='android.webkit.WebView void onDrawVerticalScrollBar(android.graphics.Canvas, android.graphics.drawable.Drawable, int, int, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebSettings.ZoomDensity android.webkit.WebSettings.ZoomDensity valueOf(java.lang.String)'>
+    <item name='android.webkit.WebViewProvider android.webkit.WebViewProvider.ScrollDelegate getScrollDelegate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewFactoryProvider.Statics java.lang.String getDefaultUserAgent(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebView boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate void onDrawVerticalScrollBar(android.graphics.Canvas, android.graphics.drawable.Drawable, int, int, int, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebView void onDrawVerticalScrollBar(android.graphics.Canvas, android.graphics.drawable.Drawable, int, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.WebViewProvider.ViewDelegate void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebView boolean onKeyUp(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.PluginStub android.view.View getEmbeddedView(int, android.content.Context)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebViewClassic boolean onTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebViewClassic boolean onKeyUp(int, android.view.KeyEvent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.FindActionModeCallback.NoAction boolean onCreateActionMode(android.view.ActionMode, android.view.Menu) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebViewClassic void onDrawVerticalScrollBar(android.graphics.Canvas, android.graphics.drawable.Drawable, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.webkit.WebView boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.webkit.WebView boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.webkit.WebView boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 0'>
+    <item name='android.webkit.FindActionModeCallback boolean onCreateActionMode(android.view.ActionMode, android.view.Menu) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.webkit.FindActionModeCallback void onTextChanged(java.lang.CharSequence, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.webkit.WebView android.view.inputmethod.InputConnection onCreateInputConnection(android.view.inputmethod.EditorInfo) 0'>
diff --git a/android-sdk-annotations/android/widget/annotations.xml b/android-sdk-annotations/android/widget/annotations.xml
index 38f7c6a7130..adc6173e5cd 100644
--- a/android-sdk-annotations/android/widget/annotations.xml
+++ b/android-sdk-annotations/android/widget/annotations.xml
@@ -1,11 +1,17 @@
 <root>
-    <item name='android.widget.RadioGroup android.widget.RadioGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.widget.ZoomButton boolean onLongClick(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.Switch void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.Gallery boolean onDown(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.Switch void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
+    <item name='android.widget.AppSecurityPermissions android.view.View getPermissionsView()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.AbsoluteLayout.LayoutParams java.lang.String debug(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ScrollView void draw(android.graphics.Canvas) 0'>
@@ -26,30 +32,18 @@
     <item name='android.widget.LinearLayout.LayoutParams LayoutParams(android.view.ViewGroup.MarginLayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.LinearLayout android.widget.LinearLayout.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.Toast android.widget.Toast makeText(android.content.Context, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.TableRow android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.ExpandableListView android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ListPopupWindow ListPopupWindow(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AppSecurityPermissions android.view.View getPermissionsView()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.RelativeLayout.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
+    <item name='android.widget.TableRow android.widget.LinearLayout.LayoutParams generateDefaultLayoutParams()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.Switch Switch(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RelativeLayout.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.StackView boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -68,9 +62,6 @@
     <item name='android.widget.SlidingDrawer void dispatchDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AutoCompleteTextView java.lang.CharSequence convertSelectionToString(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.HorizontalScrollView void addView(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -98,6 +89,9 @@
     <item name='android.widget.MultiAutoCompleteTextView void performFiltering(java.lang.CharSequence, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.PopupMenu android.view.MenuInflater getMenuInflater()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ListView void dispatchDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -110,13 +104,16 @@
     <item name='android.widget.ViewAnimator void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RelativeLayout android.widget.RelativeLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.SimpleCursorAdapter SimpleCursorAdapter(android.content.Context, int, android.database.Cursor, java.lang.String[], int[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.GridView boolean onKeyUp(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsListView android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.widget.Gallery android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.SeekBar SeekBar(android.content.Context, android.util.AttributeSet) 0'>
@@ -158,10 +155,10 @@
     <item name='android.widget.SeekBar SeekBar(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ShareActionProvider android.view.View onCreateActionView()'>
+    <item name='android.widget.AdapterViewAnimator AdapterViewAnimator(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AdapterViewAnimator AdapterViewAnimator(android.content.Context) 0'>
+    <item name='android.widget.RelativeLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.RadioButton RadioButton(android.content.Context, android.util.AttributeSet, int) 1'>
@@ -185,6 +182,12 @@
     <item name='android.widget.ZoomControls ZoomControls(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AbsListView android.widget.AbsListView.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.CursorTreeAdapter android.view.View getChildView(int, int, boolean, android.view.View, android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Chronometer void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -200,24 +203,18 @@
     <item name='android.widget.FrameLayout void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TextView android.text.TextPaint getPaint()'>
+    <item name='android.widget.LinearLayout android.widget.LinearLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.DatePicker void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TextView android.graphics.drawable.Drawable[] getCompoundDrawables()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.NumberPicker NumberPicker(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ImageButton ImageButton(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsListView android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.CheckBox void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -236,12 +233,15 @@
     <item name='android.widget.OverScroller OverScroller(android.content.Context, android.view.animation.Interpolator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableRow android.widget.LinearLayout.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
+    <item name='android.widget.ExpandableListView void setAdapter(android.widget.ListAdapter) 0'>
+        <annotation name='org.jetbrains.annotations.Nullable'/>
     </item>
     <item name='android.widget.TextView int getTextColor(android.content.Context, android.content.res.TypedArray, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setIndicator(java.lang.CharSequence, android.graphics.drawable.Drawable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.RadioGroup android.widget.RadioGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -260,27 +260,39 @@
     <item name='android.widget.CursorTreeAdapter void bindGroupView(android.view.View, android.content.Context, android.database.Cursor, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RadioGroup android.widget.LinearLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.SlidingDrawer void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.RadioGroup RadioGroup(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ImageSwitcher void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
+    <item name='android.widget.AbsSeekBar void onDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsSeekBar void onDraw(android.graphics.Canvas) 0'>
+    <item name='android.widget.ImageSwitcher void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.HorizontalScrollView boolean executeKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.GridLayout android.widget.GridLayout.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ScrollView void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.FrameLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.FrameLayout FrameLayout(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableRow android.widget.LinearLayout.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TableRow TableRow(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -290,12 +302,18 @@
     <item name='android.widget.ListView boolean drawChild(android.graphics.Canvas, android.view.View, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AbsListView boolean showContextMenuForChild(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ArrayAdapter ArrayAdapter(android.content.Context, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.FrameLayout FrameLayout(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableLayout void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.StackView void dispatchDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -308,15 +326,12 @@
     <item name='android.widget.AnalogClock AnalogClock(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.Gallery android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.widget.TableLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.TextView void onVisibilityChanged(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridLayout android.widget.GridLayout.Spec spec(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ListView boolean drawChild(android.graphics.Canvas, android.view.View, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -326,12 +341,21 @@
     <item name='android.widget.AbsoluteLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ExpandableListAdapter android.view.View getChildView(int, int, boolean, android.view.View, android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.LinearLayout LinearLayout(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.TableLayout void addView(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RadioGroup android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.LinearLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.CheckBox CheckBox(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -365,15 +389,12 @@
     <item name='android.widget.LinearLayout LinearLayout(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.Gallery android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setContent(android.content.Intent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ArrayAdapter ArrayAdapter(android.content.Context, int, T[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TextSwitcher void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.FrameLayout.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -392,6 +413,9 @@
     <item name='android.widget.TwoLineListItem TwoLineListItem(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RemoteViews.OnClickHandler boolean onClickHandler(android.view.View, android.app.PendingIntent, android.content.Intent) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.VideoView boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -401,10 +425,10 @@
     <item name='android.widget.CompoundButton CompoundButton(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ScrollBarDrawable java.lang.String toString()'>
+    <item name='android.widget.ListView boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ListView boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 1'>
+    <item name='android.widget.TableRow android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.HorizontalScrollView int computeScrollDeltaToGetChildRectOnScreen(android.graphics.Rect) 0'>
@@ -416,9 +440,6 @@
     <item name='android.widget.SearchView.SearchAutoComplete SearchAutoComplete(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RadioGroup android.widget.LinearLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.AdapterView void addView(android.view.View, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -437,30 +458,18 @@
     <item name='android.widget.TwoLineListItem TwoLineListItem(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.FrameLayout android.widget.FrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ArrayAdapter ArrayAdapter(android.content.Context, int, T[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ArrayAdapter android.widget.ArrayAdapter&lt;java.lang.CharSequence&gt; createFromResource(android.content.Context, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.FrameLayout void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.FrameLayout android.widget.FrameLayout.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.TwoLineListItem void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.CursorTreeAdapter void bindChildView(android.view.View, android.content.Context, android.database.Cursor, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setIndicator(java.lang.CharSequence, android.graphics.drawable.Drawable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.TextView boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -470,10 +479,10 @@
     <item name='android.widget.CompoundButton CompoundButton(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsListView long[] getCheckedItemIds()'>
+    <item name='android.widget.GridLayout.LayoutParams LayoutParams(android.widget.GridLayout.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridLayout.LayoutParams LayoutParams(android.widget.GridLayout.LayoutParams) 0'>
+    <item name='android.widget.AdapterView void addView(android.view.View, android.view.ViewGroup.LayoutParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.MultiAutoCompleteTextView.Tokenizer int findTokenStart(java.lang.CharSequence, int) 0'>
@@ -509,9 +518,6 @@
     <item name='android.widget.CursorAdapter void bindView(android.view.View, android.content.Context, android.database.Cursor) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.MultiAutoCompleteTextView.CommaTokenizer java.lang.CharSequence terminateToken(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.QuickContactBadge QuickContactBadge(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -551,6 +557,12 @@
     <item name='android.widget.MediaController void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RelativeLayout.LayoutParams java.lang.String debug(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.AbsListView long[] getCheckedItemIds()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.SimpleCursorTreeAdapter void bindChildView(android.view.View, android.content.Context, android.database.Cursor, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -563,16 +575,13 @@
     <item name='android.widget.ListPopupWindow ListPopupWindow(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.Gallery void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.Toast android.widget.Toast makeText(android.content.Context, java.lang.CharSequence, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.Toast android.widget.Toast makeText(android.content.Context, java.lang.CharSequence, int)'>
+    <item name='android.widget.AbsSpinner android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AbsListView void dispatchDraw(android.graphics.Canvas) 0'>
@@ -584,6 +593,9 @@
     <item name='android.widget.SeekBar SeekBar(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ActivityChooserModel.ActivitySorter void sort(android.content.Intent, java.util.List&lt;android.widget.ActivityChooserModel.ActivityResolveInfo&gt;, java.util.List&lt;android.widget.ActivityChooserModel.HistoricalRecord&gt;) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ZoomButton ZoomButton(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -599,10 +611,10 @@
     <item name='android.widget.ScrollView void addView(android.view.View, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ShareActionProvider void onPrepareSubMenu(android.view.SubMenu) 0'>
+    <item name='android.widget.ZoomButtonsController android.view.ViewGroup getContainer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableLayout android.widget.LinearLayout.LayoutParams generateDefaultLayoutParams()'>
+    <item name='android.widget.ShareActionProvider void onPrepareSubMenu(android.view.SubMenu) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.DialerFilter DialerFilter(android.content.Context, android.util.AttributeSet) 0'>
@@ -614,13 +626,22 @@
     <item name='android.widget.TextView void setFilters(android.text.InputFilter[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ActivityChooserModel.ActivitySorter void sort(android.content.Intent, java.util.List&lt;android.widget.ActivityChooserModel.ActivityResolveInfo&gt;, java.util.List&lt;android.widget.ActivityChooserModel.HistoricalRecord&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.AutoCompleteTextView void replaceText(java.lang.CharSequence) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TableLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.SeekBar SeekBar(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ArrayAdapter android.view.View getDropDownView(int, android.view.View, android.view.ViewGroup)'>
+    <item name='android.widget.Gallery boolean showContextMenuForChild(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.ActivityChooserModel android.widget.ActivityChooserModel get(android.content.Context, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AnalogClock AnalogClock(android.content.Context, android.util.AttributeSet) 0'>
@@ -629,39 +650,39 @@
     <item name='android.widget.TextView void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AppSecurityPermissions android.view.View getPermissionsViewWithRevokeButtons()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.TableLayout android.widget.TableLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.widget.AbsoluteLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AbsSeekBar void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableLayout void addView(android.view.View, android.view.ViewGroup.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TabWidget void sendAccessibilityEventUnchecked(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.HorizontalScrollView boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.HorizontalScrollView boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 1'>
+    <item name='android.widget.VideoView boolean onTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.DialerFilter DialerFilter(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.HorizontalScrollView boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ListPopupWindow ListPopupWindow(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableLayout android.widget.LinearLayout.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+    <item name='android.widget.MediaController boolean onTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.SlidingDrawer void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RemoteViewsService android.os.IBinder onBind(android.content.Intent)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.Scroller Scroller(android.content.Context, android.view.animation.Interpolator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -671,7 +692,7 @@
     <item name='android.widget.ExpandableListView void dispatchDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsListView android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+    <item name='android.widget.NumberPicker.OnValueChangeListener void onValueChange(android.widget.NumberPicker, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.HorizontalScrollView HorizontalScrollView(android.content.Context, android.util.AttributeSet, int) 0'>
@@ -680,6 +701,9 @@
     <item name='android.widget.Gallery boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AbsListView android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AdapterView void addView(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -695,6 +719,9 @@
     <item name='android.widget.ViewSwitcher void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.GridLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ViewAnimator void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -719,13 +746,16 @@
     <item name='android.widget.Spinner void onClick(android.content.DialogInterface, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.FrameLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.CalendarView CalendarView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsListView void reclaimViews(java.util.List&lt;android.view.View&gt;) 0'>
+    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setContent(android.content.Intent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setContent(android.widget.TabHost.TabContentFactory)'>
+    <item name='android.widget.AbsListView void reclaimViews(java.util.List&lt;android.view.View&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.HorizontalScrollView HorizontalScrollView(android.content.Context, android.util.AttributeSet, int) 1'>
@@ -746,9 +776,6 @@
     <item name='android.widget.ScrollView boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ZoomButtonsController android.view.ViewGroup getContainer()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.TabWidget TabWidget(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -770,6 +797,12 @@
     <item name='android.widget.Spinner Spinner(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.Spinner android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.RemoteViews android.widget.RemoteViews clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.EditText EditText(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -785,6 +818,9 @@
     <item name='android.widget.TextView TextView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AbsSpinner android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.RemoteViewsAdapter RemoteViewsAdapter(android.content.Context, android.content.Intent, android.widget.RemoteViewsAdapter.RemoteAdapterConnectionCallback) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -797,6 +833,9 @@
     <item name='android.widget.ActivityChooserModel.HistoricalRecord HistoricalRecord(java.lang.String, long, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ListView android.view.View findViewByPredicateTraversal(com.android.internal.util.Predicate&lt;android.view.View&gt;, android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AbsSpinner void onRestoreInstanceState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -818,6 +857,9 @@
     <item name='android.widget.StackView StackView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AppSecurityPermissions android.view.View getPermissionsViewWithRevokeButtons()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ScrollView void measureChildWithMargins(android.view.View, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -854,7 +896,7 @@
     <item name='android.widget.TableLayout.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TextView android.os.Parcelable onSaveInstanceState()'>
+    <item name='android.widget.GridLayout android.widget.GridLayout.Spec spec(int, android.widget.GridLayout.Alignment)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AbsoluteLayout AbsoluteLayout(android.content.Context, android.util.AttributeSet) 0'>
@@ -866,13 +908,7 @@
     <item name='android.widget.TableLayout void addView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RemoteViews java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.RemoteViewsAdapter android.content.Intent getRemoteViewsServiceIntent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.TextView.BufferType android.widget.TextView.BufferType valueOf(java.lang.String)'>
+    <item name='android.widget.Filter android.widget.Filter.FilterResults performFiltering(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ViewSwitcher ViewSwitcher(android.content.Context) 0'>
@@ -884,18 +920,24 @@
     <item name='android.widget.ListView boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setContent(int)'>
+    <item name='android.widget.TextSwitcher TextSwitcher(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TextSwitcher TextSwitcher(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.widget.ProgressBar android.os.Parcelable onSaveInstanceState()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.LinearLayout.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.Filter java.lang.CharSequence convertResultToString(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.RelativeLayout.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TimePicker android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ViewFlipper void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -905,6 +947,9 @@
     <item name='android.widget.AbsListView void getFocusedRect(android.graphics.Rect) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.HorizontalScrollView void addView(android.view.View, android.view.ViewGroup.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AbsListView boolean onKeyUp(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -935,15 +980,24 @@
     <item name='android.widget.ProgressBar void onRestoreInstanceState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ExpandableListView void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TextView void setTextAppearance(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.NumberPicker boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableLayout android.widget.TableLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Editor.UserDictionaryListener void handleMessage(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ActivityChooserModel.ActivityResolveInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AbsSpinner AbsSpinner(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -953,7 +1007,7 @@
     <item name='android.widget.QuickContactBadge void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ArrayAdapter android.view.View getView(int, android.view.View, android.view.ViewGroup)'>
+    <item name='android.widget.ViewAnimator void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.GridLayout void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
@@ -965,11 +1019,14 @@
     <item name='android.widget.ListView boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.GridView GridView(android.content.Context, android.util.AttributeSet) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ImageButton ImageButton(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridView GridView(android.content.Context, android.util.AttributeSet) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
+    <item name='android.widget.GridView void setAdapter(android.widget.ListAdapter) 0'>
+        <annotation name='org.jetbrains.annotations.Nullable'/>
     </item>
     <item name='android.widget.CalendarView CalendarView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
@@ -1001,9 +1058,6 @@
     <item name='android.widget.AbsSpinner void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridLayout android.widget.GridLayout.Spec spec(int, android.widget.GridLayout.Alignment)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.GridView GridView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1019,15 +1073,15 @@
     <item name='android.widget.ViewFlipper ViewFlipper(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsoluteLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.Button void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AbsListView void onRestoreInstanceState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ResourceCursorTreeAdapter ResourceCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1055,6 +1109,9 @@
     <item name='android.widget.OverScroller OverScroller(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AppSecurityPermissions.PermissionItemView void onClick(android.view.View) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.GridLayout GridLayout(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1064,6 +1121,9 @@
     <item name='android.widget.AbsSeekBar AbsSeekBar(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.MultiAutoCompleteTextView.Tokenizer java.lang.CharSequence terminateToken(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TextView android.view.inputmethod.InputConnection onCreateInputConnection(android.view.inputmethod.EditorInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1082,9 +1142,6 @@
     <item name='android.widget.RadioGroup RadioGroup(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableRow android.widget.LinearLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.AutoCompleteTextView boolean onKeyPreIme(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1097,7 +1154,7 @@
     <item name='android.widget.GridLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.CursorTreeAdapter java.lang.CharSequence convertToString(android.database.Cursor)'>
+    <item name='android.widget.CursorTreeAdapter android.view.View getGroupView(int, boolean, android.view.View, android.view.ViewGroup)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.VideoView boolean onKeyDown(int, android.view.KeyEvent) 1'>
@@ -1109,10 +1166,13 @@
     <item name='android.widget.TableLayout android.widget.TableLayout.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ListPopupWindow void setAdapter(android.widget.ListAdapter) 0'>
+    <item name='android.widget.RadioGroup android.widget.RadioGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridLayout android.widget.GridLayout.LayoutParams generateDefaultLayoutParams()'>
+    <item name='android.widget.ListPopupWindow void setAdapter(android.widget.ListAdapter) 0'>
+        <annotation name='org.jetbrains.annotations.Nullable'/>
+    </item>
+    <item name='android.widget.AbsoluteLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.SpellChecker void onGetSuggestions(android.view.textservice.SuggestionsInfo[]) 0'>
@@ -1127,6 +1187,9 @@
     <item name='android.widget.TwoLineListItem TwoLineListItem(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.LinearLayout android.widget.LinearLayout.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.QuickContactBadge QuickContactBadge(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1139,6 +1202,9 @@
     <item name='android.widget.HorizontalScrollView void addView(android.view.View, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.GridLayout android.widget.GridLayout.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.RatingBar RatingBar(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1151,6 +1217,12 @@
     <item name='android.widget.ImageView.ScaleType android.widget.ImageView.ScaleType valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RelativeLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.ScrollBarDrawable java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ScrollView void requestChildFocus(android.view.View, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1163,58 +1235,49 @@
     <item name='android.widget.TextSwitcher TextSwitcher(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.FrameLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.RelativeLayout.LayoutParams java.lang.String debug(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.DatePicker void onRestoreInstanceState(android.os.Parcelable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.TextView boolean onKeyPreIme(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ActivityChooserModel.HistoricalRecord java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.AbsoluteLayout AbsoluteLayout(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ZoomButtonsController ZoomButtonsController(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RadioGroup android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.RatingBar RatingBar(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.CheckedTextView void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ImageSwitcher void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
+    <item name='android.widget.AbsSpinner AbsSpinner(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsSpinner AbsSpinner(android.content.Context, android.util.AttributeSet, int) 0'>
+    <item name='android.widget.ImageSwitcher void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.LinearLayout LinearLayout(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RelativeLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+    <item name='android.widget.CompoundButton android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.Toast android.widget.Toast makeText(android.content.Context, java.lang.CharSequence, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.NumberPicker boolean onInterceptTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabHost android.widget.TabHost.TabSpec newTabSpec(java.lang.String)'>
+    <item name='android.widget.TextView android.graphics.drawable.Drawable[] getCompoundDrawablesRelative()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.DigitalClock DigitalClock(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.LinearLayout android.widget.LinearLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.widget.RelativeLayout.LayoutParams int[] getRules()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.MultiAutoCompleteTextView void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
@@ -1229,10 +1292,16 @@
     <item name='android.widget.ListView boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RadioGroup void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.StackView void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+    <item name='android.widget.NumberPicker android.widget.NumberPicker.Formatter getTwoDigitFormatter()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.TabHost.TabContentFactory android.view.View createTabContent(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ImageView ImageView(android.content.Context, android.util.AttributeSet, int) 1'>
@@ -1241,28 +1310,25 @@
     <item name='android.widget.PopupWindow void update(android.view.View, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ActivityChooserModel android.widget.ActivityChooserModel get(android.content.Context, java.lang.String)'>
+    <item name='android.widget.RemoteViewsService android.os.IBinder onBind(android.content.Intent)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AdapterViewAnimator AdapterViewAnimator(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsoluteLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+    <item name='android.widget.AutoCompleteTextView.Validator java.lang.CharSequence fixText(java.lang.CharSequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.RemoteViewsAdapter boolean handleMessage(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableRow android.widget.LinearLayout.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.DigitalClock DigitalClock(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsoluteLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+    <item name='android.widget.ZoomControls void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ZoomControls void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
+    <item name='android.widget.FrameLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.RemoteViewsAdapter RemoteViewsAdapter(android.content.Context, android.content.Intent, android.widget.RemoteViewsAdapter.RemoteAdapterConnectionCallback) 1'>
@@ -1274,13 +1340,22 @@
     <item name='android.widget.Editor void addSpanWatchers(android.text.Spannable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.SearchView.SearchAutoComplete void replaceText(java.lang.CharSequence) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.AppSecurityPermissions android.view.View getPermissionsView(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.LinearLayout LinearLayout(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ListPopupWindow boolean onKeyPreIme(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TimePicker android.os.Parcelable onSaveInstanceState()'>
+    <item name='android.widget.TableRow android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.AutoCompleteTextView.Validator boolean isValid(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AdapterView void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
@@ -1295,10 +1370,13 @@
     <item name='android.widget.Spinner Spinner(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableRow android.widget.TableRow.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AlphabetIndexer AlphabetIndexer(android.database.Cursor, int, java.lang.CharSequence) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.CursorTreeAdapter android.view.View getGroupView(int, boolean, android.view.View, android.view.ViewGroup)'>
+    <item name='android.widget.AbsListView.OnScrollListener void onScroll(android.widget.AbsListView, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AdapterViewAnimator AdapterViewAnimator(android.content.Context, android.util.AttributeSet) 0'>
@@ -1331,9 +1409,6 @@
     <item name='android.widget.ListView ListView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AdapterViewAnimator android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.SearchView.SearchAutoComplete boolean onKeyPreIme(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1346,9 +1421,6 @@
     <item name='android.widget.AbsSpinner AbsSpinner(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.CursorTreeAdapter android.view.View getChildView(int, int, boolean, android.view.View, android.view.ViewGroup)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.AbsListView android.widget.AbsListView.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1358,9 +1430,6 @@
     <item name='android.widget.TabWidget void addView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.LinearLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ViewAnimator void setInAnimation(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1388,9 +1457,15 @@
     <item name='android.widget.RelativeLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TextView android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.MediaController MediaController(android.content.Context, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.SeekBar.OnSeekBarChangeListener void onStopTrackingTouch(android.widget.SeekBar) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TabWidget boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1412,9 +1487,6 @@
     <item name='android.widget.TextView void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.CursorAdapter android.view.View getView(int, android.view.View, android.view.ViewGroup)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.RelativeLayout void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1424,10 +1496,13 @@
     <item name='android.widget.TextView void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RelativeLayout.LayoutParams int[] getRules()'>
+    <item name='android.widget.TabHost TabHost(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabHost TabHost(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.widget.FrameLayout android.widget.FrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.DatePicker android.os.Parcelable onSaveInstanceState()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.QuickContactBadge void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
@@ -1448,7 +1523,7 @@
     <item name='android.widget.GridLayout.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.Spinner android.os.Parcelable onSaveInstanceState()'>
+    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setContent(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AdapterView void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 0'>
@@ -1466,16 +1541,19 @@
     <item name='android.widget.ZoomButtonsController boolean onTouch(android.view.View, android.view.MotionEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RadioGroup android.widget.LinearLayout.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.GridView void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AutoCompleteTextView void setAdapter(T) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.PopupWindow int getMaxAvailableHeight(android.view.View) 0'>
+    <item name='android.widget.TabHost TabHost(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabHost TabHost(android.content.Context, android.util.AttributeSet) 1'>
+    <item name='android.widget.PopupWindow int getMaxAvailableHeight(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ViewAnimator void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
@@ -1490,15 +1568,9 @@
     <item name='android.widget.RadioGroup android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setIndicator(android.view.View)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.PopupWindow int getMaxAvailableHeight(android.view.View, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.Gallery android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.FrameLayout.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1508,9 +1580,6 @@
     <item name='android.widget.ZoomButton ZoomButton(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsListView android.widget.AbsListView.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.TableLayout TableLayout(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1535,10 +1604,7 @@
     <item name='android.widget.AbsListView void setRemoteViewsAdapter(android.content.Intent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.RelativeLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.widget.TextView android.graphics.drawable.Drawable[] getCompoundDrawables()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.HorizontalScrollView boolean onTouchEvent(android.view.MotionEvent) 0'>
@@ -1547,6 +1613,12 @@
     <item name='android.widget.Switch void setSwitchTextAppearance(android.content.Context, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AbsListView android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.AdapterView void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.OverScroller OverScroller(android.content.Context, android.view.animation.Interpolator, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1580,18 +1652,12 @@
     <item name='android.widget.DialerFilter boolean onKeyUp(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.MultiAutoCompleteTextView.Tokenizer java.lang.CharSequence terminateToken(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.FrameLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ProgressBar ProgressBar(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RemoteViewsAdapter android.view.View getView(int, android.view.View, android.view.ViewGroup)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.RadioGroup.LayoutParams void setBaseAttributes(android.content.res.TypedArray, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1604,21 +1670,24 @@
     <item name='android.widget.TabWidget void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TextView void onRestoreInstanceState(android.os.Parcelable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TableRow android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.RatingBar RatingBar(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.CursorAdapter java.lang.CharSequence convertToString(android.database.Cursor)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.FrameLayout android.widget.FrameLayout.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AbsSeekBar AbsSeekBar(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AutoCompleteTextView.Validator java.lang.CharSequence fixText(java.lang.CharSequence) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Spinner Spinner(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1628,12 +1697,18 @@
     <item name='android.widget.AbsSpinner void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RemoteViewsAdapter android.content.Intent getRemoteViewsServiceIntent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Chronometer Chronometer(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AbsoluteLayout AbsoluteLayout(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.LinearLayout.LayoutParams java.lang.String debug(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ViewSwitcher ViewSwitcher(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1643,7 +1718,7 @@
     <item name='android.widget.ActivityChooserView ActivityChooserView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableRow android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+    <item name='android.widget.CursorTreeAdapter java.lang.CharSequence convertToString(android.database.Cursor)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.SimpleCursorTreeAdapter SimpleCursorTreeAdapter(android.content.Context, android.database.Cursor, int, java.lang.String[], int[], int, java.lang.String[], int[]) 0'>
@@ -1694,6 +1769,9 @@
     <item name='android.widget.TabWidget void dispatchDraw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TabHost android.widget.TabHost.TabSpec newTabSpec(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ViewFlipper void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1712,9 +1790,6 @@
     <item name='android.widget.TableRow.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableLayout android.widget.LinearLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ListPopupWindow ListPopupWindow(android.content.Context, android.util.AttributeSet, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1730,10 +1805,10 @@
     <item name='android.widget.TimePicker void onConfigurationChanged(android.content.res.Configuration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AdapterViewFlipper void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
+    <item name='android.widget.TabHost boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabHost boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
+    <item name='android.widget.AdapterViewFlipper void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.CompoundButton void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
@@ -1742,15 +1817,15 @@
     <item name='android.widget.GridView boolean onKeyMultiple(int, int, android.view.KeyEvent) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.CursorTreeAdapter java.lang.String convertToString(android.database.Cursor)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.SearchView.SearchAutoComplete SearchAutoComplete(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AdapterView AdapterView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RemoteViewsAdapter android.view.View getView(int, android.view.View, android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.SearchView SearchView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1778,9 +1853,6 @@
     <item name='android.widget.RadioButton void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsListView android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.CheckBox CheckBox(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1808,6 +1880,9 @@
     <item name='android.widget.TableLayout android.widget.LinearLayout.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ScrollView void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Gallery boolean onScroll(android.view.MotionEvent, android.view.MotionEvent, float, float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1826,9 +1901,15 @@
     <item name='android.widget.CompoundButton CompoundButton(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AutoCompleteTextView java.lang.CharSequence convertSelectionToString(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ZoomButton ZoomButton(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TextView.BufferType android.widget.TextView.BufferType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TimePicker TimePicker(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1838,9 +1919,15 @@
     <item name='android.widget.SearchView boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ArrayAdapter android.view.View getView(int, android.view.View, android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ImageButton void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.GridLayout android.widget.GridLayout.Spec spec(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TimePicker TimePicker(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1853,9 +1940,6 @@
     <item name='android.widget.RadioGroup.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridLayout android.widget.GridLayout.Spec spec(int, int, android.widget.GridLayout.Alignment)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ImageView void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1868,9 +1952,6 @@
     <item name='android.widget.AbsListView void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.LinearLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.Spinner Spinner(android.content.Context, android.util.AttributeSet, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1889,6 +1970,9 @@
     <item name='android.widget.NumberPicker boolean dispatchTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ExpandableListAdapter android.view.View getGroupView(int, boolean, android.view.View, android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ScrollView ScrollView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1916,6 +2000,9 @@
     <item name='android.widget.ArrayAdapter ArrayAdapter(android.content.Context, int, int, java.util.List&lt;T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TextView android.text.TextPaint getPaint()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ToggleButton ToggleButton(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1925,15 +2012,18 @@
     <item name='android.widget.AbsListView.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.NumberPicker android.widget.NumberPicker.Formatter getTwoDigitFormatter()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ScrollView void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AbsSeekBar AbsSeekBar(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.Gallery android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.AbsListView android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.RemoteViews void reapply(android.content.Context, android.view.View) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1946,9 +2036,6 @@
     <item name='android.widget.ScrollView ScrollView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.PopupMenu android.view.MenuInflater getMenuInflater()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.TableRow void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1958,9 +2045,18 @@
     <item name='android.widget.ZoomButton void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TextView.SavedState java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setIndicator(android.view.View)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.DatePicker DatePicker(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AbsListView android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ToggleButton ToggleButton(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2003,6 +2099,15 @@
     <item name='android.widget.AdapterViewFlipper AdapterViewFlipper(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableLayout android.widget.LinearLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.ArrayAdapter android.view.View getDropDownView(int, android.view.View, android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.ImageView.ScaleType android.widget.ImageView.ScaleType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TextView void setTextKeepState(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2012,6 +2117,9 @@
     <item name='android.widget.ImageSwitcher ImageSwitcher(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.GridLayout android.widget.GridLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Gallery boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2033,11 +2141,8 @@
     <item name='android.widget.SimpleExpandableListAdapter SimpleExpandableListAdapter(android.content.Context, java.util.List&lt;? extends java.util.Map&lt;java.lang.String,?&gt;&gt;, int, int, java.lang.String[], int[], java.util.List&lt;? extends java.util.List&lt;? extends java.util.Map&lt;java.lang.String,?&gt;&gt;&gt;, int, java.lang.String[], int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsSpinner android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.DatePicker android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
+    <item name='android.widget.ListView void setAdapter(android.widget.ListAdapter) 0'>
+        <annotation name='org.jetbrains.annotations.Nullable'/>
     </item>
     <item name='android.widget.ToggleButton ToggleButton(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
@@ -2060,10 +2165,10 @@
     <item name='android.widget.ImageView void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ImageSwitcher ImageSwitcher(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.widget.AdapterViewFlipper AdapterViewFlipper(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AdapterViewFlipper AdapterViewFlipper(android.content.Context, android.util.AttributeSet) 0'>
+    <item name='android.widget.ImageSwitcher ImageSwitcher(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ResourceCursorAdapter ResourceCursorAdapter(android.content.Context, int, android.database.Cursor, boolean) 0'>
@@ -2087,10 +2192,10 @@
     <item name='android.widget.ListView ListView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+    <item name='android.widget.SimpleAdapter void setViewImage(android.widget.ImageView, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.SimpleAdapter void setViewImage(android.widget.ImageView, java.lang.String) 1'>
+    <item name='android.widget.LinearLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.TableLayout.LayoutParams void setBaseAttributes(android.content.res.TypedArray, int, int) 0'>
@@ -2114,9 +2219,6 @@
     <item name='android.widget.TableLayout void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RadioGroup android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.MultiAutoCompleteTextView MultiAutoCompleteTextView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2132,42 +2234,45 @@
     <item name='android.widget.ListView ListView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RadioGroup android.widget.LinearLayout.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.GridLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.TextView.SavedState void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ScrollView boolean executeKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.HorizontalScrollView void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.ProgressBar void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.EditText void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RadioGroup android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.GridLayout android.widget.GridLayout.Spec spec(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AppSecurityPermissions.PermissionItemView PermissionItemView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.SimpleCursorTreeAdapter void setViewText(android.widget.TextView, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ScrollView ScrollView(android.content.Context, android.util.AttributeSet) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.TableLayout.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AppSecurityPermissions android.view.View getPermissionItemView(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean)'>
+    <item name='android.widget.ScrollView ScrollView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.VideoView void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setIndicator(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AbsSeekBar boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2180,24 +2285,30 @@
     <item name='android.widget.AdapterView boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RemoteViews java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.GridLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.CursorTreeAdapter java.lang.String convertToString(android.database.Cursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AbsoluteLayout.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.SlidingDrawer SlidingDrawer(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.EdgeEffect android.graphics.Rect getBounds(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.Filter java.lang.CharSequence convertResultToString(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ScrollView ScrollView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.RemoteViews android.view.View apply(android.content.Context, android.view.ViewGroup) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.AppSecurityPermissions android.view.View getPermissionItemView(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.CheckedTextView CheckedTextView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2243,6 +2354,9 @@
     <item name='android.widget.Gallery boolean onTouchEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableRow android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.HorizontalScrollView HorizontalScrollView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2276,15 +2390,9 @@
     <item name='android.widget.StackView StackView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TextView.SavedState java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.RelativeLayout RelativeLayout(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ImageView.ScaleType android.widget.ImageView.ScaleType valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.AppSecurityPermissions.PermissionItemView PermissionItemView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2321,9 +2429,6 @@
     <item name='android.widget.StackView StackView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.AbsListView AbsListView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2333,6 +2438,9 @@
     <item name='android.widget.TimePicker TimePicker(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.FrameLayout android.widget.FrameLayout.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Space void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2348,18 +2456,15 @@
     <item name='android.widget.Gallery.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsoluteLayout.LayoutParams java.lang.String debug(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.GridLayout android.widget.GridLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.VideoView void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.TableRow android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.Filter java.lang.CharSequence convertResultToString(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Chronometer void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2381,6 +2486,9 @@
     <item name='android.widget.VideoView VideoView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.GridLayout android.widget.GridLayout.Spec spec(int, int, android.widget.GridLayout.Alignment)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TableRow android.widget.TableRow.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2402,16 +2510,22 @@
     <item name='android.widget.SimpleAdapter SimpleAdapter(android.content.Context, java.util.List&lt;? extends java.util.Map&lt;java.lang.String,?&gt;&gt;, int, java.lang.String[], int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.GridLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AbsListView void draw(android.graphics.Canvas) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.Button Button(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.EdgeEffect android.graphics.Rect getBounds(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.PopupWindow PopupWindow(android.content.Context, android.util.AttributeSet, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.FrameLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+    <item name='android.widget.TabWidget TabWidget(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AdapterView void addView(android.view.View) 0'>
@@ -2420,16 +2534,13 @@
     <item name='android.widget.ScrollView void addView(android.view.View) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabWidget TabWidget(android.content.Context, android.util.AttributeSet, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ZoomControls void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ProgressBar android.os.Parcelable onSaveInstanceState()'>
+    <item name='android.widget.SlidingDrawer SlidingDrawer(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.SlidingDrawer SlidingDrawer(android.content.Context, android.util.AttributeSet) 1'>
+    <item name='android.widget.ShareActionProvider android.view.View onCreateActionView()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.Button Button(android.content.Context, android.util.AttributeSet, int) 1'>
@@ -2438,6 +2549,9 @@
     <item name='android.widget.ExpandableListView ExpandableListView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.RelativeLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AbsSpinner AbsSpinner(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2450,21 +2564,24 @@
     <item name='android.widget.OverScroller OverScroller(android.content.Context, android.view.animation.Interpolator, float, float, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridLayout android.widget.GridLayout.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.TabHost void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ScrollBarDrawable void drawThumb(android.graphics.Canvas, android.graphics.Rect, int, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AutoCompleteTextView boolean onKeyDown(int, android.view.KeyEvent) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ExpandableListView ExpandableListView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.MultiAutoCompleteTextView.CommaTokenizer java.lang.CharSequence terminateToken(java.lang.CharSequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.RadioGroup void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2474,9 +2591,15 @@
     <item name='android.widget.ImageView void setColorFilter(int, android.graphics.PorterDuff.Mode) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.Gallery android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Gallery.LayoutParams LayoutParams(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ViewSwitcher void addView(android.view.View, int, android.view.ViewGroup.LayoutParams) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.TabWidget void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2498,7 +2621,16 @@
     <item name='android.widget.EditText EditText(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TextView android.graphics.drawable.Drawable[] getCompoundDrawablesRelative()'>
+    <item name='android.widget.AdapterViewAnimator android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.SeekBar.OnSeekBarChangeListener void onProgressChanged(android.widget.SeekBar, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.AbsListView void setAdapter(android.widget.ListAdapter) 0'>
+        <annotation name='org.jetbrains.annotations.Nullable'/>
+    </item>
+    <item name='android.widget.ArrayAdapter android.widget.ArrayAdapter&lt;java.lang.CharSequence&gt; createFromResource(android.content.Context, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.TextView boolean extractText(android.view.inputmethod.ExtractedTextRequest, android.view.inputmethod.ExtractedText) 1'>
@@ -2522,33 +2654,24 @@
     <item name='android.widget.Space Space(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.CompoundButton android.os.Parcelable onSaveInstanceState()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.CheckedTextView CheckedTextView(android.content.Context, android.util.AttributeSet, int) 0'>
+    <item name='android.widget.TextView boolean onTrackballEvent(android.view.MotionEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.Chronometer Chronometer(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.CheckedTextView CheckedTextView(android.content.Context, android.util.AttributeSet, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.CalendarView void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.HorizontalScrollView boolean dispatchKeyEvent(android.view.KeyEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TableRow android.widget.TableRow.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.Gallery Gallery(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.FrameLayout android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.TableRow android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.SearchView.SearchAutoComplete SearchAutoComplete(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2561,6 +2684,9 @@
     <item name='android.widget.TextView boolean extractText(android.view.inputmethod.ExtractedTextRequest, android.view.inputmethod.ExtractedText) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.CursorAdapter android.view.View newView(android.content.Context, android.database.Cursor, android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.DatePicker DatePicker(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2576,10 +2702,10 @@
     <item name='android.widget.Space Space(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AppSecurityPermissions android.view.View getPermissionsView(int)'>
+    <item name='android.widget.CheckedTextView CheckedTextView(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.CheckedTextView CheckedTextView(android.content.Context, android.util.AttributeSet, int) 1'>
+    <item name='android.widget.PopupMenu void onCloseMenu(com.android.internal.view.menu.MenuBuilder, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.MultiAutoCompleteTextView.CommaTokenizer int findTokenStart(java.lang.CharSequence, int) 0'>
@@ -2591,6 +2717,9 @@
     <item name='android.widget.Chronometer Chronometer(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ScrollBarDrawable void onBoundsChange(android.graphics.Rect) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.PopupWindow int getMaxAvailableHeight(android.view.View, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2633,7 +2762,7 @@
     <item name='android.widget.LinearLayout.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.GridLayout android.widget.GridLayout.Spec spec(int, int)'>
+    <item name='android.widget.TextView void onTextChanged(java.lang.CharSequence, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.ProgressBar ProgressBar(android.content.Context, android.util.AttributeSet, int, int) 1'>
@@ -2648,6 +2777,9 @@
     <item name='android.widget.Gallery android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableLayout android.widget.LinearLayout.LayoutParams generateDefaultLayoutParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.GridView void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2666,15 +2798,15 @@
     <item name='android.widget.RatingBar RatingBar(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TableLayout android.widget.LinearLayout.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Gallery Gallery(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AbsListView AbsListView(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.ActivityChooserModel.ActivityResolveInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.PopupWindow PopupWindow(android.content.Context, android.util.AttributeSet, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2684,6 +2816,9 @@
     <item name='android.widget.RadioButton RadioButton(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setContent(android.widget.TabHost.TabContentFactory)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.Gallery Gallery(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2711,6 +2846,9 @@
     <item name='android.widget.EditText void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ScrollView void addView(android.view.View, android.view.ViewGroup.LayoutParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.AbsListView.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2735,6 +2873,12 @@
     <item name='android.widget.SimpleCursorAdapter SimpleCursorAdapter(android.content.Context, int, android.database.Cursor, java.lang.String[], int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.Filter void publishResults(java.lang.CharSequence, android.widget.Filter.FilterResults) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.TableRow android.widget.LinearLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.GridLayout.LayoutParams LayoutParams(android.view.ViewGroup.LayoutParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2753,9 +2897,6 @@
     <item name='android.widget.TableRow TableRow(android.content.Context, android.util.AttributeSet) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RemoteViews android.widget.RemoteViews clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.SearchView SearchView(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2780,13 +2921,10 @@
     <item name='android.widget.RemoteViews void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RelativeLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.ScrollView void measureChild(android.view.View, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RemoteViewsAdapter android.view.View getView(int, android.view.View, android.view.ViewGroup) 2'>
+    <item name='android.widget.Toast android.widget.Toast makeText(android.content.Context, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.RemoteViews void reapply(android.content.Context, android.view.View, android.widget.RemoteViews.OnClickHandler) 1'>
@@ -2798,18 +2936,12 @@
     <item name='android.widget.MultiAutoCompleteTextView void replaceText(java.lang.CharSequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.AbsSpinner android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.widget.LinearLayout.LayoutParams java.lang.String debug(java.lang.String)'>
+    <item name='android.widget.AbsoluteLayout android.view.ViewGroup.LayoutParams generateDefaultLayoutParams()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.VideoView VideoView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.TabHost.TabSpec android.widget.TabHost.TabSpec setIndicator(java.lang.CharSequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.widget.SimpleAdapter void setViewText(android.widget.TextView, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2819,7 +2951,7 @@
     <item name='android.widget.GridView GridView(android.content.Context, android.util.AttributeSet, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.widget.RelativeLayout android.widget.RelativeLayout.LayoutParams generateLayoutParams(android.util.AttributeSet)'>
+    <item name='android.widget.ActivityChooserModel.HistoricalRecord java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.widget.AbsListView boolean onGenericMotionEvent(android.view.MotionEvent) 0'>
@@ -2840,6 +2972,9 @@
     <item name='android.widget.Space Space(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ResourceCursorAdapter android.view.View newView(android.content.Context, android.database.Cursor, android.view.ViewGroup)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.SimpleCursorTreeAdapter SimpleCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, java.lang.String[], int[], int, java.lang.String[], int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -2852,6 +2987,12 @@
     <item name='android.widget.PopupWindow PopupWindow(android.content.Context, android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.widget.ExpandableListView android.os.Parcelable onSaveInstanceState()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.widget.NumberPicker.Formatter java.lang.String format(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.widget.RelativeLayout android.widget.RelativeLayout.LayoutParams generateLayoutParams(android.util.AttributeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/dalvik/system/annotations.xml b/android-sdk-annotations/dalvik/system/annotations.xml
index 10f8dc849be..569a973b04a 100644
--- a/android-sdk-annotations/dalvik/system/annotations.xml
+++ b/android-sdk-annotations/dalvik/system/annotations.xml
@@ -1,56 +1,65 @@
 <root>
-    <item name='dalvik.system.DexFile java.util.Enumeration&lt;java.lang.String&gt; entries()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.DexFile dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.BaseDexClassLoader java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.SocketTagger void tag(java.net.Socket) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.CloseGuard dalvik.system.CloseGuard get()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.CloseGuard void setReporter(dalvik.system.CloseGuard.Reporter) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.BaseDexClassLoader java.lang.Class&lt;?&gt; findClass(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.CloseGuard void open(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.DexClassLoader DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.BlockGuard void setThreadPolicy(dalvik.system.BlockGuard.Policy) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.BaseDexClassLoader java.lang.String getLdLibraryPath()'>
+    <item name='dalvik.system.BlockGuard.BlockGuardPolicyException java.lang.String getMessage()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.DexFile java.lang.String getName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.BaseDexClassLoader java.util.Enumeration&lt;java.net.URL&gt; findResources(java.lang.String)'>
+    <item name='dalvik.system.BaseDexClassLoader java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.DalvikLogHandler void publish(java.util.logging.Logger, java.lang.String, java.util.logging.Level, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.SocketTagger void tag(java.net.Socket) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.VMRuntime dalvik.system.VMRuntime getRuntime()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.CloseGuard dalvik.system.CloseGuard get()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.DalvikLogHandler void publish(java.util.logging.Logger, java.lang.String, java.util.logging.Level, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.CloseGuard void setReporter(dalvik.system.CloseGuard.Reporter) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.CloseGuard void open(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.DalvikLogging java.lang.String loggerNameToTag(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.DexClassLoader DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BaseDexClassLoader java.lang.Class&lt;?&gt; findClass(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BlockGuard void setThreadPolicy(dalvik.system.BlockGuard.Policy) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BaseDexClassLoader java.util.Enumeration&lt;java.net.URL&gt; findResources(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.DexFile java.util.Enumeration&lt;java.lang.String&gt; entries()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.Zygote void appendQuotedShellArgs(java.lang.StringBuilder, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.VMDebug void dumpHprofData(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.BaseDexClassLoader java.lang.Class&lt;?&gt; findClass(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.DexFile java.lang.Class loadClass(java.lang.String, java.lang.ClassLoader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.BlockGuard.BlockGuardPolicyException java.lang.String getMessage()'>
+    <item name='dalvik.system.DexFile dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.SocketTagger void set(dalvik.system.SocketTagger) 0'>
@@ -62,13 +71,16 @@
     <item name='dalvik.system.DexFile dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.DexClassLoader DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='dalvik.system.PathClassLoader PathClassLoader(java.lang.String, java.lang.ClassLoader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.VMRuntime dalvik.system.VMRuntime getRuntime()'>
+    <item name='dalvik.system.DexClassLoader DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BaseDexClassLoader java.lang.String getLdLibraryPath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BaseDexClassLoader java.net.URL findResource(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.PathClassLoader PathClassLoader(java.lang.String, java.lang.String, java.lang.ClassLoader) 0'>
@@ -80,6 +92,9 @@
     <item name='dalvik.system.SocketTagger void untag(java.net.Socket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.CloseGuard.Reporter void report(java.lang.String, java.lang.Throwable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.DexFile DexFile(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/dalvik/system/profiler/annotations.xml b/android-sdk-annotations/dalvik/system/profiler/annotations.xml
index ad55d79f688..85a9635f60a 100644
--- a/android-sdk-annotations/dalvik/system/profiler/annotations.xml
+++ b/android-sdk-annotations/dalvik/system/profiler/annotations.xml
@@ -2,34 +2,37 @@
     <item name='dalvik.system.profiler.HprofData void addThreadEvent(dalvik.system.profiler.HprofData.ThreadEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.StackTrace java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.HprofData java.util.Set&lt;dalvik.system.profiler.HprofData.Sample&gt; getSamples()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.BinaryHprof.ControlSettings dalvik.system.profiler.BinaryHprof.ControlSettings valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newThreadGroupThreadSet(java.lang.ThreadGroup)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='dalvik.system.profiler.BinaryHprof.ControlSettings dalvik.system.profiler.BinaryHprof.ControlSettings valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData java.util.Set&lt;dalvik.system.profiler.HprofData.Sample&gt; getSamples()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent start(int, int, java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData.ThreadEventType dalvik.system.profiler.HprofData.ThreadEventType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.profiler.HprofData java.util.List&lt;dalvik.system.profiler.HprofData.ThreadEvent&gt; getThreadHistory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.profiler.SamplingProfiler.ThreadSet java.lang.Thread[] threads()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.profiler.HprofData.ThreadEventType dalvik.system.profiler.HprofData.ThreadEventType valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.HprofData getHprofData()'>
+    <item name='dalvik.system.profiler.BinaryHprof.ControlSettings dalvik.system.profiler.BinaryHprof.ControlSettings valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.HprofBinaryToAscii void main(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.ThreadEventType dalvik.system.profiler.HprofData.ThreadEventType valueOf(java.lang.String)'>
+    <item name='dalvik.system.profiler.ThreadSampler java.lang.StackTraceElement[] getStackTrace(java.lang.Thread) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent start(int, int, java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.BinaryHprof.Tag dalvik.system.profiler.BinaryHprof.Tag valueOf(java.lang.String) 0'>
@@ -38,49 +41,52 @@
     <item name='dalvik.system.profiler.BinaryHprofReader BinaryHprofReader(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData java.util.List&lt;dalvik.system.profiler.HprofData.ThreadEvent&gt; getThreadHistory()'>
+    <item name='dalvik.system.profiler.HprofData.ThreadEvent java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newArrayThreadSet(java.lang.Thread...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.AsciiHprofWriter void write(dalvik.system.profiler.HprofData, java.io.OutputStream) 1'>
+    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newArrayThreadSet(java.lang.Thread...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent end(int)'>
+    <item name='dalvik.system.profiler.AsciiHprofWriter void write(dalvik.system.profiler.HprofData, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.HprofData HprofData(java.util.Map&lt;dalvik.system.profiler.HprofData.StackTrace,int[]&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData.StackTrace java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.profiler.HprofData void addStackTrace(dalvik.system.profiler.HprofData.StackTrace, int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.ThreadEvent java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.BinaryHprofReader dalvik.system.profiler.HprofData getHprofData()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent start(int, int, java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newArrayThreadSet(java.lang.Thread...)'>
+    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newThreadGroupThreadSet(java.lang.ThreadGroup)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.BinaryHprofWriter void write(dalvik.system.profiler.HprofData, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.Sample java.lang.String toString()'>
+    <item name='dalvik.system.profiler.BinaryHprof.Tag dalvik.system.profiler.BinaryHprof.Tag valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.BinaryHprof.Tag dalvik.system.profiler.BinaryHprof.Tag valueOf(java.lang.String)'>
+    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.HprofData getHprofData()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.HprofData.StackTrace StackTrace(int, int, java.lang.StackTraceElement[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData.Sample java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newThreadGroupThreadSet(java.lang.ThreadGroup) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent end(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.profiler.BinaryHprofReader dalvik.system.profiler.HprofData getHprofData()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/core/annotations.xml b/android-sdk-annotations/gov/nist/core/annotations.xml
index 55189a1fd22..9a601f27df7 100644
--- a/android-sdk-annotations/gov/nist/core/annotations.xml
+++ b/android-sdk-annotations/gov/nist/core/annotations.xml
@@ -1,101 +1,59 @@
 <root>
-    <item name='gov.nist.core.LexerCore gov.nist.core.Token[] peekNextToken(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.MultiValueMapImpl java.util.Set entrySet()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.LexerCore java.lang.String number()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.HostPort java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.HostPort java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.ThreadAuditor java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.GenericObjectList boolean isMySubclass(java.lang.Class&lt;?&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.GenericObjectList java.lang.String getIndentation()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.ThreadAuditor.ThreadHandle java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.GenericObjectList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.LexerCore java.lang.String byteStringNoSlash()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.LexerCore java.lang.String charAsString(char)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.DuplicateNameValueList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.GenericObjectList boolean match(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.ThreadAuditor void ping(gov.nist.core.ThreadAuditor.ThreadHandle) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.NameValueList boolean containsKey(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.GenericObject java.lang.String getIndentation()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.DuplicateNameValueList java.util.Collection&lt;gov.nist.core.NameValue&gt; values()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.GenericObject boolean isMySubclass(java.lang.Class&lt;?&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.NameValueList java.lang.String getParameter(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.GenericObject java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.HostNameParser HostNameParser(gov.nist.core.LexerCore) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.LexerCore java.util.Hashtable addLexer(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.DuplicateNameValueList java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.GenericObject java.lang.Object makeClone(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.Host java.lang.StringBuffer encode(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.NameValueList java.lang.Object remove(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.DuplicateNameValueList java.util.Collection getNameValue(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.NameValueList boolean hasNameValue(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.NameValueList boolean delete(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.NameValueList java.lang.Object get(java.lang.Object) 0'>
+    <item name='gov.nist.core.MultiValueMap java.lang.Object remove(K, V) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.HostNameParser java.lang.String ipv6Reference()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.NameValueList java.lang.Object clone()'>
+    <item name='gov.nist.core.HostPort java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.Host java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObjectList boolean match(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObjectList void addFirst(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.DuplicateNameValueList gov.nist.core.NameValue put(java.lang.String, gov.nist.core.NameValue)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.NameValue java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.MultiValueMapImpl java.util.List&lt;V&gt; put(java.lang.String, V)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.ServerLogger void logMessage(gov.nist.javax.sip.message.SIPMessage, java.lang.String, java.lang.String, java.lang.String, boolean, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.LexerCore java.lang.String charAsString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.ThreadAuditor.ThreadHandle java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.HostNameParser HostNameParser(gov.nist.core.LexerCore) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObject java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.NameValueList java.lang.String getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObject java.lang.Object makeClone(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.DuplicateNameValueList java.util.Collection getNameValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.NameValueList boolean delete(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.LexerCore java.lang.String charAsString(char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.DuplicateNameValueList void set(java.lang.String, java.lang.Object) 0'>
@@ -104,16 +62,10 @@
     <item name='gov.nist.core.NameValueList gov.nist.core.NameValue remove(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.ThreadAuditor gov.nist.core.ThreadAuditor.ThreadHandle addCurrentThread()'>
+    <item name='gov.nist.core.ServerLogger void logMessage(gov.nist.javax.sip.message.SIPMessage, java.lang.String, java.lang.String, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.ParserCore gov.nist.core.NameValue nameValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.LogWriter java.lang.String getLoggerName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.MultiValueMapImpl java.util.Collection values()'>
+    <item name='gov.nist.core.MultiValueMapImpl java.util.Set entrySet()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.NameValueList java.lang.Object getValue(java.lang.String) 0'>
@@ -122,85 +74,64 @@
     <item name='gov.nist.core.NameValueList void set(gov.nist.core.NameValue) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.HostNameParser gov.nist.core.HostPort hostPort(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.DuplicateNameValueList boolean delete(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.DuplicateNameValueList void set(gov.nist.core.NameValue) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.Host boolean isIPv6Reference(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.MultiValueMapImpl void putAll(java.util.Map&lt;? extends java.lang.String,? extends java.util.List&lt;V&gt;&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.HostPort java.lang.StringBuffer encode(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.Token java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.NameValue java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.HostNameParser HostNameParser(java.lang.String) 0'>
+    <item name='gov.nist.core.GenericObjectList java.lang.String getIndentation()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.StringTokenizer java.lang.String nextToken()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.NameValueList gov.nist.core.NameValue get(java.lang.Object) 0'>
+    <item name='gov.nist.core.HostNameParser HostNameParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.HostPort java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.Host java.lang.String encode()'>
+    <item name='gov.nist.core.LexerCore java.lang.String getString(char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.GenericObject void setMatcher(gov.nist.core.Match) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.NameValueList java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.StringTokenizer java.lang.String getLine()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.core.LexerCore java.lang.String byteStringNoSemicolon()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.LexerCore java.text.ParseException createParseException()'>
+    <item name='gov.nist.core.NameValueList java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.Host java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.core.LexerCore java.text.ParseException createParseException()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.core.NameValueList gov.nist.core.NameValue getNameValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.core.HostPort java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.HostPort java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.DuplicateNameValueList java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.core.GenericObject void sprint(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.GenericObjectList java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.LexerCore java.lang.String byteStringNoComma()'>
+    <item name='gov.nist.core.ThreadAuditor java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.DuplicateNameValueList java.lang.String getParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.NameValueList java.lang.String encode()'>
+    <item name='gov.nist.core.NameValueList void putAll(java.util.Map&lt;? extends java.lang.String,? extends gov.nist.core.NameValue&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.DuplicateNameValueList gov.nist.core.NameValue put(java.lang.String, gov.nist.core.NameValue)'>
+    <item name='gov.nist.core.LexerCore void selectLexer(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.StringTokenizer java.util.Vector&lt;java.lang.String&gt; getLines()'>
+    <item name='gov.nist.core.StackLogger void setStackProperties(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObject java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.Host Host(java.lang.String) 0'>
@@ -209,58 +140,178 @@
     <item name='gov.nist.core.LexerCore void addKeyword(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.LexerCore java.lang.String getString(char)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.DuplicateNameValueList boolean hasNameValue(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.LexerCore java.lang.String charAsString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.MultiValueMapImpl java.util.List&lt;V&gt; put(java.lang.String, V)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.MultiValueMapImpl java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.core.LexerCore void consumeValidChars(char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.StringTokenizer java.lang.String getNextToken(char)'>
+    <item name='gov.nist.core.MultiValueMapImpl java.lang.Object remove(java.lang.Object, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.NameValueList java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.DuplicateNameValueList java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.HostNameParser gov.nist.core.Host host()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.StringTokenizer java.lang.String peekLine()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.ParserCore gov.nist.core.NameValue nameValue(char)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.core.NameValueList void set(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.LexerCore LexerCore(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.core.NameValue java.lang.Object setValue(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.core.DuplicateNameValueList java.lang.Object getValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.StringTokenizer StringTokenizer(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.core.ServerLogger void setStackProperties(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObjectList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.LexerCore java.lang.String number()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.HostPort void merge(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObjectList boolean isMySubclass(java.lang.Class&lt;?&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.LexerCore java.lang.String byteStringNoSlash()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.HostNameParser gov.nist.core.Host host()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.core.GenericObjectList java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.core.StringTokenizer java.util.Vector&lt;java.lang.String&gt; getLines()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.ThreadAuditor void ping(gov.nist.core.ThreadAuditor.ThreadHandle) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.ServerLogger void logMessage(gov.nist.javax.sip.message.SIPMessage, java.lang.String, java.lang.String, boolean, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObject boolean isMySubclass(java.lang.Class&lt;?&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.LexerCore java.util.Hashtable addLexer(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.LogWriter void setStackProperties(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.core.GenericObject java.lang.StringBuffer encode(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.core.GenericObjectList java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.StringTokenizer java.lang.String getLine()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.NameValueList boolean hasNameValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.MultiValueMapImpl java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.StackLogger java.lang.String getLoggerName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.LexerCore java.lang.String byteStringNoComma()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.NameValue java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.HostPort java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.DuplicateNameValueList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObjectList void mergeObjects(gov.nist.core.GenericObjectList) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.ParserCore gov.nist.core.NameValue nameValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.Host boolean isIPv6Reference(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.DuplicateNameValueList void set(gov.nist.core.NameValue) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.DuplicateNameValueList boolean delete(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.Token java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.MultiValueMapImpl void putAll(java.util.Map&lt;? extends java.lang.String,? extends java.util.List&lt;V&gt;&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.DuplicateNameValueList java.util.Collection&lt;gov.nist.core.NameValue&gt; values()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.core.MultiValueMapImpl java.util.Set&lt;java.lang.String&gt; keySet()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.core.GenericObject void merge(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.LexerCore gov.nist.core.Token[] peekNextToken(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.MultiValueMapImpl java.util.Collection values()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.NameValueList gov.nist.core.NameValue get(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.StringTokenizer java.lang.String peekLine()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.NameValueList java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.LogWriter java.lang.String getLoggerName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObject java.lang.String getIndentation()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.DuplicateNameValueList boolean hasNameValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.Host java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.HostNameParser gov.nist.core.HostPort hostPort(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.ThreadAuditor gov.nist.core.ThreadAuditor.ThreadHandle addCurrentThread()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.ServerLogger void setSipStack(javax.sip.SipStack) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.GenericObject java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.ParserCore gov.nist.core.NameValue nameValue(char)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.StringTokenizer java.lang.String getNextToken(char)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/core/net/annotations.xml b/android-sdk-annotations/gov/nist/core/net/annotations.xml
index c01c24a7963..c8603516a7b 100644
--- a/android-sdk-annotations/gov/nist/core/net/annotations.xml
+++ b/android-sdk-annotations/gov/nist/core/net/annotations.xml
@@ -2,7 +2,34 @@
     <item name='gov.nist.core.net.DefaultNetworkLayer java.net.DatagramSocket createDatagramSocket(int, java.net.InetAddress) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.net.DefaultNetworkLayer java.net.DatagramSocket createDatagramSocket()'>
+    <item name='gov.nist.core.net.NetworkLayer java.net.DatagramSocket createDatagramSocket(int, java.net.InetAddress) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.SslNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.SslNetworkLayer java.net.DatagramSocket createDatagramSocket()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.SslNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.DefaultNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.SslNetworkLayer SslNetworkLayer(java.lang.String, java.lang.String, char[], java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.NetworkLayer java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.DefaultNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.AddressResolver javax.sip.address.Hop resolveAddress(javax.sip.address.Hop) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.SslNetworkLayer java.net.DatagramSocket createDatagramSocket(int, java.net.InetAddress)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.net.DefaultNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress)'>
@@ -11,40 +38,43 @@
     <item name='gov.nist.core.net.DefaultNetworkLayer java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.net.SslNetworkLayer SslNetworkLayer(java.lang.String, java.lang.String, char[], java.lang.String) 1'>
+    <item name='gov.nist.core.net.SslNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.net.SslNetworkLayer java.net.DatagramSocket createDatagramSocket(int, java.net.InetAddress)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.net.SslNetworkLayer SslNetworkLayer(java.lang.String, java.lang.String, char[], java.lang.String) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.net.SslNetworkLayer java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.net.SslNetworkLayer SslNetworkLayer(java.lang.String, java.lang.String, char[], java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.net.SslNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.core.net.SslNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int)'>
+    <item name='gov.nist.core.net.AddressResolver javax.sip.address.Hop resolveAddress(javax.sip.address.Hop)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.core.net.DefaultNetworkLayer java.net.DatagramSocket createDatagramSocket(int, java.net.InetAddress)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.net.SslNetworkLayer java.net.DatagramSocket createDatagramSocket()'>
+    <item name='gov.nist.core.net.SslNetworkLayer SslNetworkLayer(java.lang.String, java.lang.String, char[], java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.net.DefaultNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
+    <item name='gov.nist.core.net.SslNetworkLayer SslNetworkLayer(java.lang.String, java.lang.String, char[], java.lang.String) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.net.SslNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
+    <item name='gov.nist.core.net.NetworkLayer java.net.DatagramSocket createDatagramSocket()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.core.net.DefaultNetworkLayer java.net.Socket createSocket(java.net.InetAddress, int)'>
+    <item name='gov.nist.core.net.DefaultNetworkLayer java.net.DatagramSocket createDatagramSocket()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.NetworkLayer java.net.DatagramSocket createDatagramSocket(int, java.net.InetAddress)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.NetworkLayer java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.NetworkLayer java.net.Socket createSocket(java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.NetworkLayer java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.SslNetworkLayer java.net.DatagramSocket createDatagramSocket(int, java.net.InetAddress) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.core.net.SslNetworkLayer java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/address/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/address/annotations.xml
index ee7e30c5690..a728b2cdb42 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/address/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/address/annotations.xml
@@ -1,4 +1,7 @@
 <root>
+    <item name='gov.nist.javax.sip.address.TelURLImpl void setParameter(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.SipURI createSipURI(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -8,6 +11,9 @@
     <item name='gov.nist.javax.sip.address.SipUri void removeParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.SipUri java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.SipURI createSipURI(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,79 +26,91 @@
     <item name='gov.nist.javax.sip.address.TelephoneNumber void removeParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.GenericURI java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
+    <item name='gov.nist.javax.sip.address.TelephoneNumber java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(java.lang.String, javax.sip.address.URI) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(java.lang.String, javax.sip.address.URI)'>
+    <item name='gov.nist.javax.sip.address.GenericURI java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.RFC2396UrlDecoder java.lang.String decode(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.SipURI createSipURI(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.GenericURI java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.TelephoneNumber java.lang.String getParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.TelURL createTelURL(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.URI createURI(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.SipUri java.lang.String getUserAtHost()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.Authority java.lang.StringBuffer encode(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.NetObject boolean equals(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.SipUri java.lang.String getParameter(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.Authority java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.SipUri java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.address.UserInfo java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.URI createURI(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.TelURLImpl void setParameter(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.AddressImpl java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.URI createURI(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.TelephoneNumber java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(java.lang.String, javax.sip.address.URI)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.SipUri java.lang.String getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.GenericURI java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.TelURL createTelURL(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.UserInfo java.lang.StringBuffer encode(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(javax.sip.address.URI)'>
+    <item name='gov.nist.javax.sip.address.SipUri void setParameter(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.SipUri void setQHeader(gov.nist.core.NameValue) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.TelURLImpl java.lang.String getParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.GenericURI java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.SipUri void setScheme(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.SipUri boolean hasParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.SipUri java.lang.String getUserAtHost()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.TelephoneNumber void deleteParm(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.TelURLImpl java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.address.SipUri java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.SipUri void setDefaultParm(java.lang.String, java.lang.Object) 0'>
@@ -101,10 +119,10 @@
     <item name='gov.nist.javax.sip.address.TelURLImpl void removeParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.TelephoneNumber java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.address.UserInfo java.lang.StringBuffer encode(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.SipUri java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.SipURI createSipURI(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.SipUri void setTransportParam(java.lang.String) 0'>
@@ -113,76 +131,85 @@
     <item name='gov.nist.javax.sip.address.SipUri void setUriParameter(gov.nist.core.NameValue) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.NetObject java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.SipURIExt void removeHeader(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.Authority java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.SipUri java.lang.Object getParm(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(javax.sip.address.URI)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.SipUri void setParameter(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.SipUri java.lang.String getUserAtHostPort()'>
+    <item name='gov.nist.javax.sip.address.AddressImpl java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.TelURLImpl java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.address.SipUri void removeHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.TelephoneNumber java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.address.Authority java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.SipUri java.lang.StringBuffer encode(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.TelephoneNumber boolean hasParm(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.AddressImpl void setURI(javax.sip.address.URI) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.SipUri java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.SipUri void setHost(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.GenericURI java.lang.StringBuffer encode(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.AddressImpl java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.UserInfo boolean equals(java.lang.Object) 0'>
+    <item name='gov.nist.javax.sip.address.Authority java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.RFC2396UrlDecoder java.lang.String decode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.SipUri java.lang.String getUserAtHostPort()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.UserInfo java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.SipUri java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.address.SipUri void setHeader(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.URI createURI(java.lang.String)'>
+    <item name='gov.nist.javax.sip.address.TelURLImpl java.lang.StringBuffer encode(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.address.AddressImpl void removeParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.Address createAddress(javax.sip.address.URI) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.SipURI createSipURI(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.address.GenericURI GenericURI(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.address.TelURLImpl java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.address.GenericURI GenericURI(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.address.TelURLImpl java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.address.TelURLImpl java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.address.RFC2396UrlDecoder java.lang.String decode(java.lang.String)'>
+    <item name='gov.nist.javax.sip.address.AddressFactoryImpl javax.sip.address.TelURL createTelURL(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/annotations.xml
index 9d5f0a678d2..548fe31011f 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/annotations.xml
@@ -1,53 +1,62 @@
 <root>
-    <item name='gov.nist.javax.sip.Utils java.lang.String toHexString(byte[])'>
+    <item name='gov.nist.javax.sip.DialogTimeoutEvent.Reason gov.nist.javax.sip.DialogTimeoutEvent.Reason valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.DialogTimeoutEvent.Reason gov.nist.javax.sip.DialogTimeoutEvent.Reason valueOf(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.SipStackImpl javax.sip.ListeningPoint createListeningPoint(int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.UtilsExt java.lang.String generateCallIdentifier(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.SipProviderImpl void dialogErrorEvent(gov.nist.javax.sip.stack.SIPDialogErrorEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.ListeningPointImpl java.lang.String makeKey(java.lang.String, int, java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.UtilsExt java.lang.String generateBranchId()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.LogRecordFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, long, boolean, java.lang.String, java.lang.String, java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.Utils java.lang.String generateBranchId()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.ListeningPointImpl java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.ListeningPointImpl void sendHeartbeat(java.lang.String, int) 0'>
+    <item name='gov.nist.javax.sip.ListeningPointImpl java.lang.String makeKey(java.lang.String, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.header.CallIdHeader getNewCallId()'>
+    <item name='gov.nist.javax.sip.ListeningPointImpl void sendHeartbeat(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.DefaultAddressResolver javax.sip.address.Hop resolveAddress(javax.sip.address.Hop)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.SipStackImpl gov.nist.javax.sip.clientauthutils.AuthenticationHelper getSecureAuthenticationHelper(gov.nist.javax.sip.clientauthutils.SecureAccountManager, javax.sip.header.HeaderFactory)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.Utils java.lang.String reduceString(java.lang.String)'>
+    <item name='gov.nist.javax.sip.ListeningPointImpl java.lang.String makeKey(java.lang.String, int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.DefaultAddressResolver javax.sip.address.Hop resolveAddress(javax.sip.address.Hop) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.SipStackExt gov.nist.javax.sip.clientauthutils.AuthenticationHelper getAuthenticationHelper(gov.nist.javax.sip.clientauthutils.AccountManager, javax.sip.header.HeaderFactory)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.SipProviderImpl SipProviderImpl(gov.nist.javax.sip.SipStackImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.SipProviderImpl void removeListeningPoint(javax.sip.ListeningPoint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.Utils java.lang.String generateBranchId()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.SipStackImpl javax.sip.ListeningPoint createListeningPoint(int, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.ResponseEventExt ResponseEventExt(java.lang.Object, gov.nist.javax.sip.ClientTransactionExt, javax.sip.Dialog, javax.sip.message.Response) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.ClientTransaction getNewClientTransaction(javax.sip.message.Request)'>
+    <item name='gov.nist.javax.sip.LogRecordFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, long, boolean, java.lang.String, java.lang.String, java.lang.String, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.Utils java.lang.String generateTag()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.Utils java.lang.String getQuotedString(java.lang.String) 0'>
@@ -65,70 +74,67 @@
     <item name='gov.nist.javax.sip.SipStackImpl javax.sip.ListeningPoint createListeningPoint(java.lang.String, int, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.SipStackImpl gov.nist.javax.sip.clientauthutils.AuthenticationHelper getAuthenticationHelper(gov.nist.javax.sip.clientauthutils.AccountManager, javax.sip.header.HeaderFactory)'>
+    <item name='gov.nist.javax.sip.Utils java.lang.String generateCallIdentifier(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.ServerTransaction getNewServerTransaction(javax.sip.message.Request) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.SipStackImpl javax.sip.SipProvider createSipProvider(javax.sip.ListeningPoint) 0'>
+    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.ServerTransaction getNewServerTransaction(javax.sip.message.Request)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.SipStackImpl javax.sip.ListeningPoint createListeningPoint(java.lang.String, int, java.lang.String)'>
+    <item name='gov.nist.javax.sip.SipStackImpl javax.sip.SipProvider createSipProvider(javax.sip.ListeningPoint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.SipStackImpl void deleteSipProvider(javax.sip.SipProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.Dialog getNewDialog(javax.sip.Transaction)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.ListeningPoint[] getListeningPoints()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.SipStackImpl javax.sip.ListeningPoint createListeningPoint(int, java.lang.String)'>
+    <item name='gov.nist.javax.sip.SipStackImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.ListeningPoint getListeningPoint(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.ServerTransaction getNewServerTransaction(javax.sip.message.Request)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.SipProviderImpl void transactionErrorEvent(gov.nist.javax.sip.stack.SIPTransactionErrorEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.Utils java.lang.String reduceString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.SipProviderImpl void addListeningPoint(javax.sip.ListeningPoint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.SipStackExt void setEnabledCipherSuites(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.SipStackExt gov.nist.javax.sip.clientauthutils.AuthenticationHelper getSecureAuthenticationHelper(gov.nist.javax.sip.clientauthutils.SecureAccountManager, javax.sip.header.HeaderFactory)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.SipStackImpl javax.sip.ListeningPoint createListeningPoint(java.lang.String, int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.ClientTransaction getNewClientTransaction(javax.sip.message.Request) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.Utils java.lang.String toHexString(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.DialogTimeoutEvent.Reason gov.nist.javax.sip.DialogTimeoutEvent.Reason valueOf(java.lang.String)'>
+    <item name='gov.nist.javax.sip.UtilsExt java.lang.String generateTag()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.SipProviderImpl void sendRequest(javax.sip.message.Request) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.Utils java.lang.String generateTag()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.Utils boolean responseBelongsToUs(gov.nist.javax.sip.message.SIPResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.SipProviderImpl void sendResponse(javax.sip.message.Response) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.Utils java.lang.String generateCallIdentifier(java.lang.String)'>
+    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.ClientTransaction getNewClientTransaction(javax.sip.message.Request)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.ListeningPointImpl java.lang.String makeKey(java.lang.String, int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.SipStackImpl javax.sip.SipProvider createSipProvider(javax.sip.ListeningPoint)'>
+    <item name='gov.nist.javax.sip.Utils java.lang.String toHexString(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.SipStackImpl javax.sip.ListeningPoint createListeningPoint(java.lang.String, int, java.lang.String) 0'>
@@ -137,6 +143,30 @@
     <item name='gov.nist.javax.sip.SipStackImpl void deleteListeningPoint(javax.sip.ListeningPoint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.LogRecord java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.SipStackImpl javax.sip.SipProvider createSipProvider(javax.sip.ListeningPoint)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.SipStackImpl gov.nist.javax.sip.clientauthutils.AuthenticationHelper getSecureAuthenticationHelper(gov.nist.javax.sip.clientauthutils.SecureAccountManager, javax.sip.header.HeaderFactory)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.SipStackImpl gov.nist.javax.sip.clientauthutils.AuthenticationHelper getAuthenticationHelper(gov.nist.javax.sip.clientauthutils.AccountManager, javax.sip.header.HeaderFactory)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.DialogTimeoutEvent.Reason gov.nist.javax.sip.DialogTimeoutEvent.Reason valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.ListeningPointExt void sendHeartbeat(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.header.CallIdHeader getNewCallId()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.Utils java.lang.String getQuotedString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.ListeningPointImpl java.lang.String getKey()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -146,7 +176,10 @@
     <item name='gov.nist.javax.sip.ListeningPointImpl void setSentBy(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.Utils java.lang.String getQuotedString(java.lang.String)'>
+    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.Dialog getNewDialog(javax.sip.Transaction)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.SipProviderImpl javax.sip.ListeningPoint[] getListeningPoints()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.Utils java.lang.String reduceString(java.lang.String) 0'>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/clientauthutils/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/clientauthutils/annotations.xml
index 66ed854ebd6..d170438b0d2 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/clientauthutils/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/clientauthutils/annotations.xml
@@ -17,7 +17,25 @@
     <item name='gov.nist.javax.sip.clientauthutils.AuthenticationHelperImpl javax.sip.ClientTransaction handleChallenge(javax.sip.message.Response, javax.sip.ClientTransaction, javax.sip.SipProvider, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.clientauthutils.AuthenticationHelper void removeCachedAuthenticationHeaders(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.clientauthutils.AuthenticationHelper javax.sip.ClientTransaction handleChallenge(javax.sip.message.Response, javax.sip.ClientTransaction, javax.sip.SipProvider, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.clientauthutils.AuthenticationHelper javax.sip.ClientTransaction handleChallenge(javax.sip.message.Response, javax.sip.ClientTransaction, javax.sip.SipProvider, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.clientauthutils.AuthenticationHelper javax.sip.ClientTransaction handleChallenge(javax.sip.message.Response, javax.sip.ClientTransaction, javax.sip.SipProvider, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.clientauthutils.AuthenticationHelperImpl javax.sip.ClientTransaction handleChallenge(javax.sip.message.Response, javax.sip.ClientTransaction, javax.sip.SipProvider, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.clientauthutils.AuthenticationHelper void setAuthenticationHeaders(javax.sip.message.Request) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.clientauthutils.AccountManager gov.nist.javax.sip.clientauthutils.UserCredentials getCredentials(javax.sip.ClientTransaction, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/header/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/header/annotations.xml
index a81e286a3b8..a127de36359 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/header/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/header/annotations.xml
@@ -1,11 +1,20 @@
 <root>
-    <item name='gov.nist.javax.sip.header.AlertInfo java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PAssertedIdentityHeader createPAssertedIdentityHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.CallID java.lang.String getCallId()'>
+    <item name='gov.nist.javax.sip.header.ProxyAuthenticateList java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.MimeVersion java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt javax.sip.header.Header createHeader(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SIPIfMatchHeader createSIPIfMatchHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RSeqHeader createRSeqHeader(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PAssertedIdentityHeader createPAssertedIdentityHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PChargingVectorHeader createChargingVectorHeader(java.lang.String) 0'>
@@ -14,109 +23,106 @@
     <item name='gov.nist.javax.sip.header.SIPObject java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RequireList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setDomain(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.To java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.CSeq void setMethod(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAssertedIdentityHeader createPAssertedIdentityHeader(javax.sip.address.Address) 0'>
+    <item name='gov.nist.javax.sip.header.SIPHeader java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptLanguageHeader createAcceptLanguageHeader(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ExtensionHeader createMinSEHeader(int)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAssertedIdentityHeader createPAssertedIdentityHeader(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PrivacyHeader createPrivacyHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentDispositionHeader createContentDispositionHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.InReplyToHeader createInReplyToHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl java.util.List createHeaders(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.CallID java.lang.String getCallId()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CSeqHeader createCSeqHeader(int, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptEncodingHeader createAcceptEncodingHeader(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ServerHeader createServerHeader(java.util.List) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.SIPIfMatch void setValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.SecurityServerHeader createSecurityServerHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.UnsupportedHeader createUnsupportedHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.AuthenticationInfoList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.CallID void setCallId(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Contact void setAddress(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PChargingFunctionAddressesHeader createPChargingFunctionAddressesHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.AcceptEncoding java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ViaHeader createViaHeader(java.lang.String, int, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CallIdHeader createCallIdHeader(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ContentDisposition java.lang.String getContentDisposition()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.SecurityVerifyHeader createSecurityVerifyHeader()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.ContentType void setContentType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RouteList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentDispositionHeader createContentDispositionHeader(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.Header createHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Expires java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.Via void setBranch(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.JoinHeader createJoinHeader(java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ContentEncodingList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RSeqHeader createRSeqHeader(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.Contact java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.SIPIfMatch void setETag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ProxyRequireHeader createProxyRequireHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Reason java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AllowHeader createAllowHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PMediaAuthorizationHeader createPMediaAuthorizationHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.SIPHeader java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ToHeader createToHeader(javax.sip.address.Address, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.extensions.ReplacesHeader createReplacesHeader(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.MaxForwardsHeader createMaxForwardsHeader(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.RequestLine void setMethod(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PChargingVectorHeader createChargingVectorHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.JoinHeader createJoinHeader(java.lang.String, java.lang.String, java.lang.String) 1'>
@@ -128,10 +134,7 @@
     <item name='gov.nist.javax.sip.header.Via java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ReplyToHeader createReplyToHeader(javax.sip.address.Address)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SubjectHeader createSubjectHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.SessionExpiresHeader createSessionExpiresHeader(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.UserAgent void setProduct(java.util.List) 0'>
@@ -140,61 +143,79 @@
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AllowEventsHeader createAllowEventsHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.EventHeader createEventHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ViaHeader createViaHeader(java.lang.String, int, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.Route java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Via java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.SipRequestLine createRequestLine(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PPreferredIdentityHeader createPPreferredIdentityHeader(javax.sip.address.Address)'>
+    <item name='gov.nist.javax.sip.header.Via javax.sip.address.Hop getHop()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CSeqHeader createCSeqHeader(long, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList void add(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ReasonHeader createReasonHeader(java.lang.String, int, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.RetryAfter java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SubscriptionState java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.JoinHeader createJoinHeader(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.RequestLine java.lang.StringBuffer encode(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.Header createHeader(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ErrorInfoHeader createErrorInfoHeader(javax.sip.address.URI)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.CallInfo java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.header.Protocol java.lang.StringBuffer encode(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AllowEventsHeader createAllowEventsHeader(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ErrorInfoHeader createErrorInfoHeader(javax.sip.address.URI)'>
+    <item name='gov.nist.javax.sip.header.MediaRange java.lang.StringBuffer encode(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setOpaque(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ProxyAuthorizationList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Allow void setMethod(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.SecurityClientHeader createSecurityClientHeader()'>
+    <item name='gov.nist.javax.sip.header.Reason void setProtocol(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ExpiresHeader createExpiresHeader(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PServedUserHeader createPServedUserHeader(javax.sip.address.Address)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PChargingFunctionAddressesHeader createPChargingFunctionAddressesHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CallIdHeader createCallIdHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.FromHeader createFromHeader(javax.sip.address.Address, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.SipStatusLine createStatusLine(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.AcceptLanguage java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Accept java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AlertInfoHeader createAlertInfoHeader(javax.sip.address.URI) 0'>
@@ -206,37 +227,37 @@
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.EventHeader createEventHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RequestLine boolean equals(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.TimeStamp java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.AuthenticationInfo void setParameter(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentEncodingHeader createContentEncodingHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.Expires java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.InReplyTo void setCallId(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.Protocol java.lang.String getProtocol()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.FromHeader createFromHeader(javax.sip.address.Address, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Challenge java.lang.String getParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeaderList java.util.List&lt;java.lang.String&gt; getHeadersAsEncodedStrings()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ToHeader createToHeader(javax.sip.address.Address, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Protocol java.lang.String getProtocol()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader gov.nist.core.NameValue getNameValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CSeqHeader createCSeqHeader(long, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ExtensionHeaderList java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.SipRequestLine createRequestLine(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader boolean hasMultiParameter(java.lang.String) 0'>
@@ -248,22 +269,19 @@
     <item name='gov.nist.javax.sip.header.ParametersHeader void setParameter(gov.nist.core.NameValue) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.SupportedList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentDispositionHeader createContentDispositionHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.MediaRange java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.MaxForwards java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AuthenticationInfo void setParameter(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ExtensionHeader createExtensionHeader(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.Via java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ProxyAuthorizationHeader createProxyAuthorizationHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.ReferencesHeader createReferencesHeader(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SupportedHeader createSupportedHeader(java.lang.String) 0'>
@@ -272,6 +290,9 @@
     <item name='gov.nist.javax.sip.header.Expires java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.TimeStampHeader createTimeStampHeader(float)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContactHeader createContactHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -284,19 +305,25 @@
     <item name='gov.nist.javax.sip.header.CallInfo void setPurpose(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentEncodingHeader createContentEncodingHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PUserDatabaseHeader createPUserDatabaseHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PCalledPartyIDHeader createPCalledPartyIDHeader(javax.sip.address.Address)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.PriorityHeader createPriorityHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AcceptEncodingList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.ExtensionHeaderImpl java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AllowList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SIPETagHeader createSIPETagHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeaderList gov.nist.javax.sip.header.SIPHeaderList&lt;HDR&gt; clonehlist(java.util.List&lt;HDR&gt;)'>
+    <item name='gov.nist.javax.sip.header.ContentType java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ServerHeader createServerHeader(java.util.List)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PCalledPartyIDHeader createPCalledPartyIDHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Priority void setPriority(java.lang.String) 0'>
@@ -308,28 +335,79 @@
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ErrorInfoHeader createErrorInfoHeader(javax.sip.address.URI) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ReasonList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PCalledPartyIDHeader createPCalledPartyIDHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PCalledPartyIDHeader createPCalledPartyIDHeader(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AlertInfoHeader createAlertInfoHeader(javax.sip.address.URI)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setNonce(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader java.lang.Object getMultiParameterValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList gov.nist.javax.sip.header.SIPHeaderList&lt;HDR&gt; clonehlist(java.util.List&lt;HDR&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.MaxForwards java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.NameMap void putNameMap(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.Contact void setParameter(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.AlertInfo java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Contact void setParameter(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ErrorInfo void setErrorMessage(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.RouteList java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ProxyRequireList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.RequestLine java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.WarningHeader createWarningHeader(java.lang.String, int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList java.util.List&lt;java.lang.String&gt; getHeadersAsEncodedStrings()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PProfileKeyHeader createPProfileKeyHeader(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SipStatusLine void setReasonPhrase(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Reason java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAssociatedURIHeader createPAssociatedURIHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PCalledPartyIDHeader createPCalledPartyIDHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AuthenticationInfo gov.nist.core.NameValue getAuthInfo(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ReplyTo java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ReferToHeader createReferToHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SubscriptionStateHeader createSubscriptionStateHeader(java.lang.String) 0'>
@@ -344,7 +422,7 @@
     <item name='gov.nist.javax.sip.header.NameMap void putNameMap(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AuthenticationHeader java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ErrorInfo java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Via void setReceived(java.lang.String) 0'>
@@ -362,64 +440,52 @@
     <item name='gov.nist.javax.sip.header.Unsupported void setOptionTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.ReferredByHeader createReferredByHeader(javax.sip.address.Address)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RSeqHeader createRSeqHeader(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CallInfoHeader createCallInfoHeader(javax.sip.address.URI)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.CSeq java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ContentDisposition java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader void setParameter(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PAssociatedURIHeader createPAssociatedURIHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.CallID java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RAckHeader createRAckHeader(int, int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.From java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.CallInfoList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.SIPHeader java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader long getParameterAsLong(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.ReplacesHeader createReplacesHeader(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RAck java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.AcceptEncoding java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.MaxForwards java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SupportedHeader createSupportedHeader(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentTypeHeader createContentTypeHeader(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RouteHeader createRouteHeader(javax.sip.address.Address) 0'>
+    <item name='gov.nist.javax.sip.header.ParametersHeader void setParameter(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.SubscriptionState void setReasonCode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.From java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RouteHeader createRouteHeader(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setQop(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.SIPETag SIPETag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ContentLength java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PMediaAuthorizationHeader createPMediaAuthorizationHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ContentDisposition void setDispositionType(java.lang.String) 0'>
@@ -428,25 +494,28 @@
     <item name='gov.nist.javax.sip.header.SIPHeader java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PVisitedNetworkIDHeader createPVisitedNetworkIDHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader boolean hasParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AcceptEncoding java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.SipRequestLine createRequestLine(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AllowEvents void setEventType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.OrganizationHeader createOrganizationHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.extensions.SessionExpiresHeader createSessionExpiresHeader(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ProxyRequireHeader createProxyRequireHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.Reason java.lang.String getName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ProxyAuthorizationHeader createProxyAuthorizationHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.To java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.SIPObject java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AllowList void setMethods(java.util.List&lt;java.lang.String&gt;) 0'>
@@ -455,169 +524,202 @@
     <item name='gov.nist.javax.sip.header.ParametersHeader void setMultiParameter(gov.nist.core.NameValue) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.extensions.JoinHeader createJoinHeader(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Challenge boolean removeParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ProxyAuthenticateHeader createProxyAuthenticateHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ProxyRequireList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentTypeHeader createContentTypeHeader(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RequestLine java.lang.StringBuffer encode(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AuthenticationInfoHeader createAuthenticationInfoHeader(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RouteHeader createRouteHeader(javax.sip.address.Address)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.AcceptList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAssertedServiceHeader createPAssertedServiceHeader()'>
+    <item name='gov.nist.javax.sip.header.Accept void setContentSubType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentLanguageHeader createContentLanguageHeader(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ContentLanguage java.lang.String getLanguageTag()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentEncodingHeader createContentEncodingHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RSeqHeader createRSeqHeader(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setRealm(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PathHeader createPathHeader(javax.sip.address.Address)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAssertedIdentityHeader createPAssertedIdentityHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ContentLength java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AuthorizationHeader createAuthorizationHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Event void setEventId(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.RecordRouteList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.StatusLine java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList T[] toArray(T[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentTypeHeader createContentTypeHeader(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PathHeader createPathHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.MediaRange java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ParametersHeader void setParameter(java.lang.String, boolean) 0'>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
+    <item name='gov.nist.javax.sip.header.ParametersHeader void setParameter(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Warning void setText(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ContentLanguageList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.Subject void setSubject(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Subject void setSubject(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.ExtensionHeaderList java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.AcceptLanguageList gov.nist.javax.sip.header.AcceptLanguage getLast()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ExtensionHeader createExtensionHeader(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.CallInfo java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PVisitedNetworkIDHeader createPVisitedNetworkIDHeader()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.RetryAfter void setComment(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeader java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.header.AuthenticationInfo java.lang.String getAuthenticationInfo()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PServedUserHeader createPServedUserHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PPreferredServiceHeader createPPreferredServiceHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Accept void setContentType(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RecordRouteHeader createRecordRouteHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AuthenticationInfoHeader createAuthenticationInfoHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.ReplacesHeader createReplacesHeader(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ReplyToHeader createReplyToHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.WWWAuthenticateHeader createWWWAuthenticateHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentLengthHeader createContentLengthHeader(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAssociatedURIHeader createPAssociatedURIHeader(javax.sip.address.Address)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.extensions.JoinHeader createJoinHeader(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList boolean removeAll(java.util.Collection&lt;?&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Contact java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Reason void setText(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PUserDatabaseHeader createPUserDatabaseHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.AllowList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.TimeStamp java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.DateHeader createDateHeader(java.util.Calendar)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ContentLength java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AllowEventsList void setMethods(java.util.List&lt;java.lang.String&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.SIPHeader java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader void removeMultiParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setResponse(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RouteHeader createRouteHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Organization void setOrganization(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.ServiceRouteHeader createServiceRouteHeader(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RecordRouteHeader createRecordRouteHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentLengthHeader createContentLengthHeader(int)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PathHeader createPathHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SubscriptionStateHeader createSubscriptionStateHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.InReplyTo java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.InReplyToHeader createInReplyToHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentTypeHeader createContentTypeHeader(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AcceptLanguageList gov.nist.javax.sip.header.AcceptLanguage getLast()'>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ContentDisposition java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ExpiresHeader createExpiresHeader(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPHeader java.lang.String getName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptEncodingHeader createAcceptEncodingHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PChargingFunctionAddressesHeader createPChargingFunctionAddressesHeader()'>
+    <item name='gov.nist.javax.sip.header.ParametersHeader gov.nist.javax.sip.address.GenericURI getParameterAsURI(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ParametersHeader gov.nist.javax.sip.address.GenericURI getParameterAsURI(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.ProxyAuthenticate void setURI(javax.sip.address.URI) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ContentDisposition void setHandling(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RetryAfterHeader createRetryAfterHeader(int)'>
+    <item name='gov.nist.javax.sip.header.SIPObject java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Require void setOptionTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.CallIdentifier java.lang.StringBuffer encode(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.ContentType int compareMediaRange(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Protocol java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.To java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ProxyAuthenticateList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ContentLanguage java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PChargingVectorHeader createChargingVectorHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.InReplyToHeader createInReplyToHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CallInfoHeader createCallInfoHeader(javax.sip.address.URI) 0'>
@@ -629,64 +731,64 @@
     <item name='gov.nist.javax.sip.header.CallIdentifier CallIdentifier(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ReasonList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.SipRequestLine createRequestLine(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.CSeq CSeq(long, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.AcceptLanguageList javax.sip.header.Header getFirst()'>
+    <item name='gov.nist.javax.sip.header.To java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setCK(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Accept java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.CSeq CSeq(long, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RecordRoute java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RequireHeader createRequireHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ProxyAuthorizationList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.AuthenticationHeader void setParameter(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Warning java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.CSeq java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.SecurityServerHeader createSecurityServerHeader()'>
+    <item name='gov.nist.javax.sip.header.Supported java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.UnsupportedHeader createUnsupportedHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.AuthenticationHeader java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPDate java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SupportedHeader createSupportedHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPDateHeader java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.AllowEventsList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.OrganizationHeader createOrganizationHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Supported void setOptionTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AuthenticationInfoList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.ContentEncodingList java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RouteList java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.MinExpiresHeader createMinExpiresHeader(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SIPETagHeader createSIPETagHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.AllowEventsList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AuthenticationInfoHeader createAuthenticationInfoHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader void setParameter(java.lang.String, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ProxyRequireHeader createProxyRequireHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Warning void setAgent(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptHeader createAcceptHeader(java.lang.String, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.AuthenticationInfo java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SIPIfMatchHeader createSIPIfMatchHeader(java.lang.String) 0'>
@@ -698,10 +800,16 @@
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PMediaAuthorizationHeader createPMediaAuthorizationHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ContentLanguage java.lang.String getLanguageTag()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PrivacyHeader createPrivacyHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ContentEncoding void setEncoding(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.ReferencesHeader createReferencesHeader(java.lang.String, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptEncodingHeader createAcceptEncodingHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ContentType void setContentSubType(java.lang.String) 0'>
@@ -710,84 +818,69 @@
     <item name='gov.nist.javax.sip.header.ParametersHeader void setParameter(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AlertInfoHeader createAlertInfoHeader(javax.sip.address.URI)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.AlertInfoList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.ReferredByHeader createReferredByHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SubjectHeader createSubjectHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Event java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PathHeader createPathHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PProfileKeyHeader createPProfileKeyHeader(javax.sip.address.Address)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.Via void setProtocol(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.TimeStampHeader createTimeStampHeader(float)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ReplyToHeader createReplyToHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.DateHeader createDateHeader(java.util.Calendar)'>
+    <item name='gov.nist.javax.sip.header.ContentLength java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PProfileKeyHeader createPProfileKeyHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Supported java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.StatusLine java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptLanguageHeader createAcceptLanguageHeader(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.Via void setHost(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.ReferredByHeader createReferredByHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setChallenge(gov.nist.javax.sip.header.Challenge) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RAckHeader createRAckHeader(long, long, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.To void setTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AuthenticationHeader void setParameter(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.AcceptLanguageList javax.sip.header.Header getLast()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ProxyAuthenticateHeader createProxyAuthenticateHeader(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ParametersHeader int getParameterAsInt(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.SIPDate java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AcceptLanguageList java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.CallIdentifier java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.AuthenticationHeader void setParameter(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ReplyTo java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PChargingVectorHeader createChargingVectorHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPDate boolean equals(java.lang.Object) 0'>
+    <item name='gov.nist.javax.sip.header.ParametersHeader int getParameterAsInt(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.JoinHeader createJoinHeader(java.lang.String, java.lang.String, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.AlertInfoList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.SipStatusLine createStatusLine(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setIK(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.MimeVersionHeader createMimeVersionHeader(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.MaxForwards java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -800,52 +893,61 @@
     <item name='gov.nist.javax.sip.header.ParametersHeader void setParameter(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAccessNetworkInfoHeader createPAccessNetworkInfoHeader()'>
+    <item name='gov.nist.javax.sip.header.RAck java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AllowHeader createAllowHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ReasonHeader createReasonHeader(java.lang.String, int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ErrorInfo java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PPreferredIdentityHeader createPPreferredIdentityHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ProxyRequire void setOptionTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.WarningHeader createWarningHeader(java.lang.String, int, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.ReplyTo java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPDateHeader java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.CallInfoList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Expires java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Event void setEventType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PServedUserHeader createPServedUserHeader(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.ServiceRouteHeader createServiceRouteHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.MimeVersionHeader createMimeVersionHeader(int, int)'>
+    <item name='gov.nist.javax.sip.header.CallIdentifier java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RetryAfter java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ExtensionHeaderImpl java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.Challenge java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList boolean retainAll(java.util.Collection&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ContentLength java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Server java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.ServiceRouteHeader createServiceRouteHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ParametersHeader void setParameter(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.NameMap java.lang.Class getClassFromName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.ServiceRouteHeader createServiceRouteHeader(javax.sip.address.Address)'>
+    <item name='gov.nist.javax.sip.header.ErrorInfoList java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.MaxForwards java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.RouteList java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RAckHeader createRAckHeader(int, int, java.lang.String) 2'>
@@ -854,34 +956,94 @@
     <item name='gov.nist.javax.sip.header.CSeq java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.PriorityHeader createPriorityHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.ParametersHeader java.lang.String getParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ParametersHeader java.lang.String getParameter(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.CSeq java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.FromHeader createFromHeader(javax.sip.address.Address, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ProxyAuthenticateHeader createProxyAuthenticateHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.NameMap void addExtensionHeader(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PPreferredIdentityHeader createPPreferredIdentityHeader(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.SipStatusLine createStatusLine(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Via void setMAddr(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl java.util.List createHeaders(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PPreferredIdentityHeader createPPreferredIdentityHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SubscriptionStateHeader createSubscriptionStateHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.extensions.ReferredByHeader createReferredByHeader(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.Object set(int, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PVisitedNetworkIDHeader createPVisitedNetworkIDHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.AuthorizationList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Server java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PrivacyHeader createPrivacyHeader(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SubjectHeader createSubjectHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AcceptLanguage void setAcceptLanguage(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PPreferredServiceHeader createPPreferredServiceHeader()'>
+    <item name='gov.nist.javax.sip.header.From void setAddress(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SubscriptionState java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Challenge boolean hasParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ReferToHeader createReferToHeader(javax.sip.address.Address)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RAckHeader createRAckHeader(long, long, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PProfileKeyHeader createPProfileKeyHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PAssertedServiceHeader createPAssertedServiceHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.SecurityServerHeader createSecurityServerHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.extensions.JoinHeader createJoinHeader(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.StatusLine void setReasonPhrase(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PChargingVectorHeader createChargingVectorHeader(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Accept java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.SIPETag void setValue(java.lang.String) 0'>
@@ -893,66 +1055,84 @@
     <item name='gov.nist.javax.sip.header.NameMap void addExtensionHeader(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.To java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Server void setProduct(java.util.List) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.ReplacesHeader createReplacesHeader(java.lang.String, java.lang.String, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.SubscriptionState java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.RAck void setMethod(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PMediaAuthorizationHeader createPMediaAuthorizationHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.MediaRange java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList boolean addAll(int, java.util.Collection&lt;? extends HDR&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentLanguageHeader createContentLanguageHeader(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Warning java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.extensions.ReplacesHeader createReplacesHeader(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.WarningHeader createWarningHeader(java.lang.String, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AcceptLanguageList gov.nist.javax.sip.header.AcceptLanguage getFirst()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.Reason java.lang.String getName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CSeqHeader createCSeqHeader(int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.InReplyToList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.extensions.ReferredByHeader createReferredByHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.UserAgent java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AuthenticationInfo java.lang.String getAuthenticationInfo()'>
+    <item name='gov.nist.javax.sip.header.SipRequestLine void setMethod(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SupportedList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList boolean addAll(java.util.Collection&lt;? extends HDR&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PPreferredServiceHeader createPPreferredServiceHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.PriorityHeader createPriorityHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RequireHeader createRequireHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.ContentType java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.CallID CallID(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.Contact java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Event boolean match(gov.nist.javax.sip.header.Event) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAssertedIdentityHeader createPAssertedIdentityHeader(javax.sip.address.Address)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PAssociatedURIHeader createPAssociatedURIHeader(javax.sip.address.Address) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader java.lang.String getMultiParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ServerHeader createServerHeader(java.util.List)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ExtensionHeader createMinSEHeader(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptHeader createAcceptHeader(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.SIPObject java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.InReplyToList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl java.util.List createHeaders(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -962,49 +1142,52 @@
     <item name='gov.nist.javax.sip.header.RequestLine java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RecordRouteHeader createRecordRouteHeader(javax.sip.address.Address)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.CallID java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.CallInfo java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.MaxForwardsHeader createMaxForwardsHeader(int)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAssertedServiceHeader createPAssertedServiceHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.SIPObjectList void mergeObjects(gov.nist.core.GenericObjectList) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.extensions.SessionExpiresHeader createSessionExpiresHeader(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContentLanguageHeader createContentLanguageHeader(java.util.Locale)'>
+    <item name='gov.nist.javax.sip.header.SIPHeader java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setURI(javax.sip.address.URI) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ReplyTo java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader boolean getParameterAsBoolean(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader void removeParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AcceptLanguage java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptHeader createAcceptHeader(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeaderNamesCache java.lang.String toLowerCase(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.ContentDisposition java.lang.String getContentDisposition()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptHeader createAcceptHeader(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RequestLine java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ToHeader createToHeader(javax.sip.address.Address, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.SipStatusLine createStatusLine(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.SIPHeader java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ContentLanguageList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.CSeq java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.CallID java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PUserDatabaseHeader createPUserDatabaseHeader(java.lang.String) 0'>
@@ -1013,57 +1196,69 @@
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.SipStatusLine createStatusLine(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AuthorizationList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CallInfoHeader createCallInfoHeader(javax.sip.address.URI)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.extensions.ReplacesHeader createReplacesHeader(java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.RecordRouteList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ContactList java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.Challenge void setParameter(gov.nist.core.NameValue) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.Route java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.CallIdentifier java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PAccessNetworkInfoHeader createPAccessNetworkInfoHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContactHeader createContactHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPObject boolean equals(java.lang.Object) 0'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ExtensionHeader createExtensionHeader(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Challenge void setParameter(gov.nist.core.NameValue) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ViaHeader createViaHeader(java.lang.String, int, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.CallIdentifier java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.SIPHeaderNamesCache java.lang.String toLowerCase(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ContentLanguage ContentLanguage(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContactHeader createContactHeader(javax.sip.address.Address)'>
+    <item name='gov.nist.javax.sip.header.ContentLanguage java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.AuthenticationInfo java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.SecurityVerifyHeader createSecurityVerifyHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ContentType java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.header.CallInfo java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader float getParameterAsFloat(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Protocol java.lang.StringBuffer encode(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PathHeader createPathHeader(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.AcceptLanguageList javax.sip.header.Header getLast()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.AcceptList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.From java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.DateHeader createDateHeader(java.util.Calendar) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AllowEventsHeader createAllowEventsHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RAckHeader createRAckHeader(long, long, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1073,22 +1268,19 @@
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ReasonHeader createReasonHeader(java.lang.String, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.InReplyTo java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.UnsupportedHeader createUnsupportedHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ViaHeader createViaHeader(java.lang.String, int, java.lang.String, java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.RecordRoute java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPObject java.lang.StringBuffer encode(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PrivacyHeader createPrivacyHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.Protocol java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader int getParameterAsHexInt(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Via javax.sip.address.Hop getHop()'>
+    <item name='gov.nist.javax.sip.header.RecordRoute java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PPreferredIdentityHeader createPPreferredIdentityHeader(javax.sip.address.Address) 0'>
@@ -1097,28 +1289,52 @@
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.WWWAuthenticateHeader createWWWAuthenticateHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.AcceptEncodingList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RequireHeader createRequireHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeader java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.SIPIfMatchHeader createSIPIfMatchHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.SIPHeaderList boolean containsAll(java.util.Collection&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ParametersHeader java.lang.Object getParameterValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.SecurityClientHeader createSecurityClientHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.RequireList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.AuthenticationHeader void setAlgorithm(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.Route java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.AddressParametersHeader void setAddress(javax.sip.address.Address) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CSeqHeader createCSeqHeader(long, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AuthorizationHeader createAuthorizationHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.MimeVersion java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AllowHeader createAllowHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeader java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PAccessNetworkInfoHeader createPAccessNetworkInfoHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.AcceptLanguageList javax.sip.header.Header getFirst()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PServedUserHeader createPServedUserHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.Protocol void setProtocol(java.lang.String) 0'>
@@ -1127,25 +1343,37 @@
     <item name='gov.nist.javax.sip.header.ContentType java.lang.StringBuffer encodeBody(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.AcceptLanguageList gov.nist.javax.sip.header.AcceptLanguage getFirst()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ContentLanguage void setLanguageTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.To To(gov.nist.javax.sip.header.From) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.Event java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ProxyAuthorizationHeader createProxyAuthorizationHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.OrganizationHeader createOrganizationHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ExtensionHeaderList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CallIdHeader createCallIdHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ErrorInfoList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.SecurityVerifyHeader createSecurityVerifyHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.EventHeader createEventHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.SecurityClientHeader createSecurityClientHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Event java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.PUserDatabaseHeader createPUserDatabaseHeader(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PProfileKeyHeader createPProfileKeyHeader(javax.sip.address.Address)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.WarningHeader createWarningHeader(java.lang.String, int, java.lang.String) 2'>
@@ -1154,37 +1382,61 @@
     <item name='gov.nist.javax.sip.header.From void setTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryExt gov.nist.javax.sip.header.ims.ServiceRouteHeader createServiceRouteHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ExtensionHeaderList java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ExtensionHeaderImpl void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.Challenge java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ContactHeader createContactHeader(javax.sip.address.Address)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.Protocol java.lang.StringBuffer encode(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.MinExpiresHeader createMinExpiresHeader(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ContentType java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.ReasonHeader createReasonHeader(java.lang.String, int, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AuthorizationHeader createAuthorizationHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.MediaRange java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.SipRequestLine createRequestLine(java.lang.String)'>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.RetryAfterHeader createRetryAfterHeader(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.CSeq java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.header.WWWAuthenticate void setURI(javax.sip.address.URI) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.CSeqHeader createCSeqHeader(int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.From From(gov.nist.javax.sip.header.To) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.CSeq java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.header.ContactList java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.Expires java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
+    <item name='gov.nist.javax.sip.header.CallIdentifier java.lang.StringBuffer encode(java.lang.StringBuffer)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.SIPHeaderList java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.Via java.lang.StringBuffer encodeBody(java.lang.StringBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.AcceptLanguageHeader createAcceptLanguageHeader(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ParametersHeader java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl gov.nist.javax.sip.header.ims.PUserDatabaseHeader createPUserDatabaseHeader(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.HeaderFactoryImpl javax.sip.header.WWWAuthenticateHeader createWWWAuthenticateHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/header/extensions/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/header/extensions/annotations.xml
index d171cb8f3e1..01b50e58825 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/header/extensions/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/header/extensions/annotations.xml
@@ -1,32 +1,83 @@
 <root>
-    <item name='gov.nist.javax.sip.header.extensions.References void removeParameter(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.extensions.JoinHeader void setFromTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.extensions.References java.lang.String getParameter(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.extensions.References void removeParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.extensions.Join void setFromTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.extensions.Replaces Replaces(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.extensions.JoinHeader void setCallId(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.extensions.References void setParameter(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.extensions.References java.lang.String getName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.extensions.Replaces void setFromTag(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.extensions.SessionExpires void setValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.extensions.Join Join(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.extensions.Join void setToTag(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.extensions.References void setParameter(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.Replaces void setCallId(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.Replaces Replaces(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.ReferredBy void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.Replaces void setFromTag(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.Join void setValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.extensions.Replaces void setToTag(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.extensions.MinSE void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.References void setParameter(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.Join void setToTag(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.References void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.ReplacesHeader void setFromTag(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.References java.lang.String getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.ReferencesHeader void setCallId(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.ReplacesHeader void setCallId(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.References void setCallId(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.Replaces void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.ReplacesHeader void setToTag(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.References java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.Join void setCallId(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.extensions.JoinHeader void setToTag(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/header/ims/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/header/ims/annotations.xml
index cdca4cd574d..daff585a065 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/header/ims/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/header/ims/annotations.xml
@@ -1,17 +1,26 @@
 <root>
+    <item name='gov.nist.javax.sip.header.ims.PAssertedService void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfoHeader void setUtranCellID3GPP(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkID void setVisitedNetworkID(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo void setCGI3GPP(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.SecurityAgree java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkIDHeader void setVisitedNetworkID(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PCalledPartyID java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkID java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PAssociatedURIHeader void setAssociatedURI(javax.sip.address.URI) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.ServiceRoute void setValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.PChargingVector void setICIDGeneratedAt(java.lang.String) 0'>
@@ -20,34 +29,64 @@
     <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo void setAccessType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PAssociatedURI java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PServedUser void setValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void addEventChargingFunctionAddress(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.PAssertedService java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo void setParameter(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkID java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddressesHeader void setChargingCollectionFunctionAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAssertedIdentity java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void setChargingCollectionFunctionAddress(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.PrivacyHeader void setPrivacy(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PPreferredIdentity java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAssertedIdentity void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void removeEventChargingFunctionAddress(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo PAccessNetworkInfo(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.PUserDatabase java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PProfileKey java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.SecurityAgree void setParameter(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.PMediaAuthorizationHeader void setMediaAuthorizationToken(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.PServedUser void setRegistrationState(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkIDHeader void setVisitedNetworkID(gov.nist.core.Token) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkID java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.SecurityVerify void setValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.PServedUser void setSessionCase(java.lang.String) 0'>
@@ -56,21 +95,54 @@
     <item name='gov.nist.javax.sip.header.ims.SecurityAgree void setSecurityMechanism(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.PCalledPartyID void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PUserDatabase void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PPreferredService void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.Path java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo void setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.SecurityAgree void setProtocol(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.PServedUser java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.PChargingVector void setICID(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.SecurityAgree void setAlgorithm(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkID java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PServedUserHeader void setSessionCase(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAssertedServiceHeader void setSubserviceIdentifiers(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.ServiceRoute java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo void setDSLLocation(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.SecurityAgree void setParameter(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,76 +152,142 @@
     <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo void setCI3GPP2(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.ServiceRoute java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PPreferredServiceHeader void setSubserviceIdentifiers(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PServedUser java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.Privacy void setValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PAssertedIdentity java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfoHeader void setExtensionAccessInfo(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingVector void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAssociatedURI java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.SecurityAgree void setEncryptionAlgorithm(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.SecurityAgree java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkID void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkID PVisitedNetworkID(gov.nist.core.Token) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddressesHeader void removeChargingCollectionFunctionAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo void setExtensionAccessInfo(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PAssociatedURI void setAssociatedURI(javax.sip.address.URI) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ims.PProfileKey java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkID void setVisitedNetworkID(gov.nist.core.Token) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PMediaAuthorization void setMediaAuthorizationToken(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.ims.PAssociatedURI void setAssociatedURI(javax.sip.address.URI) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PChargingVector java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void removeChargingCollectionFunctionAddress(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void setEventChargingFunctionAddress(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ims.PUserDatabase java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ims.PUserDatabase void setDatabaseName(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ims.PAssertedService java.lang.String encodeBody()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ims.PPreferredService void setSubserviceIdentifiers(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.header.ims.PPreferredIdentity java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddressesHeader void removeEventChargingFunctionAddress(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.PPreferredService java.lang.String encodeBody()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.Path java.lang.String encodeBody()'>
+    <item name='gov.nist.javax.sip.header.ims.PPreferredIdentity void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PMediaAuthorization void setMediaAuthorizationToken(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PProfileKey void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PMediaAuthorization void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PUserDatabaseHeader void setDatabaseName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void removeChargingCollectionFunctionAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingVectorHeader void setICIDGeneratedAt(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfoHeader void setAccessType(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAssociatedURI void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.Path void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingVectorHeader void setICID(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void setEventChargingFunctionAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.SecurityServer void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PUserDatabase void setDatabaseName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddressesHeader void addEventChargingFunctionAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfoHeader void setCI3GPP2(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingVector java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PPreferredService void setSubserviceIdentifiers(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfoHeader void setCGI3GPP(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.Privacy void setPrivacy(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.SecurityAgree void setMode(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfoHeader void setDSLLocation(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void addChargingCollectionFunctionAddress(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddressesHeader void addChargingCollectionFunctionAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAssertedService void setSubserviceIdentifiers(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddressesHeader void setEventChargingFunctionAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PAccessNetworkInfo void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PCalledPartyID java.lang.String encodeBody()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.PServedUserHeader void setRegistrationState(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.SecurityClient void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.header.ims.SecurityAgree void setMode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.header.ims.PVisitedNetworkID PVisitedNetworkID(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.header.ims.PChargingFunctionAddresses void addChargingCollectionFunctionAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/message/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/message/annotations.xml
index b61c53785f1..c992652da60 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/message/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/message/annotations.xml
@@ -5,22 +5,19 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest java.util.LinkedList getMessageAsEncodedStrings()'>
+    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse java.util.LinkedList getMessageAsEncodedStrings()'>
+    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void setContentEncoding(javax.sip.header.ContentEncodingHeader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageObject java.lang.String dbgPrint(int)'>
+    <item name='gov.nist.javax.sip.message.ContentImpl java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void setVia(java.util.List) 0'>
@@ -32,16 +29,19 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPResponse void setSIPVersion(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPResponse byte[] encodeAsBytes(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPResponse gov.nist.javax.sip.message.SIPRequest createRequest(gov.nist.javax.sip.address.SipUri, gov.nist.javax.sip.header.Via, gov.nist.javax.sip.header.CSeq, gov.nist.javax.sip.header.From, gov.nist.javax.sip.header.To) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createACKRequest()'>
+    <item name='gov.nist.javax.sip.message.SIPResponse gov.nist.javax.sip.message.SIPRequest createRequest(gov.nist.javax.sip.address.SipUri, gov.nist.javax.sip.header.Via, gov.nist.javax.sip.header.CSeq, gov.nist.javax.sip.header.From, gov.nist.javax.sip.header.To)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 9'>
@@ -50,18 +50,27 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse boolean equals(java.lang.Object) 0'>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String getTransactionId()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String getDialogId(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, java.lang.Object, javax.sip.header.ContentTypeHeader) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPMessage javax.sip.header.Header getHeader(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String getDialogId(boolean, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -74,21 +83,24 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPMessage java.util.ListIterator&lt;gov.nist.javax.sip.header.SIPHeader&gt; getHeaders(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader)'>
+    <item name='gov.nist.javax.sip.message.MultipartMimeContentImpl java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -98,31 +110,25 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, java.lang.Object, javax.sip.header.ContentTypeHeader) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String encodeSIPHeaders()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void addLast(javax.sip.header.Header) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse gov.nist.javax.sip.message.SIPRequest createRequest(gov.nist.javax.sip.address.SipUri, gov.nist.javax.sip.header.Via, gov.nist.javax.sip.header.CSeq, gov.nist.javax.sip.header.From, gov.nist.javax.sip.header.To)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 9'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader)'>
+    <item name='gov.nist.javax.sip.message.SIPMessage void attachHeader(gov.nist.javax.sip.header.SIPHeader, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage void attachHeader(gov.nist.javax.sip.header.SIPHeader, boolean) 0'>
+    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String getDialogId(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void setHeader(javax.sip.header.Header) 0'>
@@ -131,21 +137,36 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createBYERequest(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void setContentDisposition(javax.sip.header.ContentDispositionHeader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.HeaderIterator void add(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.HeaderIterator void set(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request, javax.sip.header.ContentTypeHeader, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createACKRequest()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, java.lang.Object, javax.sip.header.ContentTypeHeader) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -164,43 +185,40 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request, javax.sip.header.ContentTypeHeader, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.SIPResponse gov.nist.javax.sip.message.SIPRequest createRequest(gov.nist.javax.sip.address.SipUri, gov.nist.javax.sip.header.Via, gov.nist.javax.sip.header.CSeq, gov.nist.javax.sip.header.From, gov.nist.javax.sip.header.To) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl gov.nist.javax.sip.message.MultipartMimeContent createMultipartMimeContent(javax.sip.header.ContentTypeHeader, java.lang.String[], java.lang.String[], java.lang.String[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createErrorAck(gov.nist.javax.sip.header.To)'>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl gov.nist.javax.sip.message.MultipartMimeContent createMultipartMimeContent(javax.sip.header.ContentTypeHeader, java.lang.String[], java.lang.String[], java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage java.util.Iterator&lt;gov.nist.javax.sip.header.SIPHeader&gt; getHeaders()'>
+    <item name='gov.nist.javax.sip.message.MessageObject java.lang.String dbgPrint(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest byte[] encodeAsBytes(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String getHeaderAsFormattedString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 7'>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String getDialogId(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request, javax.sip.header.ContentTypeHeader, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage void setCSeq(javax.sip.header.CSeqHeader) 0'>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl gov.nist.javax.sip.message.MultipartMimeContent createMultipartMimeContent(javax.sip.header.ContentTypeHeader, java.lang.String[], java.lang.String[], java.lang.String[])'>
+    <item name='gov.nist.javax.sip.message.SIPMessage void setCSeq(javax.sip.header.CSeqHeader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 7'>
@@ -212,21 +230,12 @@
     <item name='gov.nist.javax.sip.message.SIPMessage void addFirst(javax.sip.header.Header) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String getDialogId(boolean, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPResponse createResponse(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void setCallId(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage boolean equals(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -236,30 +245,57 @@
     <item name='gov.nist.javax.sip.message.SIPRequest void setRequestURI(javax.sip.address.URI) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String getReasonPhrase(int)'>
+    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryExt gov.nist.javax.sip.message.MultipartMimeContent createMultipartMimeContent(javax.sip.header.ContentTypeHeader, java.lang.String[], java.lang.String[], java.lang.String[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String encodeMessage()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.SIPRequest void setMethod(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPResponse createResponse(int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createErrorAck(gov.nist.javax.sip.header.To)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage java.util.LinkedList&lt;java.lang.String&gt; getMessageAsEncodedStrings()'>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String encodeMessage()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String getDialogId(boolean)'>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, java.lang.Object, javax.sip.header.ContentTypeHeader)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPResponse java.util.LinkedList getMessageAsEncodedStrings()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.Content java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void setContent(java.lang.Object, javax.sip.header.ContentTypeHeader) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -269,16 +305,22 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createBYERequest(boolean)'>
+    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPResponse createResponse(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createSIPRequest(gov.nist.javax.sip.header.RequestLine, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest java.util.LinkedList getMessageAsEncodedStrings()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 2'>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl gov.nist.javax.sip.message.MultipartMimeContent createMultipartMimeContent(javax.sip.header.ContentTypeHeader, java.lang.String[], java.lang.String[], java.lang.String[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MultipartMimeContentImpl MultipartMimeContentImpl(javax.sip.header.ContentTypeHeader) 0'>
@@ -293,21 +335,24 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest boolean equals(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void setFrom(javax.sip.header.FromHeader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, java.lang.Object, javax.sip.header.ContentTypeHeader) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.Object clone()'>
+    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request, javax.sip.header.ContentTypeHeader, byte[]) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryExt void setDefaultContentEncodingCharset(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String encodeMessage()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -323,15 +368,12 @@
     <item name='gov.nist.javax.sip.message.SIPMessage void setHeader(gov.nist.javax.sip.header.SIPHeaderList&lt;gov.nist.javax.sip.header.Via&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String encodeSIPHeaders()'>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void removeLast(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -341,15 +383,15 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 9'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createCancelRequest()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest byte[] encodeAsBytes(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -359,7 +401,7 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request)'>
+    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createAckRequest(gov.nist.javax.sip.header.To)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, java.lang.Object, javax.sip.header.ContentTypeHeader) 8'>
@@ -371,22 +413,28 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String encode()'>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 8'>
+    <item name='gov.nist.javax.sip.message.MessageObject java.lang.String encode()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request, javax.sip.header.ContentTypeHeader, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPResponse createResponse(int, java.lang.String)'>
+    <item name='gov.nist.javax.sip.message.MultipartMimeContent java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MultipartMimeContentImpl java.lang.String toString()'>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request, javax.sip.header.ContentTypeHeader, byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void setTo(javax.sip.header.ToHeader) 0'>
@@ -395,15 +443,12 @@
     <item name='gov.nist.javax.sip.message.SIPMessage void setMessageContent(java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String encode()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createAckRequest(gov.nist.javax.sip.header.To)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String getDialogId(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void removeHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -413,21 +458,18 @@
     <item name='gov.nist.javax.sip.message.SIPMessage void removeFirst(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, java.lang.Object, javax.sip.header.ContentTypeHeader)'>
+    <item name='gov.nist.javax.sip.message.MessageFactoryExt gov.nist.javax.sip.message.MultipartMimeContent createMultipartMimeContent(javax.sip.header.ContentTypeHeader, java.lang.String[], java.lang.String[], java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.ContentImpl java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String encodeMessage()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request, javax.sip.header.ContentTypeHeader, byte[])'>
+    <item name='gov.nist.javax.sip.message.SIPMessage void setSIPVersion(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.SIPRequest void setSIPVersion(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -446,21 +488,21 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, java.lang.Object, javax.sip.header.ContentTypeHeader) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String getReasonPhrase(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String getHeaderAsFormattedString(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String getDialogId(boolean, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String getTransactionId()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createErrorAck(gov.nist.javax.sip.header.To) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryExt gov.nist.javax.sip.message.MultipartMimeContent createMultipartMimeContent(javax.sip.header.ContentTypeHeader, java.lang.String[], java.lang.String[], java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -470,33 +512,36 @@
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse byte[] encodeAsBytes(java.lang.String)'>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 5'>
+    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String getCannonicalName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String encodeMessage()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, byte[], javax.sip.header.ContentTypeHeader) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.message.SIPMessage void setContentLanguage(javax.sip.header.ContentLanguageHeader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.util.Iterator&lt;gov.nist.javax.sip.header.SIPHeader&gt; getHeaders()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, byte[]) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.lang.String getHeaderAsFormattedString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.message.Request, javax.sip.header.ContentTypeHeader, java.lang.Object) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -506,9 +551,6 @@
     <item name='gov.nist.javax.sip.message.SIPResponse void setReasonPhrase(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPRequest gov.nist.javax.sip.message.SIPRequest createCancelRequest()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -518,16 +560,13 @@
     <item name='gov.nist.javax.sip.message.SIPMessage void setMaxForwards(javax.sip.header.MaxForwardsHeader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Request createRequest(javax.sip.address.URI, java.lang.String, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String encode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.message.MessageFactoryImpl javax.sip.message.Response createResponse(int, javax.sip.header.CallIdHeader, javax.sip.header.CSeqHeader, javax.sip.header.FromHeader, javax.sip.header.ToHeader, java.util.List, javax.sip.header.MaxForwardsHeader, javax.sip.header.ContentTypeHeader, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.message.SIPResponse java.lang.String toString()'>
+    <item name='gov.nist.javax.sip.message.SIPMessage java.util.LinkedList&lt;java.lang.String&gt; getMessageAsEncodedStrings()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.message.SIPRequest java.lang.String getDialogId(boolean, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/parser/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/parser/annotations.xml
index c9c02038552..1526492feaa 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/parser/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/parser/annotations.xml
@@ -1,86 +1,71 @@
 <root>
-    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String uricString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.MinExpiresParser MinExpiresParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ToParser ToParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.AuthenticationInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.CallIDParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.CSeqParser CSeqParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.MimeVersionParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.AlertInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.HeaderParser java.util.Calendar date()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.GenericURI uriReference(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.SupportedParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.TelephoneNumber parseTelephoneNumber(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.StatusLineParser StatusLineParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.TelURLImpl telURL(boolean)'>
+    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String reserved()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.RecordRouteParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.AddressParser gov.nist.javax.sip.address.AddressImpl nameAddr()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.core.Host parseHost(java.lang.String)'>
+    <item name='gov.nist.javax.sip.parser.OrganizationParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.AllowParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ServerParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.AddressParametersParser AddressParametersParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ReasonParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.ChallengeParser ChallengeParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ExpiresParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.CallInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.RequireParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ContentLanguageParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.AllowParser AllowParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.UserAgentParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.UnsupportedParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.AddressParser AddressParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.header.SIPHeader parseSIPHeader(java.lang.String)'>
+    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String urlString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.RouteParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ExpiresParser ExpiresParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.GenericURI parseUrl(java.lang.String)'>
+    <item name='gov.nist.javax.sip.parser.RetryAfterParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.AcceptEncodingParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.AcceptLanguageParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.AcceptParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.StatusLineParser java.lang.String reasonPhrase()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.SIPETagParser SIPETagParser(java.lang.String) 0'>
@@ -89,12 +74,21 @@
     <item name='gov.nist.javax.sip.parser.UnsupportedParser UnsupportedParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.SIPETagParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.SipUri sipURL(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.AllowEventsParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ContentLengthParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.Lexer void selectLexer(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.Parser java.text.ParseException createParseException(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.RouteParser RouteParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -104,148 +98,145 @@
     <item name='gov.nist.javax.sip.parser.ContactParser ContactParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.TelephoneNumber parseTelephoneNumber(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.PipelinedMsgParser java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ServerParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.MimeVersionParser MimeVersionParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.MaxForwardsParser MaxForwardsParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.RequireParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.SubjectParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.AcceptLanguageParser AcceptLanguageParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ViaParser gov.nist.core.NameValue nameValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.AddressParser gov.nist.javax.sip.address.AddressImpl address(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String unreserved()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.RequireParser RequireParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ProxyAuthorizationParser ProxyAuthorizationParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.StatusLineParser java.lang.String reasonPhrase()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.MaxForwardsParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String unreserved()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.UserAgentParser UserAgentParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String mark()'>
+    <item name='gov.nist.javax.sip.parser.ContentEncodingParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ErrorInfoParser ErrorInfoParser(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.parser.MinExpiresParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.TimeStampParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.Parser java.lang.String sipVersion()'>
+    <item name='gov.nist.javax.sip.parser.ErrorInfoParser ErrorInfoParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ParametersParser void parseNameValueList(gov.nist.javax.sip.header.ParametersHeader) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ReferToParser ReferToParser(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.RetryAfterParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.SipUri parseSIPUrl(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.RequestLineParser gov.nist.javax.sip.header.RequestLine parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.SipUri parseSIPUrl(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.SubscriptionStateParser SubscriptionStateParser(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ErrorInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.CallIDParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.HeaderParser HeaderParser(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.CallInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.header.StatusLine parseSIPStatusLine(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.AuthorizationParser AuthorizationParser(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ReferToParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.EventParser EventParser(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.StatusLineParser gov.nist.javax.sip.header.StatusLine parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ContentDispositionParser ContentDispositionParser(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.InReplyToParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.PriorityParser PriorityParser(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ProxyAuthorizationParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.SupportedParser SupportedParser(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.TimeStampParser TimeStampParser(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ContentDispositionParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.UnsupportedParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String uricString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.URLParser java.lang.String password()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ReplyToParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ToParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ViaParser gov.nist.core.NameValue nameValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ParametersParser void parseNameValueList(gov.nist.javax.sip.header.ParametersHeader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.PriorityParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.SipUri parseSIPUrl(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ReferToParser ReferToParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.WWWAuthenticateParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ContactParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.SipUri parseSIPUrl(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.SubscriptionStateParser SubscriptionStateParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.StatusLineParser gov.nist.javax.sip.header.StatusLine parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.SIPETagParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.HeaderParser HeaderParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.AllowParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.AuthorizationParser AuthorizationParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ReasonParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.GenericURI parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.AcceptEncodingParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.SubscriptionStateParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.EventParser EventParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ReferToParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.core.NameValue qheader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.HeaderParser java.util.Calendar date()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ContentDispositionParser ContentDispositionParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.PriorityParser PriorityParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.SupportedParser SupportedParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ViaParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.TimeStampParser TimeStampParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.RecordRouteParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.MimeVersionParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.WarningParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.AuthorizationParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.TelephoneNumber parseTelephoneNumber(boolean)'>
+    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String escaped()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.AddressImpl parseAddress(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.AcceptParser AcceptParser(java.lang.String) 0'>
@@ -254,18 +245,24 @@
     <item name='gov.nist.javax.sip.parser.InReplyToParser InReplyToParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.AddressParser gov.nist.javax.sip.address.AddressImpl nameAddr()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ToParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.MinExpiresParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ProxyRequireParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.RetryAfterParser RetryAfterParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.ContentTypeParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ReplyToParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.AcceptLanguageParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.UserAgentParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.ParametersParser ParametersParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -275,67 +272,64 @@
     <item name='gov.nist.javax.sip.parser.SIPIfMatchParser SIPIfMatchParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.EventParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ContentLengthParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ContentEncodingParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.HeaderParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.RequestLineParser RequestLineParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.WWWAuthenticateParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.DateParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.RequestLineParser gov.nist.javax.sip.header.RequestLine parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ErrorInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.AcceptEncodingParser AcceptEncodingParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String reserved()'>
+    <item name='gov.nist.javax.sip.parser.AuthenticationInfoParser AuthenticationInfoParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.AuthenticationInfoParser AuthenticationInfoParser(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.parser.ExpiresParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.FromParser FromParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.AlertInfoParser AlertInfoParser(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.parser.EventParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.WarningParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.AlertInfoParser AlertInfoParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.WWWAuthenticateParser WWWAuthenticateParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ContactParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.ServerParser ServerParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.DateParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.Pipeline void write(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.TelephoneNumber parseTelephoneNumber(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String mark()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.AcceptParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.URLParser URLParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ChallengeParser void parse(gov.nist.javax.sip.header.AuthenticationHeader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String user()'>
+    <item name='gov.nist.javax.sip.parser.ProxyAuthorizationParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.RSeqParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.AllowEventsParser AllowEventsParser(java.lang.String) 0'>
@@ -347,13 +341,10 @@
     <item name='gov.nist.javax.sip.parser.HeaderParser void time(java.util.Calendar) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ContentLanguageParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.Parser void checkToken(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String escaped()'>
+    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String hvalue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ChallengeParser void parseParameter(gov.nist.javax.sip.header.AuthenticationHeader) 0'>
@@ -362,46 +353,49 @@
     <item name='gov.nist.javax.sip.parser.ProxyRequireParser ProxyRequireParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.core.NameValue qheader()'>
+    <item name='gov.nist.javax.sip.parser.AuthenticationInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.CSeqParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.AlertInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String urlString()'>
+    <item name='gov.nist.javax.sip.parser.ParseExceptionListener void handleException(java.text.ParseException, gov.nist.javax.sip.message.SIPMessage, java.lang.Class, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.GenericURI parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.FromParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.RAckParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ContentTypeParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.SubjectParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.DateParser DateParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.RSeqParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ContentDispositionParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.AddressImpl parseAddress(java.lang.String)'>
+    <item name='gov.nist.javax.sip.parser.SupportedParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.core.Host parseHost(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ContentLanguageParser ContentLanguageParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.TelURLImpl telURL(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ProxyAuthenticateParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.Parser java.lang.String sipVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.ReplyToParser ReplyToParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.header.RequestLine parseSIPRequestLine(java.lang.String)'>
+    <item name='gov.nist.javax.sip.parser.MaxForwardsParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.Parser java.text.ParseException createParseException(java.lang.String)'>
+    <item name='gov.nist.javax.sip.parser.SIPIfMatchParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.WarningParser WarningParser(java.lang.String) 0'>
@@ -410,10 +404,10 @@
     <item name='gov.nist.javax.sip.parser.OrganizationParser OrganizationParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.Lexer Lexer(java.lang.String, java.lang.String) 1'>
+    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.header.StatusLine parseSIPStatusLine(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String hvalue()'>
+    <item name='gov.nist.javax.sip.parser.Lexer Lexer(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ContentEncodingParser ContentEncodingParser(java.lang.String) 0'>
@@ -428,25 +422,31 @@
     <item name='gov.nist.javax.sip.parser.ContentLengthParser ContentLengthParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.CSeqParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.TelephoneNumber parseTelephoneNumber(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.RecordRouteParser RecordRouteParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ReasonParser ReasonParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ViaParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.SipUri sipURL(boolean)'>
+    <item name='gov.nist.javax.sip.parser.AddressParser gov.nist.javax.sip.address.AddressImpl address(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ContentTypeParser ContentTypeParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String user()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.RAckParser RAckParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.PriorityParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.GenericURI parseUrl(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.AddressParametersParser void parse(gov.nist.javax.sip.header.AddressParametersHeader) 0'>
@@ -458,28 +458,28 @@
     <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.header.SIPHeader parseSIPHeader(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ProxyAuthenticateParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.SubjectParser SubjectParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.address.AddressImpl parseAddress(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.OrganizationParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.header.SIPHeader parseSIPHeader(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.SIPIfMatchParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.URLParser gov.nist.javax.sip.address.GenericURI uriReference(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.AllowEventsParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String paramNameOrValue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.RouteParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.FromParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.SubscriptionStateParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.PipelinedMsgParser java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.InReplyToParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.CallInfoParser CallInfoParser(java.lang.String) 0'>
@@ -488,10 +488,13 @@
     <item name='gov.nist.javax.sip.parser.ProxyAuthenticateParser ProxyAuthenticateParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.URLParser java.lang.String paramNameOrValue()'>
+    <item name='gov.nist.javax.sip.parser.StringMsgParser gov.nist.javax.sip.header.RequestLine parseSIPRequestLine(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ProxyRequireParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.SIPMessageListener void processMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.RAckParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/parser/extensions/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/parser/extensions/annotations.xml
index 82eb593da74..3fe0ee60571 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/parser/extensions/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/parser/extensions/annotations.xml
@@ -2,7 +2,10 @@
     <item name='gov.nist.javax.sip.parser.extensions.MinSEParser MinSEParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.extensions.ReplacesParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.extensions.ReferredByParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.extensions.JoinParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.extensions.ReferredByParser ReferredByParser(java.lang.String) 0'>
@@ -14,25 +17,22 @@
     <item name='gov.nist.javax.sip.parser.extensions.ReplacesParser ReplacesParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.extensions.JoinParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.extensions.SessionExpiresParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.extensions.ReferencesParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.extensions.ReferencesParser ReferencesParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.extensions.ReferencesParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.extensions.JoinParser JoinParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.extensions.SessionExpiresParser SessionExpiresParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.extensions.ReferredByParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.extensions.ReplacesParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.extensions.SessionExpiresParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/parser/ims/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/parser/ims/annotations.xml
index 68659b25dd0..3207b9fc391 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/parser/ims/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/parser/ims/annotations.xml
@@ -2,10 +2,13 @@
     <item name='gov.nist.javax.sip.parser.ims.SecurityServerParser SecurityServerParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.ServiceRouteParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ims.PServedUserParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PVisitedNetworkIDParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ims.PProfileKeyParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ims.PrivacyParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.SecurityVerifyParser SecurityVerifyParser(java.lang.String) 0'>
@@ -14,58 +17,58 @@
     <item name='gov.nist.javax.sip.parser.ims.PathParser PathParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PAssociatedURIParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ims.PAccessNetworkInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.ims.SecurityAgreeParser gov.nist.javax.sip.header.SIPHeaderList parse(gov.nist.javax.sip.header.ims.SecurityAgree) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.ims.PAssertedServiceParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.ims.PUserDatabaseParser PUserDatabaseParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.PChargingVectorParser PChargingVectorParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PServedUserParser PServedUserParser(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.parser.ims.PathParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.PChargingFunctionAddressesParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.ims.PAssociatedURIParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.ims.PPreferredServiceParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.ims.PServedUserParser PServedUserParser(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ims.PMediaAuthorizationParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ims.ServiceRouteParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.ims.PAccessNetworkInfoParser PAccessNetworkInfoParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.ServiceRouteParser ServiceRouteParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PrivacyParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ims.PAssertedIdentityParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.PVisitedNetworkIDParser void parseQuotedString(gov.nist.javax.sip.header.ims.PVisitedNetworkID) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PServedUserParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ims.PCalledPartyIDParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ims.PProfileKeyParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.ims.PChargingFunctionAddressesParser PChargingFunctionAddressesParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.SecurityClientParser SecurityClientParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PAssertedIdentityParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ims.PPreferredIdentityParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.PVisitedNetworkIDParser void parseToken(gov.nist.javax.sip.header.ims.PVisitedNetworkID) 0'>
@@ -74,9 +77,6 @@
     <item name='gov.nist.javax.sip.parser.ims.SecurityAgreeParser void parseParameter(gov.nist.javax.sip.header.ims.SecurityAgree) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PUserDatabaseParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.ims.PChargingVectorParser void parseParameter(gov.nist.javax.sip.header.ims.PChargingVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -86,28 +86,19 @@
     <item name='gov.nist.javax.sip.parser.ims.PrivacyParser PrivacyParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PMediaAuthorizationParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.ims.PMediaAuthorizationParser PMediaAuthorizationParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.PChargingFunctionAddressesParser void parseParameter(gov.nist.javax.sip.header.ims.PChargingFunctionAddresses) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PChargingVectorParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.parser.ims.PPreferredIdentityParser gov.nist.javax.sip.header.SIPHeader parse()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.parser.ims.PCalledPartyIDParser PCalledPartyIDParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PathParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ims.PVisitedNetworkIDParser PVisitedNetworkIDParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PVisitedNetworkIDParser PVisitedNetworkIDParser(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.parser.ims.PCalledPartyIDParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.SecurityAgreeParser SecurityAgreeParser(java.lang.String) 0'>
@@ -116,16 +107,25 @@
     <item name='gov.nist.javax.sip.parser.ims.PProfileKeyParser PProfileKeyParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.ims.PChargingVectorParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.ims.PPreferredServiceParser PPreferredServiceParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.parser.ims.PVisitedNetworkIDParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.parser.ims.PAssociatedURIParser PAssociatedURIParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.PAssertedServiceParser PAssertedServiceParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.parser.ims.PAssertedServiceParser gov.nist.javax.sip.header.SIPHeader parse()'>
+    <item name='gov.nist.javax.sip.parser.ims.PAccessNetworkInfoParser gov.nist.javax.sip.header.SIPHeader parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.parser.ims.PUserDatabaseParser gov.nist.javax.sip.header.SIPHeader parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.parser.ims.PPreferredIdentityParser PPreferredIdentityParser(java.lang.String) 0'>
diff --git a/android-sdk-annotations/gov/nist/javax/sip/stack/annotations.xml b/android-sdk-annotations/gov/nist/javax/sip/stack/annotations.xml
index b4469aa3f12..00fb2340f02 100644
--- a/android-sdk-annotations/gov/nist/javax/sip/stack/annotations.xml
+++ b/android-sdk-annotations/gov/nist/javax/sip/stack/annotations.xml
@@ -1,92 +1,44 @@
 <root>
-    <item name='gov.nist.javax.sip.stack.HopImpl java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog javax.sip.message.Request createPrack(javax.sip.message.Response) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPClientTransaction createClientTransaction(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageChannel)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.TLSMessageChannel boolean equals(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack javax.sip.address.Router getRouter(gov.nist.javax.sip.message.SIPRequest) 0'>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionEventListener void transactionErrorEvent(gov.nist.javax.sip.stack.SIPTransactionErrorEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.SipProviderImpl, gov.nist.javax.sip.message.SIPResponse) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack javax.sip.address.Router getRouter(gov.nist.javax.sip.message.SIPRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.message.SIPResponse) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void sendMessage(byte[], java.net.InetAddress, int, java.lang.String, boolean) 0'>
+    <item name='gov.nist.javax.sip.stack.RawMessageChannel void processMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TLSMessageChannel TLSMessageChannel(java.net.InetAddress, int, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TLSMessageProcessor) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageChannel java.lang.String getTransport()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPServerTransaction boolean isMessagePartOfTransaction(gov.nist.javax.sip.message.SIPMessage) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.TCPMessageProcessor void cacheMessageChannel(gov.nist.javax.sip.stack.TCPMessageChannel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.ServerLog void logMessage(gov.nist.javax.sip.message.SIPMessage, java.lang.String, java.lang.String, java.lang.String, boolean, long) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack java.net.SocketAddress obtainLocalAddress(java.net.InetAddress, int, java.net.InetAddress, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog gov.nist.javax.sip.stack.SIPDialog createFromNOTIFY(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.stack.SIPTransaction) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransaction SIPTransaction(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.MessageChannel) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.TLSMessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.DefaultMessageLogFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, long, boolean, java.lang.String, java.lang.String, java.lang.String, long)'>
+    <item name='gov.nist.javax.sip.stack.SIPDialog SIPDialog(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.message.SIPResponse) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.UDPMessageChannel UDPMessageChannel(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.UDPMessageProcessor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog SIPDialog(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.message.SIPResponse) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack void putPendingTransaction(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TLSMessageProcessor void remove(gov.nist.javax.sip.stack.TLSMessageChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.TCPMessageChannel TCPMessageChannel(java.net.InetAddress, int, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TCPMessageProcessor) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransaction void sendMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.TCPMessageChannel TCPMessageChannel(java.net.Socket, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TCPMessageProcessor) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void removeDialog(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPServerTransaction SIPServerTransaction(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.MessageChannel) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void putInMergeTable(gov.nist.javax.sip.stack.SIPServerTransaction, gov.nist.javax.sip.message.SIPRequest) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.TCPMessageChannel java.lang.String getTransport()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPTransaction findTransaction(gov.nist.javax.sip.message.SIPMessage, boolean) 0'>
+    <item name='gov.nist.javax.sip.stack.TCPMessageChannel TCPMessageChannel(java.net.InetAddress, int, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TCPMessageProcessor) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.message.SIPResponse) 0'>
@@ -104,307 +56,175 @@
     <item name='gov.nist.javax.sip.stack.TLSMessageChannel TLSMessageChannel(java.net.InetAddress, int, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TLSMessageProcessor) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void addTransaction(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
+    <item name='gov.nist.javax.sip.stack.MessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.DefaultMessageLogFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, java.lang.String, long) 3'>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void addTransaction(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPDialog SIPDialog(gov.nist.javax.sip.stack.SIPTransaction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.stack.SIPTransaction)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.TCPMessageChannel void processMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel gov.nist.javax.sip.header.Via getViaHeader()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPDialog SIPDialog(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.message.SIPResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TCPMessageChannel TCPMessageChannel(java.net.InetAddress, int, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TCPMessageProcessor) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void addExtensionMethod(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog void sendReliableProvisionalResponse(javax.sip.message.Response) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPServerTransaction SIPServerTransaction(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.MessageChannel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPClientTransaction createClientTransaction(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageChannel) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageChannel UDPMessageChannel(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.UDPMessageProcessor, java.net.DatagramPacket) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPClientTransaction javax.sip.message.Request createCancel()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack void dialogErrorEvent(gov.nist.javax.sip.stack.SIPDialogErrorEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.MessageChannel void sendMessage(gov.nist.javax.sip.message.SIPMessage, java.net.InetAddress, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.TCPMessageChannel TCPMessageChannel(java.net.Socket, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TCPMessageProcessor) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPClientTransaction void sendMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.UDPMessageChannel UDPMessageChannel(java.net.InetAddress, int, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.UDPMessageProcessor) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPClientTransaction gov.nist.javax.sip.stack.MessageChannel getRequestChannel()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPServerTransaction boolean equals(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog SIPDialog(gov.nist.javax.sip.SipProviderImpl, gov.nist.javax.sip.message.SIPResponse) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPDialog boolean handleAck(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.TCPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.core.HostPort) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack javax.sip.Dialog getJoinDialog(gov.nist.javax.sip.header.extensions.JoinHeader) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.TLSMessageChannel java.lang.String getTransport()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPClientTransaction void setDialog(gov.nist.javax.sip.stack.SIPDialog, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel gov.nist.core.HostPort getPeerHostPort()'>
+    <item name='gov.nist.javax.sip.stack.SIPDialog SIPDialog(gov.nist.javax.sip.SipProviderImpl, gov.nist.javax.sip.message.SIPResponse) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPServerTransaction void setOriginalRequest(gov.nist.javax.sip.message.SIPRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor UDPMessageProcessor(java.net.InetAddress, gov.nist.javax.sip.stack.SIPTransactionStack, int) 1'>
+    <item name='gov.nist.javax.sip.stack.MessageChannel void sendMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String getKey(java.net.InetAddress, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPServerTransaction findTransactionPendingAck(gov.nist.javax.sip.message.SIPRequest) 0'>
+    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(java.net.InetAddress, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.DefaultMessageLogFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, long, boolean, java.lang.String, java.lang.String, java.lang.String, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPServerTransaction findTransactionPendingAck(gov.nist.javax.sip.message.SIPRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog getDialog(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel void sendMessage(gov.nist.javax.sip.message.SIPMessage, javax.sip.address.Hop) 1'>
+    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void sendMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TLSMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.core.HostPort) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void handleException(java.text.ParseException, gov.nist.javax.sip.message.SIPMessage, java.lang.Class, java.lang.String, java.lang.String) 1'>
+    <item name='gov.nist.javax.sip.stack.MessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.core.HostPort) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.TCPMessageProcessor java.lang.String getTransport()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog void sendRequest(javax.sip.ClientTransaction, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.core.HostPort)'>
+    <item name='gov.nist.javax.sip.stack.SIPDialogEventListener void dialogErrorEvent(gov.nist.javax.sip.stack.SIPDialogErrorEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.UDPMessageChannel UDPMessageChannel(java.net.InetAddress, int, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.UDPMessageProcessor) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog gov.nist.javax.sip.stack.SIPDialog createFromNOTIFY(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.stack.SIPTransaction) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransaction void setOriginalRequest(gov.nist.javax.sip.message.SIPRequest) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPDialog SIPDialog(gov.nist.javax.sip.SipProviderImpl, gov.nist.javax.sip.message.SIPResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPClientTransaction boolean isMessagePartOfTransaction(gov.nist.javax.sip.message.SIPMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog boolean isRequestConsumable(gov.nist.javax.sip.message.SIPRequest) 0'>
+    <item name='gov.nist.javax.sip.stack.ServerResponseInterface void processResponse(gov.nist.javax.sip.message.SIPResponse, gov.nist.javax.sip.stack.MessageChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.HandshakeCompletedListenerImpl HandshakeCompletedListenerImpl(gov.nist.javax.sip.stack.TLSMessageChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack java.util.Collection&lt;javax.sip.Dialog&gt; getDialogs(javax.sip.DialogState)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor UDPMessageProcessor(java.net.InetAddress, gov.nist.javax.sip.stack.SIPTransactionStack, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String getKey(gov.nist.core.HostPort, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.MessageProcessor void setSentBy(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.stack.MessageChannel gov.nist.javax.sip.header.Via getViaHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPTransaction void setEncapsulatedChannel(gov.nist.javax.sip.stack.MessageChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(java.net.InetAddress, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void addForkedClientTransaction(gov.nist.javax.sip.stack.SIPClientTransaction) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog void sendRequest(javax.sip.ClientTransaction) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageProcessor createMessageProcessor(java.net.InetAddress, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void removeDialog(gov.nist.javax.sip.stack.SIPDialog) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void putDialog(gov.nist.javax.sip.stack.SIPDialog) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.DefaultRouter void fixStrictRouting(gov.nist.javax.sip.message.SIPRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel gov.nist.core.HostPort getHostPort()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPDialog void addTransaction(gov.nist.javax.sip.stack.SIPTransaction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageProcessor createMessageProcessor(java.net.InetAddress, int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.MessageProcessor MessageProcessor(java.net.InetAddress, int, java.lang.String, gov.nist.javax.sip.stack.SIPTransactionStack) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPServerTransaction void sendReliableProvisionalResponse(javax.sip.message.Response) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.ServerLog void setSipStack(javax.sip.SipStack) 0'>
+    <item name='gov.nist.javax.sip.stack.MessageProcessor MessageProcessor(java.net.InetAddress, int, java.lang.String, gov.nist.javax.sip.stack.SIPTransactionStack) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPClientTransaction gov.nist.javax.sip.stack.SIPDialog getDialog(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.MessageProcessor void setListeningPoint(gov.nist.javax.sip.ListeningPointImpl) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String getKey(java.net.InetAddress, int, java.lang.String)'>
+    <item name='gov.nist.javax.sip.stack.ServerLog void setSipStack(javax.sip.SipStack) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TCPMessageChannel void sendMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.stack.MessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(java.net.InetAddress, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.stack.SIPClientTransaction void processResponse(gov.nist.javax.sip.message.SIPResponse, gov.nist.javax.sip.stack.MessageChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String createBadReqRes(java.lang.String, java.text.ParseException) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.SipProviderImpl, gov.nist.javax.sip.message.SIPResponse)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog javax.sip.message.Request createAck(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.TLSMessageChannel void processMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.stack.SIPTransaction)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TCPMessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void sendMessage(byte[], java.net.InetAddress, int, java.lang.String, boolean) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack javax.sip.Dialog getReplacesDialog(gov.nist.javax.sip.header.extensions.ReplacesHeader) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.TLSMessageChannel TLSMessageChannel(java.net.Socket, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TLSMessageProcessor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack void addTransaction(gov.nist.javax.sip.stack.SIPClientTransaction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.stack.SIPTransaction) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void removeFromMergeTable(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
+    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String getKey(java.net.InetAddress, int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.DefaultRouter javax.sip.address.Hop getNextHop(javax.sip.message.Request) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPServerTransaction getRetransmissionAlertTransaction(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void removeFromMergeTable(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.MessageProcessor int getDefaultPort(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageChannel createRawMessageChannel(java.lang.String, int, javax.sip.address.Hop) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.TLSMessageChannel TLSMessageChannel(java.net.Socket, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TLSMessageProcessor) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.TLSMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(java.net.InetAddress, int) 0'>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPServerTransaction getRetransmissionAlertTransaction(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.ServerLog void logMessage(gov.nist.javax.sip.message.SIPMessage, java.lang.String, java.lang.String, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPServerTransaction findPendingTransaction(gov.nist.javax.sip.message.SIPRequest) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPClientTransaction getForkedTransaction(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog javax.sip.message.Response createReliableProvisionalResponse(int)'>
+    <item name='gov.nist.javax.sip.stack.TLSMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(java.net.InetAddress, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TCPMessageChannel void handleException(java.text.ParseException, gov.nist.javax.sip.message.SIPMessage, java.lang.Class, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.ServerLog void setStackProperties(java.util.Properties) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog void startRetransmitTimer(gov.nist.javax.sip.stack.SIPServerTransaction, javax.sip.message.Response) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void setHostAddress(java.lang.String) 0'>
+    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.core.HostPort)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TLSMessageChannel void sendMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String getKey(gov.nist.core.HostPort, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPServerTransaction gov.nist.javax.sip.stack.MessageChannel getResponseChannel()'>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void transactionErrorEvent(gov.nist.javax.sip.stack.SIPTransactionErrorEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TLSMessageChannel void handleException(java.text.ParseException, gov.nist.javax.sip.message.SIPMessage, java.lang.Class, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void transactionErrorEvent(gov.nist.javax.sip.stack.SIPTransactionErrorEvent) 0'>
+    <item name='gov.nist.javax.sip.stack.UDPMessageChannel java.lang.String getTransport()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TCPMessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 0'>
@@ -413,43 +233,22 @@
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.ServerResponseInterface newSIPServerResponse(gov.nist.javax.sip.message.SIPResponse, gov.nist.javax.sip.stack.MessageChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.MessageProcessor void initialize(java.net.InetAddress, int, gov.nist.javax.sip.stack.SIPTransactionStack) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog void sendAck(javax.sip.message.Request) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.DefaultMessageLogFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, java.lang.String, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPDialog javax.sip.message.Request createRequest(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageProcessor createMessageProcessor(java.net.InetAddress, int, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack boolean removeTransactionPendingAck(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.TLSMessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.TLSMessageProcessor void cacheMessageChannel(gov.nist.javax.sip.stack.TLSMessageChannel) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPServerTransaction void sendMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor java.lang.String getTransport()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog gov.nist.javax.sip.stack.SIPDialog createFromNOTIFY(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.stack.SIPTransaction)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.TLSMessageProcessor TLSMessageProcessor(java.net.InetAddress, gov.nist.javax.sip.stack.SIPTransactionStack, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageProcessor, javax.sip.address.Hop) 1'>
+    <item name='gov.nist.javax.sip.stack.MessageChannel gov.nist.core.HostPort getHostPort()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack void removeTransactionHash(gov.nist.javax.sip.stack.SIPTransaction) 0'>
@@ -458,7 +257,7 @@
     <item name='gov.nist.javax.sip.stack.SIPServerTransaction void sendResponse(javax.sip.message.Response) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void removeTransaction(gov.nist.javax.sip.stack.SIPTransaction) 0'>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack java.util.Collection&lt;javax.sip.Dialog&gt; getDialogs()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPClientTransaction findSubscribeTransaction(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.ListeningPointImpl) 0'>
@@ -470,15 +269,6 @@
     <item name='gov.nist.javax.sip.stack.DefaultMessageLogFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, java.lang.String, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPClientTransaction javax.sip.message.Request createAck()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPDialog void setLastResponse(gov.nist.javax.sip.stack.SIPTransaction, gov.nist.javax.sip.message.SIPResponse) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack boolean isTransactionPendingAck(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack void addTransactionPendingAck(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -488,43 +278,316 @@
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.SipProviderImpl, gov.nist.javax.sip.message.SIPResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageProcessor, javax.sip.address.Hop) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack java.util.Collection&lt;javax.sip.Dialog&gt; getDialogs()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.core.HostPort) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.TCPMessageChannel boolean equals(java.lang.Object) 0'>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void mapTransaction(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.TCPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(java.net.InetAddress, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void mapTransaction(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel gov.nist.core.HostPort getViaHostPort()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.SIPClientTransaction SIPClientTransaction(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.MessageChannel) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String createBadReqRes(java.lang.String, java.text.ParseException) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.ServerRequestInterface newSIPServerRequest(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageChannel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPServerTransaction findMergedTransaction(gov.nist.javax.sip.message.SIPRequest) 0'>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.SipProviderImpl, gov.nist.javax.sip.message.SIPResponse)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageProcessor java.lang.String getTransport()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog javax.sip.message.Request createPrack(javax.sip.message.Response) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void sendMessage(byte[], java.net.InetAddress, int, java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPServerTransaction boolean isMessagePartOfTransaction(gov.nist.javax.sip.message.SIPMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack java.net.SocketAddress obtainLocalAddress(java.net.InetAddress, int, java.net.InetAddress, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.ServerLog void logMessage(gov.nist.javax.sip.message.SIPMessage, java.lang.String, java.lang.String, java.lang.String, boolean, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TCPMessageProcessor void cacheMessageChannel(gov.nist.javax.sip.stack.TCPMessageChannel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog gov.nist.javax.sip.stack.SIPDialog createFromNOTIFY(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.stack.SIPTransaction) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TLSMessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPServerTransaction gov.nist.javax.sip.stack.MessageChannel getResponseChannel()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TCPMessageChannel TCPMessageChannel(java.net.Socket, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TCPMessageProcessor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPServerTransaction SIPServerTransaction(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.MessageChannel) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void removeDialog(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void putInMergeTable(gov.nist.javax.sip.stack.SIPServerTransaction, gov.nist.javax.sip.message.SIPRequest) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPTransaction findTransaction(gov.nist.javax.sip.message.SIPMessage, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog gov.nist.javax.sip.stack.SIPDialog createFromNOTIFY(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.stack.SIPTransaction)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='gov.nist.javax.sip.stack.SIPDialog javax.sip.message.Request createRequest(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.stack.DefaultMessageLogFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, java.lang.String, long) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPClientTransaction gov.nist.javax.sip.stack.MessageChannel getRequestChannel()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void sendMessage(byte[], java.net.InetAddress, int, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void addExtensionMethod(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog void sendReliableProvisionalResponse(javax.sip.message.Response) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPClientTransaction createClientTransaction(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageChannel) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPServerTransaction SIPServerTransaction(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.MessageChannel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog javax.sip.message.Response createReliableProvisionalResponse(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageChannel UDPMessageChannel(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.UDPMessageProcessor, java.net.DatagramPacket) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TCPMessageChannel TCPMessageChannel(java.net.Socket, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TCPMessageProcessor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String getKey(gov.nist.core.HostPort, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPClientTransaction void sendMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack javax.sip.Dialog getJoinDialog(gov.nist.javax.sip.header.extensions.JoinHeader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TCPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.core.HostPort) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPClientTransaction void setDialog(gov.nist.javax.sip.stack.SIPDialog, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransaction void sendMessage(byte[], java.net.InetAddress, int, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransaction void setDialog(gov.nist.javax.sip.stack.SIPDialog, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor UDPMessageProcessor(java.net.InetAddress, gov.nist.javax.sip.stack.SIPTransactionStack, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageChannel void sendMessage(gov.nist.javax.sip.message.SIPMessage, javax.sip.address.Hop) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageProcessor createMessageProcessor(java.net.InetAddress, int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(java.net.InetAddress, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void handleException(java.text.ParseException, gov.nist.javax.sip.message.SIPMessage, java.lang.Class, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog void sendRequest(javax.sip.ClientTransaction, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransaction void setOriginalRequest(gov.nist.javax.sip.message.SIPRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog gov.nist.javax.sip.stack.SIPDialog createFromNOTIFY(gov.nist.javax.sip.stack.SIPClientTransaction, gov.nist.javax.sip.stack.SIPTransaction) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog javax.sip.message.Request createAck(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog boolean isRequestConsumable(gov.nist.javax.sip.message.SIPRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageChannel gov.nist.core.HostPort getViaHostPort()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageChannel gov.nist.core.HostPort getPeerHostPort()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransaction void sendMessage(byte[], java.net.InetAddress, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String getKey(gov.nist.core.HostPort, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor UDPMessageProcessor(java.net.InetAddress, gov.nist.javax.sip.stack.SIPTransactionStack, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String getTransport()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageProcessor void setSentBy(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.StackMessageFactory gov.nist.javax.sip.stack.ServerResponseInterface newSIPServerResponse(gov.nist.javax.sip.message.SIPResponse, gov.nist.javax.sip.stack.MessageChannel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor java.lang.String getTransport()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void addForkedClientTransaction(gov.nist.javax.sip.stack.SIPClientTransaction) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog void sendRequest(javax.sip.ClientTransaction) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPClientTransaction createClientTransaction(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageChannel)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void putDialog(gov.nist.javax.sip.stack.SIPDialog) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void removeDialog(gov.nist.javax.sip.stack.SIPDialog) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.HopImpl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPClientTransaction javax.sip.message.Request createAck()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageProcessor void setListeningPoint(gov.nist.javax.sip.ListeningPointImpl) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String createBadReqRes(java.lang.String, java.text.ParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.StackMessageFactory gov.nist.javax.sip.stack.ServerRequestInterface newSIPServerRequest(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageChannel) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPClientTransaction javax.sip.message.Request createCancel()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TLSMessageChannel void processMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void sendMessage(byte[], java.net.InetAddress, int, java.lang.String, boolean) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack javax.sip.Dialog getReplacesDialog(gov.nist.javax.sip.header.extensions.ReplacesHeader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPDialog createDialog(gov.nist.javax.sip.stack.SIPTransaction) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageChannel createRawMessageChannel(java.lang.String, int, javax.sip.address.Hop) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='gov.nist.javax.sip.stack.SIPTransaction gov.nist.javax.sip.header.Via getViaHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='gov.nist.javax.sip.stack.TLSMessageChannel TLSMessageChannel(java.net.Socket, gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.TLSMessageProcessor) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TCPMessageProcessor java.lang.String getTransport()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPServerTransaction findPendingTransaction(gov.nist.javax.sip.message.SIPRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPClientTransaction getForkedTransaction(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog void startRetransmitTimer(gov.nist.javax.sip.stack.SIPServerTransaction, javax.sip.message.Response) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.ServerLog void setStackProperties(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void setHostAddress(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack java.util.Collection&lt;javax.sip.Dialog&gt; getDialogs(javax.sip.DialogState)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.StackMessageFactory gov.nist.javax.sip.stack.ServerResponseInterface newSIPServerResponse(gov.nist.javax.sip.message.SIPResponse, gov.nist.javax.sip.stack.MessageChannel) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog void sendAck(javax.sip.message.Request) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageProcessor void initialize(java.net.InetAddress, int, gov.nist.javax.sip.stack.SIPTransactionStack) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack boolean removeTransactionPendingAck(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.DefaultMessageLogFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TLSMessageProcessor void cacheMessageChannel(gov.nist.javax.sip.stack.TLSMessageChannel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TLSMessageChannel java.lang.String getTransport()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageChannel void processMessage(gov.nist.javax.sip.message.SIPMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageProcessor, javax.sip.address.Hop) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack void removeTransaction(gov.nist.javax.sip.stack.SIPTransaction) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPDialog void setLastResponse(gov.nist.javax.sip.stack.SIPTransaction, gov.nist.javax.sip.message.SIPResponse) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack boolean isTransactionPendingAck(gov.nist.javax.sip.stack.SIPServerTransaction) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageProcessor, javax.sip.address.Hop) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.UDPMessageProcessor gov.nist.javax.sip.stack.MessageChannel createMessageChannel(gov.nist.core.HostPort) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.DefaultMessageLogFactory gov.nist.javax.sip.LogRecord createLogRecord(java.lang.String, java.lang.String, java.lang.String, long, boolean, java.lang.String, java.lang.String, java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.MessageChannel java.lang.String createBadReqRes(java.lang.String, java.text.ParseException) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPClientTransaction SIPClientTransaction(gov.nist.javax.sip.stack.SIPTransactionStack, gov.nist.javax.sip.stack.MessageChannel) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransactionStack gov.nist.javax.sip.stack.SIPServerTransaction findMergedTransaction(gov.nist.javax.sip.message.SIPRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.StackMessageFactory gov.nist.javax.sip.stack.ServerRequestInterface newSIPServerRequest(gov.nist.javax.sip.message.SIPRequest, gov.nist.javax.sip.stack.MessageChannel) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPTransaction boolean isMessagePartOfTransaction(gov.nist.javax.sip.message.SIPMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.SIPServerTransaction void setDialog(gov.nist.javax.sip.stack.SIPDialog, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='gov.nist.javax.sip.stack.TCPMessageChannel java.lang.String getTransport()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/javax/microedition/khronos/egl/annotations.xml b/android-sdk-annotations/javax/microedition/khronos/egl/annotations.xml
index 544affd3b71..24c9513a030 100644
--- a/android-sdk-annotations/javax/microedition/khronos/egl/annotations.xml
+++ b/android-sdk-annotations/javax/microedition/khronos/egl/annotations.xml
@@ -1,5 +1,23 @@
 <root>
+    <item name='javax.microedition.khronos.egl.EGL10 boolean eglQuerySurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLSurface, int, int[]) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.egl.EGL10 javax.microedition.khronos.egl.EGLContext eglCreateContext(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, javax.microedition.khronos.egl.EGLContext, int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.egl.EGL10 boolean eglQueryContext(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLContext, int, int[]) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.egl.EGL10 javax.microedition.khronos.egl.EGLSurface eglCreatePbufferSurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.egl.EGL10 javax.microedition.khronos.egl.EGLSurface eglCreatePixmapSurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, java.lang.Object, int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='javax.microedition.khronos.egl.EGLContext javax.microedition.khronos.egl.EGL getEGL()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='javax.microedition.khronos.egl.EGL10 javax.microedition.khronos.egl.EGLSurface eglCreateWindowSurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, java.lang.Object, int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/javax/microedition/khronos/opengles/annotations.xml b/android-sdk-annotations/javax/microedition/khronos/opengles/annotations.xml
new file mode 100644
index 00000000000..6efd462292c
--- /dev/null
+++ b/android-sdk-annotations/javax/microedition/khronos/opengles/annotations.xml
@@ -0,0 +1,359 @@
+<root>
+    <item name='javax.microedition.khronos.opengles.GL10 void glGetIntegerv(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glTexParameterfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetTexGeniv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glTexEnvfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11Ext void glDrawTexfvOES(float[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glLightxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexParameteriv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glTexSubImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer) 8'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glBufferSubData(int, int, int, java.nio.Buffer) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10Ext int glQueryMatrixxOES(int[], int, int[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetLightxv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glMaterialxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glDeleteRenderbuffersOES(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glTexCoordPointer(int, int, int, java.nio.Buffer) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetMaterialfv(int, int, java.nio.FloatBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glTexGenxv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glCompressedTexSubImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer) 8'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexParameteriv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glClipPlanef(int, float[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glLoadMatrixx(int[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexParameterxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glTexEnviv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGenFramebuffersOES(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetMaterialfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11Ext void glDrawTexsvOES(short[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glTexGeniv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetFixedv(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexEnvxv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glColorPointer(int, int, int, java.nio.Buffer) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glPointParameterfv(int, float[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetBooleanv(int, boolean[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glCompressedTexImage2D(int, int, int, int, int, int, int, java.nio.Buffer) 7'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glMultMatrixf(float[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glFogfv(int, float[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glGetIntegerv(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetBooleanv(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glDeleteBuffers(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetIntegerv(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetFramebufferAttachmentParameterivOES(int, int, int, java.nio.IntBuffer) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetBufferParameteriv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexParameterxv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10Ext int glQueryMatrixxOES(int[], int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glPointParameterfv(int, java.nio.FloatBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetFloatv(int, float[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glTexParameterxv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetIntegerv(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glLoadMatrixf(float[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glDeleteRenderbuffersOES(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glTexParameterxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glMultMatrixx(int[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetTexGenxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetTexGenfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glTexImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer) 8'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexEnviv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetFloatv(int, java.nio.FloatBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glTexGenfv(int, int, java.nio.FloatBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetLightfv(int, int, java.nio.FloatBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glTexParameterfv(int, int, java.nio.FloatBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glLightModelfv(int, float[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glClipPlanex(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glPointParameterxv(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glTexEnvfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetTexGenfv(int, int, java.nio.FloatBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glDeleteFramebuffersOES(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glTexGeniv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetTexGeniv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glGenTextures(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetFramebufferAttachmentParameterivOES(int, int, int, int[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glDeleteFramebuffersOES(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetRenderbufferParameterivOES(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glNormalPointer(int, int, java.nio.Buffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glTexGenfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetClipPlanex(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glDeleteBuffers(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetLightfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10Ext int glQueryMatrixxOES(java.nio.IntBuffer, java.nio.IntBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGenBuffers(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glBufferData(int, int, java.nio.Buffer, int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glDeleteTextures(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11Ext void glWeightPointerOES(int, int, int, java.nio.Buffer) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetTexGenxv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGenRenderbuffersOES(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11Ext void glMatrixIndexPointerOES(int, int, int, java.nio.Buffer) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11Ext void glDrawTexxvOES(int[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glPointParameterxv(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetPointerv(int, java.nio.Buffer[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetClipPlanef(int, float[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexParameterfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetClipPlanef(int, java.nio.FloatBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexEnviv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetClipPlanex(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10Ext int glQueryMatrixxOES(java.nio.IntBuffer, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGenRenderbuffersOES(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGenBuffers(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glPointSizePointerOES(int, int, java.nio.Buffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glTexEnvxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetFixedv(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glTexEnviv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glLightfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexParameterfv(int, int, java.nio.FloatBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetMaterialxv(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glLightModelxv(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetMaterialxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11Ext void glTexParameterfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glGenTextures(int, java.nio.IntBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glTexParameteriv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11Ext void glDrawTexivOES(int[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glFogxv(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGetRenderbufferParameterivOES(int, int, java.nio.IntBuffer) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glTexGenxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetBufferParameteriv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glGenFramebuffersOES(int, int[], int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glCompressedTexImage2D(int, int, int, int, int, int, int, java.nio.Buffer) 7'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glMaterialfv(int, int, float[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetLightxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glReadPixels(int, int, int, int, int, int, java.nio.Buffer) 6'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL10 void glVertexPointer(int, int, int, java.nio.Buffer) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11ExtensionPack void glTexEnvxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='javax.microedition.khronos.opengles.GL11 void glGetTexEnvxv(int, int, int[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/android-sdk-annotations/junit/extensions/annotations.xml b/android-sdk-annotations/junit/extensions/annotations.xml
index 1579a218340..f4686627f1f 100644
--- a/android-sdk-annotations/junit/extensions/annotations.xml
+++ b/android-sdk-annotations/junit/extensions/annotations.xml
@@ -1,5 +1,11 @@
 <root>
-    <item name='junit.extensions.RepeatedTest java.lang.String toString()'>
+    <item name='junit.extensions.TestDecorator void run(junit.framework.TestResult) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.extensions.ActiveTestSuite void runTest(junit.framework.Test, junit.framework.TestResult) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.extensions.ActiveTestSuite void run(junit.framework.TestResult) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.extensions.ActiveTestSuite ActiveTestSuite(java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 0'>
@@ -8,9 +14,15 @@
     <item name='junit.extensions.TestDecorator java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='junit.extensions.RepeatedTest void run(junit.framework.TestResult) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='junit.extensions.TestSetup void run(junit.framework.TestResult) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='junit.extensions.RepeatedTest java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='junit.extensions.ActiveTestSuite ActiveTestSuite(java.lang.Class&lt;? extends junit.framework.TestCase&gt;, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/junit/framework/annotations.xml b/android-sdk-annotations/junit/framework/annotations.xml
index 0bdd42f9e66..7ea1ddf2c85 100644
--- a/android-sdk-annotations/junit/framework/annotations.xml
+++ b/android-sdk-annotations/junit/framework/annotations.xml
@@ -2,19 +2,52 @@
     <item name='junit.framework.TestSuite void addTestSuite(java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='junit.framework.Test void run(junit.framework.TestResult) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.TestFailure java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='junit.framework.TestCase junit.framework.TestResult createResult()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestCase junit.framework.TestResult run()'>
+    <item name='junit.framework.TestSuite void runTest(junit.framework.Test, junit.framework.TestResult) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestSuite junit.framework.Test warning(java.lang.String)'>
+    <item name='junit.framework.TestCase java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.TestResult java.util.Enumeration&lt;junit.framework.TestFailure&gt; failures()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.TestResult java.util.Enumeration&lt;junit.framework.TestFailure&gt; errors()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.framework.TestFailure java.lang.String trace()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestSuite void runTest(junit.framework.Test, junit.framework.TestResult) 0'>
+    <item name='junit.framework.TestSuite TestSuite(java.lang.Class&lt;?&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.ComparisonFailure java.lang.String getMessage()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.TestSuite java.lang.reflect.Constructor&lt;?&gt; getTestConstructor(java.lang.Class&lt;?&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.TestSuite TestSuite(java.lang.Class&lt;? extends junit.framework.TestCase&gt;[], java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.TestListener void addFailure(junit.framework.Test, junit.framework.AssertionFailedError) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.TestSuite junit.framework.Test warning(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.TestListener void startTest(junit.framework.Test) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.framework.ComparisonCompactor java.lang.String compact(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.framework.TestResult void run(junit.framework.TestCase) 0'>
@@ -23,43 +56,37 @@
     <item name='junit.framework.TestSuite TestSuite(java.lang.Class&lt;?&gt;...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestCase java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='junit.framework.TestSuite TestSuite(java.lang.Class&lt;? extends junit.framework.TestCase&gt;, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestResult java.util.Enumeration&lt;junit.framework.TestFailure&gt; errors()'>
+    <item name='junit.framework.TestSuite void run(junit.framework.TestResult) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.ComparisonCompactor java.lang.String compact(java.lang.String)'>
+    <item name='junit.framework.TestListener void addError(junit.framework.Test, java.lang.Throwable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestSuite java.lang.reflect.Constructor&lt;?&gt; getTestConstructor(java.lang.Class&lt;?&gt;) 0'>
+    <item name='junit.framework.TestCase junit.framework.TestResult run()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.ComparisonFailure java.lang.String getMessage()'>
+    <item name='junit.framework.TestListener void endTest(junit.framework.Test) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestCase void run(junit.framework.TestResult) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='junit.framework.TestSuite TestSuite(java.lang.Class&lt;?&gt;) 0'>
+    <item name='junit.framework.TestListener void addError(junit.framework.Test, java.lang.Throwable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.framework.TestSuite java.util.Enumeration&lt;junit.framework.Test&gt; tests()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestSuite TestSuite(java.lang.Class&lt;? extends junit.framework.TestCase&gt;[], java.lang.String) 0'>
+    <item name='junit.framework.TestSuite java.lang.reflect.Constructor&lt;?&gt; getTestConstructor(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestSuite java.lang.reflect.Constructor&lt;?&gt; getTestConstructor(java.lang.Class&lt;?&gt;)'>
+    <item name='junit.framework.TestCase void run(junit.framework.TestResult) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.framework.Assert java.lang.String format(java.lang.String, java.lang.Object, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestFailure java.lang.String toString()'>
+    <item name='junit.framework.TestListener void addFailure(junit.framework.Test, junit.framework.AssertionFailedError) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.framework.TestSuite junit.framework.Test createTest(java.lang.Class&lt;?&gt;, java.lang.String) 0'>
@@ -68,7 +95,4 @@
     <item name='junit.framework.TestResult void startTest(junit.framework.Test) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.framework.TestResult java.util.Enumeration&lt;junit.framework.TestFailure&gt; failures()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/junit/runner/annotations.xml b/android-sdk-annotations/junit/runner/annotations.xml
index 7a87066e8da..1bbf2de5e9b 100644
--- a/android-sdk-annotations/junit/runner/annotations.xml
+++ b/android-sdk-annotations/junit/runner/annotations.xml
@@ -1,14 +1,26 @@
 <root>
+    <item name='junit.runner.StandardTestSuiteLoader java.lang.Class reload(java.lang.Class) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.runner.BaseTestRunner void addFailure(junit.framework.Test, junit.framework.AssertionFailedError) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.runner.LoadingTestCollector boolean isTestClass(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='junit.runner.BaseTestRunner void endTest(junit.framework.Test) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='junit.runner.TestSuiteLoader java.lang.Class load(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='junit.runner.ClassPathTestCollector java.util.Hashtable collectFilesInPath(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.BaseTestRunner int getPreference(java.lang.String, int) 0'>
+    <item name='junit.runner.TestSuiteLoader java.lang.Class load(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.BaseTestRunner junit.runner.TestSuiteLoader getLoader()'>
+    <item name='junit.runner.BaseTestRunner int getPreference(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.runner.TestCaseClassLoader TestCaseClassLoader(java.lang.String) 0'>
@@ -17,16 +29,22 @@
     <item name='junit.runner.ClassPathTestCollector java.lang.String classNameFromFile(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='junit.runner.BaseTestRunner void addError(junit.framework.Test, java.lang.Throwable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='junit.runner.BaseTestRunner java.lang.Class&lt;?&gt; loadSuiteClass(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.ClassPathTestCollector java.lang.String classNameFromFile(java.lang.String)'>
+    <item name='junit.runner.ClassPathTestCollector java.util.Enumeration collectTests()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.BaseTestRunner java.lang.Class&lt;?&gt; loadSuiteClass(java.lang.String)'>
+    <item name='junit.runner.StandardTestSuiteLoader java.lang.Class load(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.BaseTestRunner java.lang.String extractClassName(java.lang.String)'>
+    <item name='junit.runner.BaseTestRunner java.lang.String elapsedTimeAsString(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.runner.BaseTestRunner void addFailure(junit.framework.Test, junit.framework.AssertionFailedError) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.runner.BaseTestRunner java.lang.String processArguments(java.lang.String[]) 0'>
@@ -35,46 +53,61 @@
     <item name='junit.runner.ClassPathTestCollector boolean isTestClass(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.BaseTestRunner java.lang.String elapsedTimeAsString(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='junit.runner.BaseTestRunner void startTest(junit.framework.Test) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.StandardTestSuiteLoader java.lang.Class load(java.lang.String)'>
+    <item name='junit.runner.BaseTestRunner java.lang.Class&lt;?&gt; loadSuiteClass(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.BaseTestRunner junit.framework.Test getTest(java.lang.String) 0'>
+    <item name='junit.runner.ClassPathTestCollector java.lang.String classNameFromFile(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.runner.Version java.lang.String id()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.runner.SimpleTestCollector boolean isTestClass(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='junit.runner.BaseTestRunner junit.framework.Test getTest(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.runner.ReloadingTestSuiteLoader junit.runner.TestCaseClassLoader createLoader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.runner.BaseTestRunner void addError(junit.framework.Test, java.lang.Throwable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.runner.BaseTestRunner java.lang.String extractClassName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='junit.runner.BaseTestRunner java.lang.String getFilteredTrace(java.lang.Throwable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='junit.runner.ClassPathTestCollector java.util.Hashtable collectFilesInPath(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='junit.runner.BaseTestRunner java.lang.String getPreference(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.runner.BaseTestRunner java.lang.String extractClassName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.Version java.lang.String id()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='junit.runner.StandardTestSuiteLoader java.lang.Class load(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.ReloadingTestSuiteLoader junit.runner.TestCaseClassLoader createLoader()'>
+    <item name='junit.runner.ReloadingTestSuiteLoader java.lang.Class load(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.runner.TestCollector java.util.Enumeration collectTests()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.runner.Sorter void sortStrings(java.util.Vector, int, int, junit.runner.Sorter.Swapper) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.ClassPathTestCollector java.util.Enumeration collectTests()'>
+    <item name='junit.runner.TestSuiteLoader java.lang.Class reload(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.runner.ClassPathTestCollector java.util.Hashtable collectFilesInPath(java.lang.String)'>
+    <item name='junit.runner.BaseTestRunner junit.runner.TestSuiteLoader getLoader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.runner.ReloadingTestSuiteLoader java.lang.Class reload(java.lang.Class) 0'>
diff --git a/android-sdk-annotations/junit/textui/annotations.xml b/android-sdk-annotations/junit/textui/annotations.xml
index 792d85c1da1..28d590e652c 100644
--- a/android-sdk-annotations/junit/textui/annotations.xml
+++ b/android-sdk-annotations/junit/textui/annotations.xml
@@ -2,16 +2,25 @@
     <item name='junit.textui.TestRunner junit.framework.TestResult doRun(junit.framework.Test, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='junit.textui.ResultPrinter void addFailure(junit.framework.Test, junit.framework.AssertionFailedError) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.textui.ResultPrinter void startTest(junit.framework.Test) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.textui.ResultPrinter void addFailure(junit.framework.Test, junit.framework.AssertionFailedError) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='junit.textui.TestRunner junit.framework.TestResult doRun(junit.framework.Test, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.textui.TestRunner junit.framework.TestResult run(junit.framework.Test)'>
+    <item name='junit.textui.ResultPrinter void addError(junit.framework.Test, java.lang.Throwable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.textui.TestRunner void runAndWait(junit.framework.Test) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.textui.TestRunner junit.framework.TestResult doRun(junit.framework.Test)'>
+    <item name='junit.textui.ResultPrinter void addError(junit.framework.Test, java.lang.Throwable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.textui.ResultPrinter void printDefectTrace(junit.framework.TestFailure) 0'>
@@ -26,10 +35,16 @@
     <item name='junit.textui.ResultPrinter void printDefect(junit.framework.TestFailure, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.textui.TestRunner void run(java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 0'>
+    <item name='junit.textui.TestRunner junit.framework.TestResult run(junit.framework.Test)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.textui.TestRunner junit.framework.TestResult start(java.lang.String[])'>
+    <item name='junit.textui.TestRunner junit.framework.TestResult doRun(junit.framework.Test)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.textui.ResultPrinter void endTest(junit.framework.Test) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='junit.textui.TestRunner void run(java.lang.Class&lt;? extends junit.framework.TestCase&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.textui.ResultPrinter void printErrors(junit.framework.TestResult) 0'>
@@ -38,7 +53,7 @@
     <item name='junit.textui.ResultPrinter void printFooter(junit.framework.TestResult) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='junit.textui.TestRunner junit.framework.TestResult createTestResult()'>
+    <item name='junit.textui.TestRunner junit.framework.TestResult start(java.lang.String[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='junit.textui.TestRunner junit.framework.TestResult start(java.lang.String[]) 0'>
@@ -53,4 +68,7 @@
     <item name='junit.textui.TestRunner junit.framework.TestResult doRun(junit.framework.Test) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='junit.textui.TestRunner junit.framework.TestResult createTestResult()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/libcore/icu/annotations.xml b/android-sdk-annotations/libcore/icu/annotations.xml
index f0552809925..8de6dbb788b 100644
--- a/android-sdk-annotations/libcore/icu/annotations.xml
+++ b/android-sdk-annotations/libcore/icu/annotations.xml
@@ -1,8 +1,8 @@
 <root>
-    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex addLabels(java.util.Locale)'>
+    <item name='libcore.icu.NativeNormalizer boolean isNormalized(java.lang.CharSequence, java.text.Normalizer.Form) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeNormalizer boolean isNormalized(java.lang.CharSequence, java.text.Normalizer.Form) 1'>
+    <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.String[][] create(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.TimeZoneNames java.lang.String getDisplayName(java.lang.String[][], java.lang.String, boolean, int) 0'>
@@ -14,6 +14,9 @@
     <item name='libcore.icu.NativeDecimalFormat void setRoundingMode(java.math.RoundingMode, double) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getCharacterInstance(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.RuleBasedCollatorICU RuleBasedCollatorICU(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,34 +29,49 @@
     <item name='libcore.icu.NativeNormalizer java.lang.String normalize(java.lang.CharSequence, java.text.Normalizer.Form) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.NativeBreakIterator java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex addLabels(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getCharacterInstance(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getWordInstance(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.NativeDecimalFormat java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.text.CharacterIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativePluralRules libcore.icu.NativePluralRules forLocale(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.text.CharacterIterator)'>
+    <item name='libcore.icu.ICU char[] getDateFormatOrder(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getSentenceInstance(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.LocaleData java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.RuleBasedCollatorICU java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.String[][] create(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.ICU java.util.Locale localeFromString(java.lang.String)'>
+    <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex addLabelRange(int, int)'>
+    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getLineInstance(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeDecimalFormat java.lang.Object clone()'>
+    <item name='libcore.icu.NativeDecimalFormat java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativeConverter void setCallbackEncode(long, java.nio.charset.CharsetEncoder) 1'>
@@ -62,22 +80,22 @@
     <item name='libcore.icu.NativeNormalizer java.lang.String normalize(java.lang.CharSequence, java.text.Normalizer.Form) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.Object create(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeDecimalFormat java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.CollationElementIteratorICU libcore.icu.CollationElementIteratorICU getInstance(long, java.lang.String)'>
+    <item name='libcore.icu.NativePluralRules libcore.icu.NativePluralRules forLocale(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativeDecimalFormat NativeDecimalFormat(java.lang.String, libcore.icu.LocaleData) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.DateIntervalFormat java.lang.String formatDateRange(java.util.Locale, java.util.TimeZone, long, long, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.NativeDecimalFormat java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.DateIntervalFormat java.lang.String formatDateRange(java.util.Locale, java.util.TimeZone, long, long, int) 1'>
+    <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.Object create(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.ICU java.util.Locale localeFromString(java.lang.String) 0'>
@@ -95,36 +113,39 @@
     <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getLineInstance(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.TimeZoneNames java.lang.String[] forLocale(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.DateIntervalFormat java.lang.String formatDateRange(java.util.Locale, java.util.TimeZone, long, long, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeDecimalFormat java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getLineInstance(java.util.Locale)'>
+    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex addLabelRange(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.ICU java.util.Locale[] localesFromStrings(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.NativeBreakIterator java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getSentenceInstance(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativeConverter void setCallbackDecode(long, java.nio.charset.CharsetDecoder) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.LocaleData libcore.icu.LocaleData get(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.CollationElementIteratorICU libcore.icu.CollationElementIteratorICU getInstance(long, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.CollationElementIteratorICU void setText(java.text.CharacterIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.TimeZoneNames java.lang.String[] forLocale(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.ICU java.util.Locale localeFromString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex.ImmutableIndex getImmutableIndex()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.AlphabeticIndex AlphabeticIndex(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -134,57 +155,36 @@
     <item name='libcore.icu.NativeDecimalFormat void setDecimalFormatSymbols(java.text.DecimalFormatSymbols) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getCharacterInstance(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeDecimalFormat char[] formatBigDecimal(java.math.BigDecimal, java.text.FieldPosition) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.TimeZoneNames java.lang.String[] forLocale(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.RuleBasedCollatorICU java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex.ImmutableIndex getImmutableIndex()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex setMaxLabelCount(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeNormalizer boolean isNormalized(java.lang.CharSequence, java.text.Normalizer.Form) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.Object create(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex setMaxLabelCount(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.RuleBasedCollatorICU RuleBasedCollatorICU(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.CollationKeyICU int compareTo(java.text.CollationKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.text.CharacterIterator)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.NativeBreakIterator void setText(java.text.CharacterIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.String[][] create(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeDecimalFormat void setDecimalFormatSymbols(libcore.icu.LocaleData) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getSentenceInstance(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.NativePluralRules libcore.icu.NativePluralRules forLocale(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.LocaleData libcore.icu.LocaleData get(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.ICU char[] getDateFormatOrder(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.CollationKeyICU int compareTo(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/libcore/io/annotations.xml b/android-sdk-annotations/libcore/io/annotations.xml
index fb892f1a953..37ecae877f1 100644
--- a/android-sdk-annotations/libcore/io/annotations.xml
+++ b/android-sdk-annotations/libcore/io/annotations.xml
@@ -1,17 +1,17 @@
 <root>
+    <item name='libcore.io.StructPollfd java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.IoBridge void closeSocket(java.io.FileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Posix int pread(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.ErrnoException java.lang.String getMessage()'>
+    <item name='libcore.io.BlockGuardOs int sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructLinger java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.io.StructPollfd java.lang.String toString()'>
+    <item name='libcore.io.Streams java.lang.String readFully(java.io.Reader)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Memory int peekInt(byte[], int, java.nio.ByteOrder) 0'>
@@ -23,16 +23,19 @@
     <item name='libcore.io.Memory void pokeShort(byte[], int, short, java.nio.ByteOrder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.MemoryMappedFile libcore.io.MemoryMappedFile mmapRO(java.lang.String)'>
+    <item name='libcore.io.Os int pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.IoUtils java.io.File createTemporaryDirectory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Posix int recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.DropBox void setReporter(libcore.io.DropBox.Reporter) 0'>
+    <item name='libcore.io.BlockGuardOs int recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructTimeval java.lang.String toString()'>
+    <item name='libcore.io.DropBox void setReporter(libcore.io.DropBox.Reporter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Base64 byte[] decode(byte[]) 0'>
@@ -41,21 +44,42 @@
     <item name='libcore.io.IoBridge int read(java.io.FileDescriptor, byte[], int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams java.lang.String readAsciiLine(java.io.InputStream)'>
+    <item name='libcore.io.MemoryMappedFile libcore.io.BufferIterator bigEndianIterator()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructUcred java.lang.String toString()'>
+    <item name='libcore.io.Streams byte[] readFullyNoClose(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Streams void skipAll(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.IoUtils java.io.File createTemporaryDirectory(java.lang.String)'>
+    <item name='libcore.io.Os int write(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.BlockGuardOs int pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.IoBridge java.io.FileDescriptor open(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Os int recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Posix int pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.ForwardingOs int write(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.StructUcred java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Os int read(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Os int sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.IoUtils byte[] readFileAsByteArray(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -65,28 +89,37 @@
     <item name='libcore.io.Posix int sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.ForwardingOs int pread(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.StructTimeval libcore.io.StructTimeval fromMillis(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Os int pread(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.Streams void writeSingleByte(java.io.OutputStream, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.GaiException java.lang.String getMessage()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.io.MemoryMappedFile libcore.io.BufferIterator littleEndianIterator()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.io.Streams byte[] readFullyNoClose(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Streams int copy(java.io.InputStream, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.StructLinger java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.Streams int readSingleByte(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructGroupReq java.lang.String toString()'>
+    <item name='libcore.io.GaiException java.lang.String getMessage()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StrictLineReader java.lang.String readLine()'>
+    <item name='libcore.io.BlockGuardOs int write(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.ForwardingOs int read(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Memory long peekLong(byte[], int, java.nio.ByteOrder) 0'>
@@ -95,61 +128,91 @@
     <item name='libcore.io.Streams java.lang.String readAsciiLine(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.IoBridge java.io.FileDescriptor open(java.lang.String, int)'>
+    <item name='libcore.io.BlockGuardOs int pread(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.MemoryMappedFile libcore.io.BufferIterator bigEndianIterator()'>
+    <item name='libcore.io.StructTimeval java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.StructGroupReq java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.ForwardingOs int sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.MemoryMappedFile libcore.io.MemoryMappedFile mmapRO(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.StrictLineReader StrictLineReader(java.io.InputStream, java.nio.charset.Charset) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructTimeval libcore.io.StructTimeval fromMillis(long)'>
+    <item name='libcore.io.ForwardingOs int pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Posix int write(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams java.lang.String readFully(java.io.Reader)'>
+    <item name='libcore.io.DropBox.Reporter void addData(java.lang.String, byte[], int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams byte[] readFully(java.io.InputStream)'>
+    <item name='libcore.io.EventLogger.Reporter void report(int, java.lang.Object...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.EventLogger void setReporter(libcore.io.EventLogger.Reporter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.IoUtils java.lang.String readFileAsString(java.lang.String)'>
+    <item name='libcore.io.Memory void pokeInt(byte[], int, int, java.nio.ByteOrder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Memory void pokeInt(byte[], int, int, java.nio.ByteOrder) 0'>
+    <item name='libcore.io.IoUtils java.lang.String readFileAsString(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Memory void pokeLong(byte[], int, long, java.nio.ByteOrder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams byte[] readFully(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.io.IoUtils java.lang.String readFileAsString(java.lang.String) 0'>
+    <item name='libcore.io.ForwardingOs int recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.HeapBufferIterator libcore.io.BufferIterator iterator(byte[], int, int, java.nio.ByteOrder)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.Base64 java.lang.String encode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Streams byte[] readFully(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Streams byte[] readFully(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.BlockGuardOs int read(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.MemoryMappedFile libcore.io.BufferIterator littleEndianIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.IoUtils java.lang.String readFileAsString(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.StrictLineReader StrictLineReader(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.IoUtils void deleteContents(java.io.File) 0'>
+    <item name='libcore.io.ErrnoException java.lang.String getMessage()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.StrictLineReader StrictLineReader(java.io.InputStream, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.IoUtils void deleteContents(java.io.File) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.Streams java.lang.String readFully(java.io.Reader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams byte[] readFullyNoClose(java.io.InputStream)'>
+    <item name='libcore.io.Streams java.lang.String readAsciiLine(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.StrictLineReader java.lang.String readLine()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.IoBridge void write(java.io.FileDescriptor, byte[], int, int) 1'>
@@ -170,7 +233,4 @@
     <item name='libcore.io.StrictLineReader StrictLineReader(java.io.InputStream, java.nio.charset.Charset) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Base64 java.lang.String encode(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/libcore/net/annotations.xml b/android-sdk-annotations/libcore/net/annotations.xml
index 3f2fad598e9..1cadd42da59 100644
--- a/android-sdk-annotations/libcore/net/annotations.xml
+++ b/android-sdk-annotations/libcore/net/annotations.xml
@@ -8,7 +8,7 @@
     <item name='libcore.net.UriCodec java.lang.String encode(java.lang.String, java.nio.charset.Charset) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String)'>
+    <item name='libcore.net.UriCodec java.lang.String validate(java.lang.String, int, int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.UriCodec void appendPartiallyEncoded(java.lang.StringBuilder, java.lang.String) 1'>
@@ -17,19 +17,19 @@
     <item name='libcore.net.UriCodec void appendEncoded(java.lang.StringBuilder, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String) 0'>
+    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String, boolean, java.nio.charset.Charset, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.UriCodec java.lang.String validate(java.lang.String, int, int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String, boolean, java.nio.charset.Charset, boolean) 0'>
+    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.UriCodec java.lang.String encode(java.lang.String, java.nio.charset.Charset)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String, boolean, java.nio.charset.Charset, boolean)'>
+    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String, boolean, java.nio.charset.Charset, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/libcore/net/url/annotations.xml b/android-sdk-annotations/libcore/net/url/annotations.xml
index ebc2acf998e..d27e6d0e382 100644
--- a/android-sdk-annotations/libcore/net/url/annotations.xml
+++ b/android-sdk-annotations/libcore/net/url/annotations.xml
@@ -1,26 +1,59 @@
 <root>
-    <item name='libcore.net.url.JarHandler java.lang.String toExternalForm(java.net.URL) 0'>
+    <item name='libcore.net.url.FileURLConnection java.lang.String getContentType()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 1'>
+    <item name='libcore.net.url.FileHandler void parseURL(java.net.URL, java.lang.String, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.JarURLConnectionImpl JarURLConnectionImpl(java.net.URL) 0'>
+    <item name='libcore.net.url.UrlUtils java.lang.String canonicalizePath(java.lang.String, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.JarHandler void parseURL(java.net.URL, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.JarHandler java.lang.String toExternalForm(java.net.URL)'>
+    <item name='libcore.net.url.JarURLConnectionImpl JarURLConnectionImpl(java.net.URL) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.FileHandler java.net.URLConnection openConnection(java.net.URL) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.net.url.FtpURLConnection FtpURLConnection(java.net.URL) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarHandler java.net.URLConnection openConnection(java.net.URL)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarHandler java.net.URLConnection openConnection(java.net.URL) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FileHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarURLConnectionImpl java.security.Permission getPermission()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FtpURLConnection java.security.Permission getPermission()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FileURLConnection FileURLConnection(java.net.URL) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarHandler java.lang.String toExternalForm(java.net.URL) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarHandler void parseURL(java.net.URL, java.lang.String, int, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.net.url.FtpURLConnection FtpURLConnection(java.net.URL, java.net.Proxy) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.FtpURLConnection FtpURLConnection(java.net.URL) 0'>
+    <item name='libcore.net.url.JarURLConnectionImpl java.lang.String getContentType()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.UrlUtils java.lang.String getSchemePrefix(java.lang.String) 0'>
@@ -29,22 +62,7 @@
     <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.FtpURLConnection java.security.Permission getPermission()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.JarHandler java.net.URLConnection openConnection(java.net.URL) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.UrlUtils java.lang.String canonicalizePath(java.lang.String, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.JarHandler java.net.URLConnection openConnection(java.net.URL)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.FtpURLConnection java.lang.String getContentType()'>
+    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.UrlUtils java.lang.String canonicalizePath(java.lang.String, boolean) 0'>
@@ -53,22 +71,16 @@
     <item name='libcore.net.url.FileHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.JarURLConnectionImpl java.lang.String getContentType()'>
+    <item name='libcore.net.url.JarHandler java.lang.String toExternalForm(java.net.URL)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.FileURLConnection FileURLConnection(java.net.URL) 0'>
+    <item name='libcore.net.url.FtpURLConnection java.lang.String getContentType()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.JarURLConnectionImpl java.security.Permission getPermission()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.FileURLConnection java.lang.String getContentType()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy)'>
+    <item name='libcore.net.url.FileHandler void parseURL(java.net.URL, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/libcore/reflect/annotations.xml b/android-sdk-annotations/libcore/reflect/annotations.xml
index f3ec928f273..d4cee114916 100644
--- a/android-sdk-annotations/libcore/reflect/annotations.xml
+++ b/android-sdk-annotations/libcore/reflect/annotations.xml
@@ -1,7 +1,4 @@
 <root>
-    <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] typeIndexToInterfaces(java.lang.Class&lt;?&gt;, com.android.dex.Dex, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.reflect.AnnotationAccess A getAnnotation(java.lang.Class&lt;?&gt;, java.lang.Class&lt;A&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,9 +8,6 @@
     <item name='libcore.reflect.AnnotationAccess java.lang.String getInnerClassName(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.ListOfTypes java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.reflect.InternalNames java.lang.String getInternalName(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -29,16 +23,19 @@
     <item name='libcore.reflect.AnnotationMember boolean equalArrayValue(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.InternalNames java.lang.String getInternalName(java.lang.Class&lt;?&gt;)'>
+    <item name='libcore.reflect.AnnotationMember libcore.reflect.AnnotationMember setDefinition(libcore.reflect.AnnotationMember)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] protoIndexToParameters(java.lang.Class&lt;?&gt;, com.android.dex.Dex, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.reflect.AnnotationFactory libcore.reflect.AnnotationMember[] getElementsDescription(java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.reflect.AnnotationAccess boolean isAnnotationPresent(java.lang.Class&lt;?&gt;, java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.WildcardTypeImpl java.lang.String toString()'>
+    <item name='libcore.reflect.AnnotationAccess java.lang.annotation.Annotation[][] getParameterAnnotations(java.lang.reflect.Member)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationFactory A createAnnotation(java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;, libcore.reflect.AnnotationMember[]) 0'>
@@ -53,16 +50,16 @@
     <item name='libcore.reflect.Types void appendArrayGenericType(java.lang.StringBuilder, java.lang.reflect.Type[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.ListOfTypes java.lang.reflect.Type[] getResolvedTypes()'>
+    <item name='libcore.reflect.Types java.lang.String toString(java.lang.Class&lt;?&gt;[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.GenericArrayTypeImpl java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.Types java.lang.String toString(java.lang.Class&lt;?&gt;[]) 0'>
+    <item name='libcore.reflect.AnnotationAccess A getAnnotation(java.lang.Class&lt;?&gt;, java.lang.Class&lt;A&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.AnnotationAccess A getAnnotation(java.lang.Class&lt;?&gt;, java.lang.Class&lt;A&gt;) 1'>
+    <item name='libcore.reflect.AnnotationAccess java.util.List&lt;java.lang.annotation.Annotation&gt; getDeclaredAnnotations(java.lang.reflect.AnnotatedElement)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.Types void appendTypeName(java.lang.StringBuilder, java.lang.Class&lt;?&gt;) 1'>
@@ -80,15 +77,15 @@
     <item name='libcore.reflect.Types java.lang.reflect.Type[] getClonedTypeArray(libcore.reflect.ListOfTypes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.Types java.lang.String getSignature(java.lang.Class&lt;?&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.reflect.AnnotationFactory libcore.reflect.AnnotationMember[] getElementsDescription(java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;)'>
+    <item name='libcore.reflect.ListOfTypes java.lang.reflect.Type[] getResolvedTypes()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.Object getDefaultValue(java.lang.reflect.Method) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.reflect.ParameterizedTypeImpl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.reflect.AnnotationAccess boolean isAnnotationPresent(java.lang.Class&lt;?&gt;, java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -104,7 +101,10 @@
     <item name='libcore.reflect.AnnotationAccess A getDeclaredAnnotation(java.lang.reflect.AnnotatedElement, java.lang.Class&lt;A&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.AnnotationMember libcore.reflect.AnnotationMember setDefinition(libcore.reflect.AnnotationMember)'>
+    <item name='libcore.reflect.ListOfTypes java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.reflect.Types java.lang.String toString(java.lang.Class&lt;?&gt;[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.util.List&lt;java.lang.annotation.Annotation&gt; getDeclaredAnnotations(java.lang.reflect.AnnotatedElement) 0'>
@@ -113,10 +113,7 @@
     <item name='libcore.reflect.AnnotationAccess java.lang.annotation.Annotation[] getAnnotations(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.AnnotationAccess java.util.List&lt;java.lang.annotation.Annotation&gt; getDeclaredAnnotations(java.lang.reflect.AnnotatedElement)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.reflect.AnnotationAccess java.lang.annotation.Annotation[][] getParameterAnnotations(java.lang.reflect.Member)'>
+    <item name='libcore.reflect.AnnotationFactory java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] getExceptions(java.lang.reflect.AnnotatedElement) 0'>
@@ -125,30 +122,33 @@
     <item name='libcore.reflect.AnnotationAccess int getInnerClassFlags(java.lang.Class&lt;?&gt;, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.AnnotationFactory java.lang.String toString()'>
+    <item name='libcore.reflect.InternalNames java.lang.String getInternalName(java.lang.Class&lt;?&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.reflect.Types java.lang.String getSignature(java.lang.Class&lt;?&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.reflect.AccessibleObject getEnclosingMethodOrConstructor(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.Types java.lang.String toString(java.lang.Class&lt;?&gt;[])'>
+    <item name='libcore.reflect.InternalNames java.lang.Class&lt;?&gt; getClass(java.lang.ClassLoader, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationMember java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.InternalNames java.lang.Class&lt;?&gt; getClass(java.lang.ClassLoader, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.String getSignature(java.lang.reflect.AnnotatedElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.ParameterizedTypeImpl java.lang.String toString()'>
+    <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] typeIndexToInterfaces(java.lang.Class&lt;?&gt;, com.android.dex.Dex, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] protoIndexToParameters(java.lang.Class&lt;?&gt;, com.android.dex.Dex, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.reflect.WildcardTypeImpl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.reflect.Types void appendTypeName(java.lang.StringBuilder, java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/libcore/util/annotations.xml b/android-sdk-annotations/libcore/util/annotations.xml
index 5d20c7ed143..ad22ccaa4d9 100644
--- a/android-sdk-annotations/libcore/util/annotations.xml
+++ b/android-sdk-annotations/libcore/util/annotations.xml
@@ -1,5 +1,5 @@
 <root>
-    <item name='libcore.util.ZoneInfo java.lang.String toString()'>
+    <item name='libcore.util.CollectionUtils java.lang.Iterable&lt;T&gt; dereferenceIterable(java.lang.Iterable&lt;? extends java.lang.ref.Reference&lt;T&gt;&gt;, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.util.BasicLruCache V put(K, V) 1'>
@@ -8,16 +8,31 @@
     <item name='libcore.util.BasicLruCache java.util.Map&lt;K,V&gt; snapshot()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.util.BasicLruCache V get(K) 0'>
+    <item name='libcore.util.Objects java.lang.String toString(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.BasicLruCache V create(K) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.BasicLruCache V put(K, V) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.ZoneInfoDB.TzData TzData(java.lang.String...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.ZoneInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.util.ZoneInfoDB libcore.util.ZoneInfoDB.TzData getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.util.ZoneInfo java.util.TimeZone makeTimeZone(java.lang.String, libcore.io.BufferIterator) 1'>
+    <item name='libcore.util.BasicLruCache void entryEvicted(K, V) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.util.Objects java.lang.String toString(java.lang.Object) 0'>
+    <item name='libcore.util.BasicLruCache V get(K) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.ZoneInfo java.util.TimeZone makeTimeZone(java.lang.String, libcore.io.BufferIterator) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.util.Objects java.lang.String toString(java.lang.Object)'>
@@ -26,15 +41,6 @@
     <item name='libcore.util.ZoneInfo boolean inDaylightTime(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.util.BasicLruCache V put(K, V) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.util.CollectionUtils java.lang.Iterable&lt;T&gt; dereferenceIterable(java.lang.Iterable&lt;? extends java.lang.ref.Reference&lt;T&gt;&gt;, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.util.ZoneInfoDB.TzData TzData(java.lang.String...) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.util.CollectionUtils void removeDuplicates(java.util.List&lt;T&gt;, java.util.Comparator&lt;? super T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/commons/codec/annotations.xml b/android-sdk-annotations/org/apache/commons/codec/annotations.xml
new file mode 100644
index 00000000000..b436b287ecb
--- /dev/null
+++ b/android-sdk-annotations/org/apache/commons/codec/annotations.xml
@@ -0,0 +1,20 @@
+<root>
+    <item name='org.apache.commons.codec.BinaryEncoder byte[] encode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.StringEncoderComparator int compare(java.lang.Object, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.BinaryDecoder byte[] decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.Encoder java.lang.Object encode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.StringEncoderComparator int compare(java.lang.Object, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.Decoder java.lang.Object decode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/android-sdk-annotations/org/apache/commons/codec/binary/annotations.xml b/android-sdk-annotations/org/apache/commons/codec/binary/annotations.xml
index f29dcdfa0e0..725084c2699 100644
--- a/android-sdk-annotations/org/apache/commons/codec/binary/annotations.xml
+++ b/android-sdk-annotations/org/apache/commons/codec/binary/annotations.xml
@@ -1,77 +1,17 @@
 <root>
-    <item name='org.apache.commons.codec.binary.BinaryCodec char[] toAsciiChars(byte[])'>
+    <item name='org.apache.commons.codec.binary.Hex java.lang.Object decode(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.binary.Hex char[] encodeHex(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Base64 byte[] decodeBase64(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] fromAscii(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64Chunked(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Hex java.lang.Object encode(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] decode(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Hex byte[] decode(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64Chunked(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.BinaryCodec java.lang.Object encode(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Hex byte[] decode(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Hex byte[] decodeHex(char[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] toAsciiBytes(byte[])'>
+    <item name='org.apache.commons.codec.binary.BinaryCodec java.lang.String toAsciiString(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.codec.binary.BinaryCodec byte[] fromAscii(char[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.binary.Hex byte[] decodeHex(char[]) 0'>
+    <item name='org.apache.commons.codec.binary.BinaryCodec java.lang.Object decode(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64(byte[], boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Base64 java.lang.Object encode(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Hex java.lang.Object decode(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Base64 byte[] encode(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Hex byte[] encode(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Base64 java.lang.Object encode(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Hex char[] encodeHex(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Base64 byte[] encode(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.Hex byte[] encode(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.binary.BinaryCodec java.lang.Object decode(java.lang.Object)'>
+    <item name='org.apache.commons.codec.binary.Hex char[] encodeHex(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.codec.binary.Base64 byte[] decode(byte[])'>
@@ -80,22 +20,94 @@
     <item name='org.apache.commons.codec.binary.Base64 java.lang.Object decode(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] toByteArray(java.lang.String)'>
+    <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64Chunked(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Hex java.lang.Object encode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Base64 byte[] encode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Base64 byte[] decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] encode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] toAsciiBytes(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Base64 byte[] decodeBase64(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Hex byte[] decode(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.binary.Base64 java.lang.Object decode(java.lang.Object) 0'>
+    <item name='org.apache.commons.codec.binary.Hex java.lang.Object encode(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.BinaryCodec java.lang.Object decode(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64Chunked(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] toByteArray(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Hex byte[] decodeHex(char[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64(byte[], boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Hex char[] encodeHex(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Base64 byte[] encode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Base64 java.lang.Object encode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] decode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Hex byte[] encode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Hex byte[] encode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.BinaryCodec byte[] fromAscii(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.codec.binary.BinaryCodec byte[] encode(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.codec.binary.Base64 java.lang.Object encode(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64(byte[], boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Hex byte[] decode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.binary.Base64 java.lang.Object decode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.binary.Hex java.lang.Object encode(java.lang.Object)'>
+    <item name='org.apache.commons.codec.binary.BinaryCodec char[] toAsciiChars(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.codec.binary.Hex java.lang.Object decode(java.lang.Object) 0'>
@@ -104,10 +116,10 @@
     <item name='org.apache.commons.codec.binary.BinaryCodec java.lang.Object encode(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.binary.BinaryCodec java.lang.String toAsciiString(byte[])'>
+    <item name='org.apache.commons.codec.binary.Hex byte[] decodeHex(char[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.binary.Base64 byte[] encodeBase64(byte[], boolean)'>
+    <item name='org.apache.commons.codec.binary.BinaryCodec java.lang.Object encode(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/commons/codec/language/annotations.xml b/android-sdk-annotations/org/apache/commons/codec/language/annotations.xml
index 2a7238f50fa..7ae75db7ba7 100644
--- a/android-sdk-annotations/org/apache/commons/codec/language/annotations.xml
+++ b/android-sdk-annotations/org/apache/commons/codec/language/annotations.xml
@@ -1,19 +1,25 @@
 <root>
+    <item name='org.apache.commons.codec.language.DoubleMetaphone.DoubleMetaphoneResult java.lang.String getPrimary()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.codec.language.DoubleMetaphone.DoubleMetaphoneResult void appendAlternate(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.codec.language.RefinedSoundex java.lang.Object encode(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.language.DoubleMetaphone.DoubleMetaphoneResult java.lang.String getPrimary()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.language.Metaphone java.lang.Object encode(java.lang.Object)'>
+    <item name='org.apache.commons.codec.language.DoubleMetaphone.DoubleMetaphoneResult java.lang.String getAlternate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.codec.language.DoubleMetaphone.DoubleMetaphoneResult void append(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.codec.language.Metaphone java.lang.String metaphone(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.language.Metaphone java.lang.Object encode(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.codec.language.DoubleMetaphone.DoubleMetaphoneResult void appendPrimary(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -29,12 +35,6 @@
     <item name='org.apache.commons.codec.language.Metaphone java.lang.String encode(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.codec.language.DoubleMetaphone.DoubleMetaphoneResult java.lang.String getAlternate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.codec.language.Metaphone java.lang.String metaphone(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.codec.language.Metaphone java.lang.Object encode(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/commons/codec/net/annotations.xml b/android-sdk-annotations/org/apache/commons/codec/net/annotations.xml
index 202f6b66532..1373284d950 100644
--- a/android-sdk-annotations/org/apache/commons/codec/net/annotations.xml
+++ b/android-sdk-annotations/org/apache/commons/codec/net/annotations.xml
@@ -1,8 +1,44 @@
 <root>
-    <item name='org.apache.commons.codec.net.BCodec java.lang.String getEncoding()'>
+    <item name='org.apache.commons.codec.net.QuotedPrintableCodec byte[] decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.BCodec java.lang.Object encode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.QuotedPrintableCodec java.lang.Object decode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.URLCodec java.lang.Object encode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.URLCodec byte[] decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.QCodec java.lang.Object encode(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.codec.net.QCodec java.lang.String getEncoding()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.codec.net.BCodec java.lang.Object decode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.QuotedPrintableCodec java.lang.Object encode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.URLCodec java.lang.Object decode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.QuotedPrintableCodec byte[] encode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.URLCodec byte[] encode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.BCodec java.lang.String getEncoding()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.codec.net.QCodec java.lang.Object decode(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/commons/io/annotations.xml b/android-sdk-annotations/org/apache/commons/io/annotations.xml
index 0930167ce92..9cf1be119c8 100644
--- a/android-sdk-annotations/org/apache/commons/io/annotations.xml
+++ b/android-sdk-annotations/org/apache/commons/io/annotations.xml
@@ -1,8 +1,11 @@
 <root>
-    <item name='org.apache.commons.io.FileUtils void moveDirectory(java.io.File, java.io.File) 1'>
+    <item name='org.apache.commons.io.FileUtils java.util.Collection&lt;java.io.File&gt; listFiles(java.io.File, org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.io.InputStream)'>
+    <item name='org.apache.commons.io.IOUtils java.io.InputStream toInputStream(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.FileUtils void moveDirectory(java.io.File, java.io.File) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.FileUtils org.apache.commons.io.LineIterator lineIterator(java.io.File) 0'>
@@ -14,27 +17,18 @@
     <item name='org.apache.commons.io.FileUtils void copyDirectory(java.io.File, java.io.File, java.io.FileFilter, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils java.io.File[] toFiles(java.net.URL[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.FileUtils void writeStringToFile(java.io.File, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.CopyUtils void copy(java.io.InputStream, java.io.Writer, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.InputStream, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.CopyUtils void copy(java.lang.String, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.EndianUtils int readSwappedUnsignedShort(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils java.util.zip.Checksum checksum(java.io.File, java.util.zip.Checksum)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.FileUtils void forceDelete(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -47,18 +41,21 @@
     <item name='org.apache.commons.io.FileUtils void copyDirectory(java.io.File, java.io.File, java.io.FileFilter, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils char[] toCharArray(java.io.InputStream, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils java.util.Collection&lt;java.io.File&gt; listFiles(java.io.File, org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOCase org.apache.commons.io.IOCase forName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.IOUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.InputStream, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.IOUtils void copy(java.io.Reader, java.io.OutputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils java.lang.String toString(java.io.Reader)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.IOUtils org.apache.commons.io.LineIterator lineIterator(java.io.InputStream, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.FileUtils void forceDeleteOnExit(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,6 +77,9 @@
     <item name='org.apache.commons.io.EndianUtils int readSwappedUnsignedShort(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils java.lang.String toString(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.CopyUtils void copy(java.io.InputStream, java.io.Writer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -89,6 +89,12 @@
     <item name='org.apache.commons.io.IOUtils java.io.InputStream toInputStream(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileDeleteStrategy java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.IOUtils java.lang.String toString(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.EndianUtils int readSwappedInteger(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -101,13 +107,19 @@
     <item name='org.apache.commons.io.IOUtils char[] toCharArray(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils org.apache.commons.io.LineIterator lineIterator(java.io.InputStream, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils void moveDirectory(java.io.File, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.io.Reader, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils void writeLines(java.io.File, java.lang.String, java.util.Collection&lt;java.lang.Object&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils char[] toCharArray(java.io.InputStream, java.lang.String)'>
+    <item name='org.apache.commons.io.FileUtils java.lang.String readFileToString(java.io.File)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.FileUtils boolean isFileOlder(java.io.File, java.util.Date) 1'>
@@ -116,18 +128,15 @@
     <item name='org.apache.commons.io.EndianUtils void writeSwappedDouble(java.io.OutputStream, double) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.Reader)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.IOUtils java.lang.String toString(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.HexDump void dump(byte[], long, java.io.OutputStream, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.IOUtils java.lang.String toString(java.io.InputStream, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils java.io.FileInputStream openInputStream(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -140,6 +149,9 @@
     <item name='org.apache.commons.io.EndianUtils long readSwappedUnsignedInteger(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils void copyFileToDirectory(java.io.File, java.io.File) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -155,12 +167,21 @@
     <item name='org.apache.commons.io.EndianUtils float readSwappedFloat(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileUtils java.io.FileInputStream openInputStream(java.io.File)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils void moveFile(java.io.File, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.FileUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.File, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.Reader)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.FileUtils java.net.URL[] toURLs(java.io.File[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils boolean isFileNewer(java.io.File, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -170,6 +191,12 @@
     <item name='org.apache.commons.io.EndianUtils long readSwappedUnsignedInteger(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileUtils java.io.File[] toFiles(java.net.URL[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.IOUtils char[] toCharArray(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils boolean isFileOlder(java.io.File, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -185,15 +212,9 @@
     <item name='org.apache.commons.io.CopyUtils int copy(java.io.InputStream, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.File)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.FileUtils void copyDirectory(java.io.File, java.io.File, java.io.FileFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOCase org.apache.commons.io.IOCase forName(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.IOCase boolean checkEquals(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -209,12 +230,15 @@
     <item name='org.apache.commons.io.FileUtils boolean contentEquals(java.io.File, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.EndianUtils void writeSwappedLong(byte[], int, long) 0'>
+    <item name='org.apache.commons.io.FileUtils java.lang.String readFileToString(java.io.File, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.IOUtils java.lang.String toString(byte[], java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.EndianUtils void writeSwappedLong(byte[], int, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils void cleanDirectory(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -242,18 +266,9 @@
     <item name='org.apache.commons.io.FileUtils boolean contentEquals(java.io.File, java.io.File) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileDeleteStrategy java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.FileUtils org.apache.commons.io.LineIterator lineIterator(java.io.File, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.IOCase boolean checkEquals(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.io.Reader)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.FileUtils byte[] readFileToByteArray(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -272,15 +287,15 @@
     <item name='org.apache.commons.io.FileUtils java.io.File[] convertFileCollectionToFileArray(java.util.Collection&lt;java.io.File&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileCleaner org.apache.commons.io.FileCleaningTracker getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils void copyFile(java.io.File, java.io.File, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.FileUtils void copyFile(java.io.File, java.io.File, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.EndianUtils void writeSwappedInteger(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -293,24 +308,27 @@
     <item name='org.apache.commons.io.EndianUtils void writeSwappedShort(java.io.OutputStream, short) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils char[] toCharArray(java.io.Reader)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.EndianUtils double readSwappedDouble(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.io.Reader)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.CopyUtils void copy(java.lang.String, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileUtils java.lang.String byteCountToDisplaySize(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.CopyUtils void copy(java.lang.String, java.io.Writer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils java.lang.String toString(java.io.InputStream, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.FileUtils boolean isFileNewer(java.io.File, java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils byte[] readFileToByteArray(java.io.File)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.FileUtils void moveToDirectory(java.io.File, java.io.File, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -320,9 +338,6 @@
     <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.io.Reader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils char[] toCharArray(java.io.Reader)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -386,9 +401,6 @@
     <item name='org.apache.commons.io.CopyUtils void copy(byte[], java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils java.io.InputStream toInputStream(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.IOUtils org.apache.commons.io.LineIterator lineIterator(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -404,6 +416,9 @@
     <item name='org.apache.commons.io.DirectoryWalker void walk(java.io.File, java.util.Collection) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils java.io.InputStream toInputStream(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileDeleteStrategy boolean doDelete(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -419,7 +434,7 @@
     <item name='org.apache.commons.io.FileUtils void copyDirectoryToDirectory(java.io.File, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils java.io.FileOutputStream openOutputStream(java.io.File)'>
+    <item name='org.apache.commons.io.IOUtils java.lang.String toString(java.io.Reader)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.FileUtils void touch(java.io.File) 0'>
@@ -428,7 +443,7 @@
     <item name='org.apache.commons.io.CopyUtils void copy(byte[], java.io.Writer, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils java.util.Collection&lt;java.io.File&gt; listFiles(java.io.File, java.lang.String[], boolean)'>
+    <item name='org.apache.commons.io.IOUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.FileUtils void moveFileToDirectory(java.io.File, java.io.File, boolean) 0'>
@@ -446,9 +461,15 @@
     <item name='org.apache.commons.io.FileUtils void copyFile(java.io.File, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileUtils java.util.zip.Checksum checksum(java.io.File, java.util.zip.Checksum)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils java.lang.String readFileToString(java.io.File, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.IOUtils org.apache.commons.io.LineIterator lineIterator(java.io.Reader)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils void copyFileToDirectory(java.io.File, java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -458,13 +479,16 @@
     <item name='org.apache.commons.io.IOUtils java.io.InputStream toInputStream(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.File)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils org.apache.commons.io.LineIterator lineIterator(java.io.File, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils byte[] toByteArray(java.io.Reader, java.lang.String)'>
+    <item name='org.apache.commons.io.EndianUtils void writeSwappedLong(java.io.OutputStream, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.EndianUtils void writeSwappedLong(java.io.OutputStream, long) 0'>
+    <item name='org.apache.commons.io.FileUtils java.io.FileOutputStream openOutputStream(java.io.File)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.CopyUtils void copy(java.io.Reader, java.io.OutputStream) 0'>
@@ -479,9 +503,6 @@
     <item name='org.apache.commons.io.FileCleaningTracker void track(java.io.File, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils java.net.URL[] toURLs(java.io.File[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.IOCase int checkCompareTo(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -500,21 +521,12 @@
     <item name='org.apache.commons.io.IOUtils long copyLarge(java.io.Reader, java.io.Writer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils java.lang.String byteCountToDisplaySize(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.IOUtils java.lang.String toString(byte[])'>
+    <item name='org.apache.commons.io.FileUtils org.apache.commons.io.LineIterator lineIterator(java.io.File)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.IOCase boolean checkStartsWith(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils java.util.Collection&lt;java.io.File&gt; listFiles(java.io.File, org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.FileUtils java.io.FileInputStream openInputStream(java.io.File)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.IOUtils java.lang.String toString(byte[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -524,7 +536,7 @@
     <item name='org.apache.commons.io.IOUtils void copy(java.io.Reader, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils char[] toCharArray(java.io.InputStream)'>
+    <item name='org.apache.commons.io.FileUtils java.util.Collection&lt;java.io.File&gt; listFiles(java.io.File, java.lang.String[], boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.FileUtils java.net.URL[] toURLs(java.io.File[]) 0'>
@@ -539,15 +551,6 @@
     <item name='org.apache.commons.io.FileUtils void copyURLToFile(java.net.URL, java.io.File) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils org.apache.commons.io.LineIterator lineIterator(java.io.File)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.FileUtils java.lang.String readFileToString(java.io.File, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.IOUtils java.io.InputStream toInputStream(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.EndianUtils void writeSwappedFloat(java.io.OutputStream, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -557,12 +560,6 @@
     <item name='org.apache.commons.io.CopyUtils void copy(java.io.InputStream, java.io.Writer, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileCleaner org.apache.commons.io.FileCleaningTracker getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.FileUtils java.lang.String readFileToString(java.io.File)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.FileUtils void copyFileToDirectory(java.io.File, java.io.File, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -578,6 +575,9 @@
     <item name='org.apache.commons.io.EndianUtils long readSwappedLong(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileUtils byte[] readFileToByteArray(java.io.File)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils void writeLines(java.io.File, java.util.Collection&lt;java.lang.Object&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -590,15 +590,15 @@
     <item name='org.apache.commons.io.IOCase boolean checkStartsWith(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileUtils org.apache.commons.io.LineIterator lineIterator(java.io.File, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils long sizeOfDirectory(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.FileCleaningTracker void track(java.io.File, java.lang.Object, org.apache.commons.io.FileDeleteStrategy) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.IOUtils org.apache.commons.io.LineIterator lineIterator(java.io.Reader)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.EndianUtils void writeSwappedShort(byte[], int, short) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -617,9 +617,6 @@
     <item name='org.apache.commons.io.EndianUtils short readSwappedShort(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.FileUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.File, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.EndianUtils void writeSwappedInteger(java.io.OutputStream, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -632,6 +629,9 @@
     <item name='org.apache.commons.io.FileUtils java.util.Collection&lt;java.io.File&gt; listFiles(java.io.File, java.lang.String[], boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.FileUtils java.util.List&lt;java.lang.String&gt; readLines(java.io.File, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.FileUtils java.util.zip.Checksum checksum(java.io.File, java.util.zip.Checksum) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/commons/io/filefilter/annotations.xml b/android-sdk-annotations/org/apache/commons/io/filefilter/annotations.xml
index d9d3e5c0068..448b31ba835 100644
--- a/android-sdk-annotations/org/apache/commons/io/filefilter/annotations.xml
+++ b/android-sdk-annotations/org/apache/commons/io/filefilter/annotations.xml
@@ -1,8 +1,8 @@
 <root>
-    <item name='org.apache.commons.io.filefilter.NameFileFilter java.lang.String toString()'>
+    <item name='org.apache.commons.io.filefilter.PrefixFileFilter java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.DelegateFileFilter java.lang.String toString()'>
+    <item name='org.apache.commons.io.filefilter.AndFileFilter boolean accept(java.io.File, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.CanReadFileFilter boolean accept(java.io.File) 0'>
@@ -11,18 +11,24 @@
     <item name='org.apache.commons.io.filefilter.RegexFileFilter RegexFileFilter(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.OrFileFilter void setFileFilters(java.util.List&lt;org.apache.commons.io.filefilter.IOFileFilter&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(java.util.Date, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(long, boolean)'>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter directoryFileFilter()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.SuffixFileFilter boolean accept(java.io.File, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.RegexFileFilter RegexFileFilter(java.util.regex.Pattern) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.SizeFileFilter java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.filefilter.PrefixFileFilter PrefixFileFilter(java.lang.String[], org.apache.commons.io.IOCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,55 +47,70 @@
     <item name='org.apache.commons.io.filefilter.PrefixFileFilter PrefixFileFilter(java.lang.String, org.apache.commons.io.IOCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.SuffixFileFilter SuffixFileFilter(java.util.List&lt;java.lang.String&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.AgeFileFilter AgeFileFilter(java.util.Date, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.SuffixFileFilter SuffixFileFilter(java.util.List&lt;java.lang.String&gt;) 0'>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter nameFileFilter(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.AbstractFileFilter boolean accept(java.io.File, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.NameFileFilter NameFileFilter(java.lang.String[], org.apache.commons.io.IOCase) 0'>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter suffixFileFilter(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter falseFileFilter()'>
+    <item name='org.apache.commons.io.filefilter.AgeFileFilter java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.NotFileFilter boolean accept(java.io.File, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.NameFileFilter NameFileFilter(java.lang.String[], org.apache.commons.io.IOCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.OrFileFilter OrFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter asFileFilter(java.io.FileFilter)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.filefilter.WildcardFileFilter WildcardFileFilter(java.util.List&lt;java.lang.String&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter makeFileOnly(org.apache.commons.io.filefilter.IOFileFilter)'>
+    <item name='org.apache.commons.io.filefilter.OrFileFilter java.util.List&lt;org.apache.commons.io.filefilter.IOFileFilter&gt; getFileFilters()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.RegexFileFilter boolean accept(java.io.File, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter trueFileFilter()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter sizeFileFilter(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter andFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter sizeFileFilter(long, boolean)'>
+    <item name='org.apache.commons.io.filefilter.FalseFileFilter boolean accept(java.io.File, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(long, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.WildcardFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.WildcardFileFilter java.lang.String toString()'>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter asFileFilter(java.io.FilenameFilter)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter suffixFileFilter(java.lang.String)'>
+    <item name='org.apache.commons.io.filefilter.OrFileFilter boolean accept(java.io.File, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.AndFileFilter java.lang.String toString()'>
+    <item name='org.apache.commons.io.filefilter.AbstractFileFilter boolean accept(java.io.File, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter sizeFileFilter(long, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.NotFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.OrFileFilter OrFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 1'>
@@ -101,10 +122,19 @@
     <item name='org.apache.commons.io.filefilter.PrefixFileFilter PrefixFileFilter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.FalseFileFilter boolean accept(java.io.File) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter suffixFileFilter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter nameFileFilter(java.lang.String)'>
+    <item name='org.apache.commons.io.filefilter.PrefixFileFilter boolean accept(java.io.File, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.ConditionalFileFilter java.util.List&lt;org.apache.commons.io.filefilter.IOFileFilter&gt; getFileFilters()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.FalseFileFilter boolean accept(java.io.File, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.CanWriteFileFilter boolean accept(java.io.File) 0'>
@@ -113,6 +143,9 @@
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter andFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.TrueFileFilter boolean accept(java.io.File, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.SuffixFileFilter SuffixFileFilter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -122,10 +155,19 @@
     <item name='org.apache.commons.io.filefilter.NameFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.TrueFileFilter boolean accept(java.io.File) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter makeDirectoryOnly(org.apache.commons.io.filefilter.IOFileFilter)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.SuffixFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter directoryFileFilter()'>
+    <item name='org.apache.commons.io.filefilter.AndFileFilter boolean accept(java.io.File, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter fileFileFilter()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.WildcardFileFilter WildcardFileFilter(java.lang.String, org.apache.commons.io.IOCase) 0'>
@@ -140,28 +182,49 @@
     <item name='org.apache.commons.io.filefilter.FileFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.PrefixFileFilter boolean accept(java.io.File, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.NotFileFilter NotFileFilter(org.apache.commons.io.filefilter.IOFileFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.SuffixFileFilter boolean accept(java.io.File, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.NameFileFilter NameFileFilter(java.util.List&lt;java.lang.String&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.NotFileFilter java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.PrefixFileFilter PrefixFileFilter(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.PrefixFileFilter java.lang.String toString()'>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter andFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.AgeFileFilter AgeFileFilter(java.io.File, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.IOFileFilter boolean accept(java.io.File, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.TrueFileFilter boolean accept(java.io.File, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.SizeFileFilter java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.AgeFileFilter AgeFileFilter(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.EmptyFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter notFileFilter(org.apache.commons.io.filefilter.IOFileFilter)'>
+    <item name='org.apache.commons.io.filefilter.AndFileFilter boolean accept(java.io.File) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.NotFileFilter boolean accept(java.io.File, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.WildcardFileFilter WildcardFileFilter(java.lang.String[], org.apache.commons.io.IOCase) 0'>
@@ -170,57 +233,84 @@
     <item name='org.apache.commons.io.filefilter.DelegateFileFilter DelegateFileFilter(java.io.FilenameFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter orFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter)'>
+    <item name='org.apache.commons.io.filefilter.OrFileFilter java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter makeDirectoryOnly(org.apache.commons.io.filefilter.IOFileFilter)'>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter falseFileFilter()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.AndFileFilter AndFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.AbstractFileFilter java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.NameFileFilter NameFileFilter(java.util.List&lt;java.lang.String&gt;, org.apache.commons.io.IOCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(java.io.File)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.NameFileFilter boolean accept(java.io.File, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.SuffixFileFilter SuffixFileFilter(java.util.List&lt;java.lang.String&gt;, org.apache.commons.io.IOCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.NameFileFilter boolean accept(java.io.File, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.WildcardFileFilter WildcardFileFilter(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(java.io.File, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.DelegateFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.HiddenFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.IOFileFilter boolean accept(java.io.File, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.DirectoryFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter sizeRangeFileFilter(long, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.SuffixFileFilter SuffixFileFilter(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter orFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter asFileFilter(java.io.FilenameFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter prefixFileFilter(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter andFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(java.util.Date, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.filefilter.AndFileFilter AndFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 0'>
+    <item name='org.apache.commons.io.filefilter.ConditionalFileFilter void setFileFilters(java.util.List&lt;org.apache.commons.io.filefilter.IOFileFilter&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.PrefixFileFilter PrefixFileFilter(java.util.List&lt;java.lang.String&gt;, org.apache.commons.io.IOCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.AndFileFilter AndFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter asFileFilter(java.io.FileFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.SuffixFileFilter java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.AndFileFilter java.util.List&lt;org.apache.commons.io.filefilter.IOFileFilter&gt; getFileFilters()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter orFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -230,28 +320,16 @@
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(java.io.File, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter fileFileFilter()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.filefilter.NotFileFilter java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.filefilter.DelegateFileFilter DelegateFileFilter(java.io.FileFilter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(long)'>
+    <item name='org.apache.commons.io.filefilter.NameFileFilter java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.AbstractFileFilter java.lang.String toString()'>
+    <item name='org.apache.commons.io.filefilter.DelegateFileFilter java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(java.io.File, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.filefilter.AgeFileFilter java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.filefilter.AndFileFilter java.util.List&lt;org.apache.commons.io.filefilter.IOFileFilter&gt; getFileFilters()'>
+    <item name='org.apache.commons.io.filefilter.WildcardFileFilter boolean accept(java.io.File, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.AbstractFileFilter boolean accept(java.io.File) 0'>
@@ -260,46 +338,58 @@
     <item name='org.apache.commons.io.filefilter.WildcardFileFilter WildcardFileFilter(java.util.List&lt;java.lang.String&gt;, org.apache.commons.io.IOCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter sizeRangeFileFilter(long, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.io.filefilter.OrFileFilter java.util.List&lt;org.apache.commons.io.filefilter.IOFileFilter&gt; getFileFilters()'>
+    <item name='org.apache.commons.io.filefilter.OrFileFilter boolean accept(java.io.File, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.SizeFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.OrFileFilter boolean accept(java.io.File) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.RegexFileFilter RegexFileFilter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.DelegateFileFilter boolean accept(java.io.File, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(java.io.File)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.filefilter.SuffixFileFilter SuffixFileFilter(java.lang.String, org.apache.commons.io.IOCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.SuffixFileFilter java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter orFileFilter(org.apache.commons.io.filefilter.IOFileFilter, org.apache.commons.io.filefilter.IOFileFilter) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter asFileFilter(java.io.FilenameFilter)'>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter makeFileOnly(org.apache.commons.io.filefilter.IOFileFilter)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter notFileFilter(org.apache.commons.io.filefilter.IOFileFilter)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter ageFileFilter(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter asFileFilter(java.io.FileFilter)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter prefixFileFilter(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.WildcardFileFilter boolean accept(java.io.File, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.RegexFileFilter RegexFileFilter(java.lang.String, org.apache.commons.io.IOCase) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.AndFileFilter java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.AgeFileFilter boolean accept(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.filefilter.OrFileFilter java.lang.String toString()'>
+    <item name='org.apache.commons.io.filefilter.WildcardFileFilter java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.filefilter.DelegateFileFilter boolean accept(java.io.File, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter nameFileFilter(java.lang.String) 0'>
@@ -314,10 +404,16 @@
     <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter prefixFileFilter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.FileFilterUtils org.apache.commons.io.filefilter.IOFileFilter sizeFileFilter(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.filefilter.NameFileFilter NameFileFilter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.filefilter.WildcardFileFilter WildcardFileFilter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.filefilter.IOFileFilter boolean accept(java.io.File) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/commons/io/input/annotations.xml b/android-sdk-annotations/org/apache/commons/io/input/annotations.xml
index d119c6d9613..3ad48fc745b 100644
--- a/android-sdk-annotations/org/apache/commons/io/input/annotations.xml
+++ b/android-sdk-annotations/org/apache/commons/io/input/annotations.xml
@@ -1,10 +1,16 @@
 <root>
+    <item name='org.apache.commons.io.input.NullInputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.input.ProxyInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.input.ClassLoaderObjectInputStream ClassLoaderObjectInputStream(java.lang.ClassLoader, java.io.InputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.input.SwappedDataInputStream void readFully(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.input.ProxyInputStream ProxyInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -17,21 +23,24 @@
     <item name='org.apache.commons.io.input.CloseShieldInputStream CloseShieldInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.input.TeeInputStream int read(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.input.AutoCloseInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.input.ProxyReader int read(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.input.TeeInputStream int read(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.input.ProxyInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.input.TeeInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.input.CharSequenceReader java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.input.SwappedDataInputStream void readFully(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,6 +50,9 @@
     <item name='org.apache.commons.io.input.AutoCloseInputStream AutoCloseInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.input.NullReader int read(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.input.NullInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -56,22 +68,22 @@
     <item name='org.apache.commons.io.input.ClassLoaderObjectInputStream java.lang.Class resolveClass(java.io.ObjectStreamClass) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.input.CharSequenceReader int read(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.input.CountingInputStream CountingInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.input.ClassLoaderObjectInputStream java.lang.Class resolveClass(java.io.ObjectStreamClass)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.input.CountingInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.input.CharSequenceReader java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.input.ProxyReader ProxyReader(java.io.Reader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.input.TeeInputStream TeeInputStream(java.io.InputStream, java.io.OutputStream, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.input.ClassLoaderObjectInputStream java.lang.Class resolveClass(java.io.ObjectStreamClass)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/commons/io/output/annotations.xml b/android-sdk-annotations/org/apache/commons/io/output/annotations.xml
index 6ee856df526..e5d25b1b93e 100644
--- a/android-sdk-annotations/org/apache/commons/io/output/annotations.xml
+++ b/android-sdk-annotations/org/apache/commons/io/output/annotations.xml
@@ -1,4 +1,7 @@
 <root>
+    <item name='org.apache.commons.io.output.NullOutputStream void write(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.output.ByteArrayOutputStream int write(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -8,6 +11,9 @@
     <item name='org.apache.commons.io.output.FileWriterWithEncoding FileWriterWithEncoding(java.io.File, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.output.NullWriter void write(char[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.output.LockableFileWriter void write(java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,6 +32,12 @@
     <item name='org.apache.commons.io.output.TeeOutputStream TeeOutputStream(java.io.OutputStream, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.output.NullWriter void write(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.output.NullWriter void write(java.lang.String, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.output.FileWriterWithEncoding void write(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -65,9 +77,6 @@
     <item name='org.apache.commons.io.output.ProxyOutputStream ProxyOutputStream(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.output.ByteArrayOutputStream java.lang.String toString(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.output.FileWriterWithEncoding FileWriterWithEncoding(java.io.File, java.nio.charset.Charset) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -77,6 +86,9 @@
     <item name='org.apache.commons.io.output.FileWriterWithEncoding FileWriterWithEncoding(java.io.File, java.lang.String, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.output.ByteArrayOutputStream byte[] toByteArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.output.LockableFileWriter LockableFileWriter(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -95,6 +107,12 @@
     <item name='org.apache.commons.io.output.FileWriterWithEncoding FileWriterWithEncoding(java.io.File, java.nio.charset.Charset, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.output.ByteArrayOutputStream java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.io.output.NullOutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.output.FileWriterWithEncoding FileWriterWithEncoding(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -104,6 +122,9 @@
     <item name='org.apache.commons.io.output.ProxyWriter void write(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.output.ByteArrayOutputStream java.lang.String toString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.output.ProxyWriter void write(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -128,15 +149,15 @@
     <item name='org.apache.commons.io.output.CountingOutputStream CountingOutputStream(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.io.output.NullWriter void write(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.io.output.FileWriterWithEncoding FileWriterWithEncoding(java.lang.String, java.nio.charset.Charset) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.io.output.ProxyWriter void write(char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.output.ByteArrayOutputStream byte[] toByteArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.output.ByteArrayOutputStream java.lang.String toString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -152,9 +173,6 @@
     <item name='org.apache.commons.io.output.DeferredFileOutputStream DeferredFileOutputStream(int, java.lang.String, java.lang.String, java.io.File) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.io.output.ByteArrayOutputStream java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.io.output.LockableFileWriter void write(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/commons/logging/annotations.xml b/android-sdk-annotations/org/apache/commons/logging/annotations.xml
index 4ac2d9f957f..33f560640f1 100644
--- a/android-sdk-annotations/org/apache/commons/logging/annotations.xml
+++ b/android-sdk-annotations/org/apache/commons/logging/annotations.xml
@@ -1,29 +1,56 @@
 <root>
-    <item name='org.apache.commons.logging.LogFactory java.lang.String objectId(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.LogSource org.apache.commons.logging.Log getInstance(java.lang.Class) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.logging.LogFactory java.lang.Object createFactory(java.lang.String, java.lang.ClassLoader)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.logging.LogSource void setLogImplementation(java.lang.Class) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getLog(java.lang.String)'>
+    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getInstance(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.logging.LogSource org.apache.commons.logging.Log getInstance(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getLog(java.lang.Class) 0'>
+    <item name='org.apache.commons.logging.LogFactory void removeAttribute(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getLog(java.lang.Class)'>
+    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getInstance(java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getLog(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.logging.LogFactory java.lang.ClassLoader getClassLoader(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getInstance(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getLog(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getLog(java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogFactory java.lang.String objectId(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogFactory void setAttribute(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogFactory java.lang.Object getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogFactory org.apache.commons.logging.Log getInstance(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogSource org.apache.commons.logging.Log getInstance(java.lang.Class) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogFactory java.lang.String[] getAttributeNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogSource void setLogImplementation(java.lang.Class) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.LogFactory void setAttribute(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/commons/logging/impl/annotations.xml b/android-sdk-annotations/org/apache/commons/logging/impl/annotations.xml
index e35b962473c..bf277f0241b 100644
--- a/android-sdk-annotations/org/apache/commons/logging/impl/annotations.xml
+++ b/android-sdk-annotations/org/apache/commons/logging/impl/annotations.xml
@@ -2,25 +2,22 @@
     <item name='org.apache.commons.logging.impl.LogFactoryImpl java.lang.String[] getAttributeNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.logging.impl.LogFactoryImpl void setAttribute(java.lang.String, java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.impl.LogFactoryImpl org.apache.commons.logging.Log getInstance(java.lang.Class) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.impl.WeakHashtable java.lang.Object get(java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.impl.WeakHashtable java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.commons.logging.impl.WeakHashtable java.util.Set entrySet()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.logging.impl.LogFactoryImpl org.apache.commons.logging.Log getInstance(java.lang.Class)'>
+    <item name='org.apache.commons.logging.impl.LogFactoryImpl void setAttribute(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.logging.impl.WeakHashtable java.util.Enumeration elements()'>
+    <item name='org.apache.commons.logging.impl.LogFactoryImpl void setAttribute(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.impl.WeakHashtable java.util.Enumeration keys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.impl.WeakHashtable java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.impl.LogFactoryImpl org.apache.commons.logging.Log getInstance(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.logging.impl.SimpleLog void write(java.lang.StringBuffer) 0'>
@@ -29,37 +26,31 @@
     <item name='org.apache.commons.logging.impl.LogFactoryImpl void removeAttribute(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.commons.logging.impl.WeakHashtable java.util.Enumeration elements()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.commons.logging.impl.LogFactoryImpl java.lang.ClassLoader getClassLoader(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.logging.impl.WeakHashtable java.util.Set keySet()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.logging.impl.WeakHashtable java.util.Collection values()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.impl.WeakHashtable java.lang.Object put(java.lang.Object, java.lang.Object) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.impl.LogFactoryImpl java.lang.Object getAttribute(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.impl.WeakHashtable java.util.Enumeration keys()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.impl.LogFactoryImpl org.apache.commons.logging.Log getInstance(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.logging.impl.WeakHashtable java.lang.Object remove(java.lang.Object) 0'>
+    <item name='org.apache.commons.logging.impl.WeakHashtable void putAll(java.util.Map) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.commons.logging.impl.LogFactoryImpl org.apache.commons.logging.Log getInstance(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.logging.impl.WeakHashtable boolean containsKey(java.lang.Object) 0'>
+    <item name='org.apache.commons.logging.impl.LogFactoryImpl org.apache.commons.logging.Log getInstance(java.lang.Class)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.commons.logging.impl.WeakHashtable java.lang.Object put(java.lang.Object, java.lang.Object) 0'>
+    <item name='org.apache.commons.logging.impl.LogFactoryImpl java.lang.Object getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.impl.WeakHashtable java.util.Collection values()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.logging.impl.LogFactoryImpl org.apache.commons.logging.Log getInstance(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/harmony/crypto/internal/annotations.xml b/android-sdk-annotations/org/apache/harmony/crypto/internal/annotations.xml
index a44c00236fa..6ce00557e1e 100644
--- a/android-sdk-annotations/org/apache/harmony/crypto/internal/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/crypto/internal/annotations.xml
@@ -2,16 +2,58 @@
     <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineDoFinal(java.nio.ByteBuffer, java.nio.ByteBuffer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineDoFinal(java.nio.ByteBuffer, java.nio.ByteBuffer) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineUpdate(java.nio.ByteBuffer, java.nio.ByteBuffer) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineUpdate(java.nio.ByteBuffer, java.nio.ByteBuffer) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.crypto.internal.NullCipherSpi byte[] engineGetIV()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineDoFinal(java.nio.ByteBuffer, java.nio.ByteBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineUpdate(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi void engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi void engineSetPadding(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineDoFinal(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi byte[] engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi void engineSetMode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineUpdate(java.nio.ByteBuffer, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi java.security.Key engineUnwrap(byte[], java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi java.security.Key engineUnwrap(byte[], java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineGetKeySize(java.security.Key) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineUpdate(java.nio.ByteBuffer, java.nio.ByteBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi byte[] engineWrap(java.security.Key) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi int engineUpdate(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.crypto.internal.NullCipherSpi void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/harmony/dalvik/ddmc/annotations.xml b/android-sdk-annotations/org/apache/harmony/dalvik/ddmc/annotations.xml
index 6294db52934..c914058246a 100644
--- a/android-sdk-annotations/org/apache/harmony/dalvik/ddmc/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/dalvik/ddmc/annotations.xml
@@ -1,8 +1,11 @@
 <root>
+    <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler java.nio.ByteBuffer wrapChunk(org.apache.harmony.dalvik.ddmc.Chunk)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler void putString(java.nio.ByteBuffer, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler org.apache.harmony.dalvik.ddmc.Chunk createFailChunk(int, java.lang.String)'>
+    <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler java.lang.String name(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.dalvik.ddmc.DdmServer void registerHandler(int, org.apache.harmony.dalvik.ddmc.ChunkHandler) 1'>
@@ -11,19 +14,19 @@
     <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler java.nio.ByteBuffer wrapChunk(org.apache.harmony.dalvik.ddmc.Chunk) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.dalvik.ddmc.Chunk Chunk(int, java.nio.ByteBuffer) 1'>
+    <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler java.lang.String getString(java.nio.ByteBuffer, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler java.lang.String name(int)'>
+    <item name='org.apache.harmony.dalvik.ddmc.Chunk Chunk(int, java.nio.ByteBuffer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.dalvik.ddmc.DdmServer void sendChunk(org.apache.harmony.dalvik.ddmc.Chunk) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler java.lang.String getString(java.nio.ByteBuffer, int)'>
+    <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler org.apache.harmony.dalvik.ddmc.Chunk handleChunk(org.apache.harmony.dalvik.ddmc.Chunk) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler java.nio.ByteBuffer wrapChunk(org.apache.harmony.dalvik.ddmc.Chunk)'>
+    <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler org.apache.harmony.dalvik.ddmc.Chunk createFailChunk(int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.dalvik.ddmc.ChunkHandler int type(java.lang.String) 0'>
diff --git a/android-sdk-annotations/org/apache/harmony/security/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/annotations.xml
index 69547314a12..bb981060e83 100644
--- a/android-sdk-annotations/org/apache/harmony/security/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/annotations.xml
@@ -5,27 +5,27 @@
     <item name='org.apache.harmony.security.SystemScope java.security.Identity getIdentity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.PrivateKeyImpl java.lang.String getFormat()'>
+    <item name='org.apache.harmony.security.PrivateKeyImpl byte[] getEncoded()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.PublicKeyImpl byte[] getEncoded()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.PrivateKeyImpl void setEncoding(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.PrivateKeyImpl java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.PublicKeyImpl java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.SystemScope java.util.Enumeration identities()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.PublicKeyImpl byte[] getEncoded()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.PublicKeyImpl void setEncoding(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.PrivateKeyImpl byte[] getEncoded()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.SystemScope void removeIdentity(java.security.Identity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/harmony/security/asn1/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/asn1/annotations.xml
index a6ba6386048..379fbc5dae2 100644
--- a/android-sdk-annotations/org/apache/harmony/security/asn1/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/asn1/annotations.xml
@@ -11,15 +11,15 @@
     <item name='org.apache.harmony.security.asn1.BerInputStream void readSetOf(org.apache.harmony.security.asn1.ASN1SetOf) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Type void encodeASN(org.apache.harmony.security.asn1.BerOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Any void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Implicit java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Integer java.math.BigInteger toBigIntegerValue(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1SequenceOf void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,22 +32,22 @@
     <item name='org.apache.harmony.security.asn1.ASN1Implicit void encodeASN(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.String toString()'>
+    <item name='org.apache.harmony.security.asn1.BerOutputStream void getSequenceLength(org.apache.harmony.security.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.BerInputStream void readSequenceOf(org.apache.harmony.security.asn1.ASN1SequenceOf) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Integer void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1BitString java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1OctetString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
+    <item name='org.apache.harmony.security.asn1.ASN1Any org.apache.harmony.security.asn1.ASN1Any getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.BitString boolean[] toBooleanArray()'>
+    <item name='org.apache.harmony.security.asn1.ASN1Integer void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1OctetString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Any void encodeASN(org.apache.harmony.security.asn1.BerOutputStream) 0'>
@@ -56,15 +56,12 @@
     <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1GeneralizedTime org.apache.harmony.security.asn1.ASN1GeneralizedTime getInstance()'>
+    <item name='org.apache.harmony.security.asn1.ASN1BitString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Any int getEncodedLength(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.BerInputStream byte[] getEncoded()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Choice ASN1Choice(org.apache.harmony.security.asn1.ASN1Type[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -74,39 +71,57 @@
     <item name='org.apache.harmony.security.asn1.ASN1Boolean java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Enumerated void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.asn1.ASN1StringType java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Integer org.apache.harmony.security.asn1.ASN1Integer getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Enumerated void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1UTCTime void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Implicit void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Oid org.apache.harmony.security.asn1.ASN1Oid getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1SequenceOf void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Set void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Boolean java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1GeneralizedTime org.apache.harmony.security.asn1.ASN1GeneralizedTime getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ObjectIdentifier void validate(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Explicit java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Enumerated java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1Choice int getIndex(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Integer java.math.BigInteger toBigIntegerValue(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1ValueCollection java.util.Collection&lt;?&gt; getValues(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.BerOutputStream void getSequenceOfLength(org.apache.harmony.security.asn1.ASN1SequenceOf) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.DerOutputStream void getChoiceLength(org.apache.harmony.security.asn1.ASN1Choice) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Any java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1OctetString void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -122,27 +137,30 @@
     <item name='org.apache.harmony.security.asn1.ASN1Enumerated void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Explicit java.lang.String toString()'>
+    <item name='org.apache.harmony.security.asn1.ASN1StringType java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.BerInputStream int getLength(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Oid org.apache.harmony.security.asn1.ASN1Oid getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Oid org.apache.harmony.security.asn1.ASN1Oid getInstanceForString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1UTCTime void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Enumerated java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Oid java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Sequence void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1TypeCollection ASN1TypeCollection(int, org.apache.harmony.security.asn1.ASN1Type[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -158,10 +176,10 @@
     <item name='org.apache.harmony.security.asn1.ASN1Constructed void encodeASN(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1Integer int toIntValue(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Integer int toIntValue(java.lang.Object) 0'>
+    <item name='org.apache.harmony.security.asn1.BerOutputStream void getSetOfLength(org.apache.harmony.security.asn1.ASN1SetOf) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Any void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
@@ -182,24 +200,27 @@
     <item name='org.apache.harmony.security.asn1.DerOutputStream void getSequenceLength(org.apache.harmony.security.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Type void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1SetOf void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.BitString BitString(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ObjectIdentifier java.lang.String toString(int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.Object decode(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Any java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1OctetString org.apache.harmony.security.asn1.ASN1OctetString getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.DerInputStream void readSetOf(org.apache.harmony.security.asn1.ASN1SetOf) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Enumerated org.apache.harmony.security.asn1.ASN1Enumerated getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Sequence ASN1Sequence(org.apache.harmony.security.asn1.ASN1Type[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -209,6 +230,9 @@
     <item name='org.apache.harmony.security.asn1.DerOutputStream DerOutputStream(org.apache.harmony.security.asn1.ASN1Type, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object fromIntValue(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Explicit void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -218,19 +242,34 @@
     <item name='org.apache.harmony.security.asn1.DerOutputStream void getSequenceOfLength(org.apache.harmony.security.asn1.ASN1SequenceOf) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.BerOutputStream void encodeSequence(org.apache.harmony.security.asn1.ASN1Sequence) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.BerInputStream byte[] getEncoded()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1TypeCollection void getValues(java.lang.Object, java.lang.Object[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Oid void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Enumerated org.apache.harmony.security.asn1.ASN1Enumerated getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ObjectIdentifier java.lang.String toString(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1BitString void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1BitString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
+    <item name='org.apache.harmony.security.asn1.ASN1BitString org.apache.harmony.security.asn1.ASN1BitString getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1OctetString org.apache.harmony.security.asn1.ASN1OctetString getInstance()'>
+    <item name='org.apache.harmony.security.asn1.ASN1BitString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1BitString.ASN1NamedBitList void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
@@ -248,7 +287,7 @@
     <item name='org.apache.harmony.security.asn1.DerOutputStream void encodeExplicit(org.apache.harmony.security.asn1.ASN1Explicit) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Boolean org.apache.harmony.security.asn1.ASN1Boolean getInstance()'>
+    <item name='org.apache.harmony.security.asn1.ASN1UTCTime org.apache.harmony.security.asn1.ASN1UTCTime getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.BerInputStream BerInputStream(byte[]) 0'>
@@ -257,12 +296,24 @@
     <item name='org.apache.harmony.security.asn1.ASN1Set void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Oid java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1Oid org.apache.harmony.security.asn1.ASN1Oid getInstanceForString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1TypeCollection void getValues(java.lang.Object, java.lang.Object[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Choice java.lang.Object getObjectToEncode(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Implicit ASN1Implicit(int, org.apache.harmony.security.asn1.ASN1Type) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Explicit java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.BitString boolean[] toBooleanArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Set ASN1Set(org.apache.harmony.security.asn1.ASN1Type[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -272,21 +323,36 @@
     <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Any org.apache.harmony.security.asn1.ASN1Any getInstance()'>
+    <item name='org.apache.harmony.security.asn1.BerOutputStream void encodeExplicit(org.apache.harmony.security.asn1.ASN1Explicit) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1BitString.ASN1NamedBitList java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1SetOf void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Enumerated java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Choice java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.BitString BitString(boolean[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Type void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1GeneralizedTime java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Integer java.math.BigInteger toBigIntegerValue(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1UTCTime java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -296,13 +362,16 @@
     <item name='org.apache.harmony.security.asn1.ASN1Boolean java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1OctetString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1OctetString void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.DerOutputStream void getExplicitLength(org.apache.harmony.security.asn1.ASN1Explicit) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Boolean java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.BerOutputStream void getChoiceLength(org.apache.harmony.security.asn1.ASN1Choice) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.DerOutputStream void getSetOfLength(org.apache.harmony.security.asn1.ASN1SetOf) 0'>
@@ -311,24 +380,24 @@
     <item name='org.apache.harmony.security.asn1.ASN1Sequence void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.BerOutputStream void getExplicitLength(org.apache.harmony.security.asn1.ASN1Explicit) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Boolean org.apache.harmony.security.asn1.ASN1Boolean getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1StringType java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Type int getEncodedLength(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1OctetString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1Implicit void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Oid java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ObjectIdentifier java.lang.String toString(int[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.asn1.ASN1UTCTime org.apache.harmony.security.asn1.ASN1UTCTime getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Choice void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -347,9 +416,6 @@
     <item name='org.apache.harmony.security.asn1.ASN1GeneralizedTime void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1BitString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1BitString.ASN1NamedBitList java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -359,24 +425,15 @@
     <item name='org.apache.harmony.security.asn1.ASN1Choice void encodeASN(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object fromIntValue(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Boolean void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Enumerated java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1BitString org.apache.harmony.security.asn1.ASN1BitString getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1StringType void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1BitString.ASN1NamedBitList java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.BerInputStream void readString(org.apache.harmony.security.asn1.ASN1StringType) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/harmony/security/fortress/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/fortress/annotations.xml
index 2384510e3e7..3a95fd6e48c 100644
--- a/android-sdk-annotations/org/apache/harmony/security/fortress/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/fortress/annotations.xml
@@ -8,6 +8,9 @@
     <item name='org.apache.harmony.security.fortress.Services java.util.List&lt;java.security.Provider&gt; getProvidersList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.fortress.SecurityAccess java.security.Provider.Service getService(java.security.Provider, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.fortress.Engine java.lang.Object getInstance(java.lang.String, java.security.Provider, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,4 +23,7 @@
     <item name='org.apache.harmony.security.fortress.Engine java.lang.Object getInstance(java.lang.String, java.security.Provider, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.fortress.SecurityAccess java.util.List&lt;java.lang.String&gt; getAliases(java.security.Provider.Service) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/harmony/security/pkcs7/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/pkcs7/annotations.xml
index 3ada1450446..76891d1e814 100644
--- a/android-sdk-annotations/org/apache/harmony/security/pkcs7/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/pkcs7/annotations.xml
@@ -1,11 +1,11 @@
 <root>
-    <item name='org.apache.harmony.security.pkcs7.SignerInfo java.math.BigInteger getSerialNumber()'>
+    <item name='org.apache.harmony.security.pkcs7.SignedData java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.pkcs7.SignerInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.pkcs7.SignedData java.lang.String toString()'>
+    <item name='org.apache.harmony.security.pkcs7.SignerInfo java.math.BigInteger getSerialNumber()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.pkcs7.SignerInfo javax.security.auth.x500.X500Principal getIssuer()'>
diff --git a/android-sdk-annotations/org/apache/harmony/security/provider/cert/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/provider/cert/annotations.xml
index 89dbb0cf85e..67dd038a9f5 100644
--- a/android-sdk-annotations/org/apache/harmony/security/provider/cert/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/provider/cert/annotations.xml
@@ -1,22 +1,37 @@
 <root>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl boolean isRevoked(java.security.cert.Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CRLImpl X509CRLImpl(org.apache.harmony.security.x509.CertificateList) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl byte[] getEncoded()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl java.security.cert.X509CRLEntry getRevokedCertificate(java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.security.Principal getIssuerDN()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertImpl X509CertImpl(org.apache.harmony.security.x509.Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.Cache void put(long, byte[], java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.util.Date getNotAfter()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CRL engineGenerateCRL(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl javax.security.auth.x500.X500Principal getSubjectX500Principal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertImpl void checkValidity(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.Certificate&gt; engineGenerateCertificates(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl X509CRLEntryImpl(org.apache.harmony.security.x509.TBSCertList.RevokedCertificate, javax.security.auth.x500.X500Principal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,40 +41,46 @@
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CRL engineGenerateCRL(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.util.Date getNotBefore()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.security.Principal getIssuerDN()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getEncoded()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.CRL&gt; engineGenerateCRLs(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.CRL&gt; engineGenerateCRLs(java.io.InputStream)'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl byte[] getExtensionValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CRL engineGenerateCRL(java.io.InputStream)'>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl javax.security.auth.x500.X500Principal getSubjectX500Principal()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl byte[] getExtensionValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.lang.String toString()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.util.Date getNotBefore()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getSignature()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl java.lang.String toString()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.security.Principal getSubjectDN()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl X509CertPathImpl(java.util.List&lt;? extends java.security.cert.Certificate&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;) 0'>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getTBSCertList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.security.Principal getSubjectDN()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CRLImpl java.security.cert.X509CRLEntry getRevokedCertificate(java.security.cert.X509Certificate) 0'>
@@ -74,37 +95,37 @@
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.Certificate engineGenerateCertificate(java.io.InputStream)'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl java.util.List&lt;java.security.cert.X509Certificate&gt; getCertificates()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;)'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.CRL&gt; engineGenerateCRLs(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertImpl void verify(java.security.PublicKey, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getSignature()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CRLImpl void verify(java.security.PublicKey, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl byte[] getEncoded()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.util.Date getNotAfter()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.Certificate engineGenerateCertificate(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl java.lang.String toString()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.Certificate&gt; engineGenerateCertificates(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getTBSCertList()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl byte[] getEncoded(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl java.util.List&lt;java.security.cert.X509Certificate&gt; getCertificates()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getEncoded()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getExtensionValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/harmony/security/provider/crypto/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/provider/crypto/annotations.xml
index a39eaeba91d..0efd42812b8 100644
--- a/android-sdk-annotations/org/apache/harmony/security/provider/crypto/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/provider/crypto/annotations.xml
@@ -1,8 +1,8 @@
 <root>
-    <item name='org.apache.harmony.security.provider.crypto.DSAPrivateKeyImpl DSAPrivateKeyImpl(java.security.spec.DSAPrivateKeySpec) 0'>
+    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl byte[] engineGenerateSeed(int)'>
+    <item name='org.apache.harmony.security.provider.crypto.DSAPrivateKeyImpl DSAPrivateKeyImpl(java.security.spec.DSAPrivateKeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.Key engineTranslateKey(java.security.Key) 0'>
@@ -11,9 +11,15 @@
     <item name='org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl void engineNextBytes(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl byte[] engineSign()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl void engineUpdate(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl void engineSetSeed(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,21 +32,18 @@
     <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl boolean engineVerify(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
+    <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl byte[] engineDigest()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl void engineUpdate(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl byte[] engineSign()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl boolean engineVerify(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -50,18 +53,18 @@
     <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl int engineDigest(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.Key engineTranslateKey(java.security.Key)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl byte[] engineGenerateSeed(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl java.lang.Object engineGetParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAPublicKeyImpl DSAPublicKeyImpl(java.security.spec.X509EncodedKeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl byte[] engineDigest()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -71,13 +74,10 @@
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl void engineInitVerify(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.Key engineTranslateKey(java.security.Key)'>
+    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/harmony/security/utils/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/utils/annotations.xml
index 6c0a5ac9e6b..fc8576f7f93 100644
--- a/android-sdk-annotations/org/apache/harmony/security/utils/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/utils/annotations.xml
@@ -5,16 +5,10 @@
     <item name='org.apache.harmony.security.utils.AlgNameMapper java.lang.String normalize(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.utils.Array java.lang.String getBytesAsString(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.utils.AlgNameMapper boolean isOID(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.utils.Array java.lang.String toString(byte[], java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.utils.AlgNameMapper java.lang.String normalize(java.lang.String)'>
+    <item name='org.apache.harmony.security.utils.Array java.lang.String getBytesAsString(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.utils.ObjectIdentifier void validateOid(int[]) 0'>
@@ -32,6 +26,9 @@
     <item name='org.apache.harmony.security.utils.ObjectIdentifier ObjectIdentifier(int[], java.lang.String, java.lang.Object) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.utils.AlgNameMapper java.lang.String normalize(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.utils.ObjectIdentifier ObjectIdentifier(int[], java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,6 +38,9 @@
     <item name='org.apache.harmony.security.utils.ObjectIdentifier int[] getOid()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.utils.Array java.lang.String toString(byte[], java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.utils.ObjectIdentifier int hashIntArray(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/harmony/security/x501/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/x501/annotations.xml
index d0fbb211956..8a9a5b0e134 100644
--- a/android-sdk-annotations/org/apache/harmony/security/x501/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/x501/annotations.xml
@@ -8,9 +8,6 @@
     <item name='org.apache.harmony.security.x501.Name Name(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x501.AttributeTypeAndValue org.apache.harmony.security.utils.ObjectIdentifier getObjectIdentifier(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x501.AttributeValue void appendQEString(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,7 +17,16 @@
     <item name='org.apache.harmony.security.x501.AttributeTypeAndValue void appendName(java.lang.String, java.lang.StringBuilder) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValueComparator int compare(java.lang.Object, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValueComparator int compare(java.lang.Object, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x501.Name javax.security.auth.x500.X500Principal getX500Principal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValue org.apache.harmony.security.utils.ObjectIdentifier getObjectIdentifier(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/harmony/security/x509/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/x509/annotations.xml
index 8a0cffc1316..6b6d4ce5dd0 100644
--- a/android-sdk-annotations/org/apache/harmony/security/x509/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/x509/annotations.xml
@@ -2,12 +2,6 @@
     <item name='org.apache.harmony.security.x509.GeneralName byte[] ipStrToBytes(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CertificatePolicies java.util.List&lt;org.apache.harmony.security.x509.PolicyInformation&gt; getPolicyInformations()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.GeneralName java.util.List&lt;java.lang.Object&gt; getAsList()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.ReasonCode ReasonCode(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,31 +20,25 @@
     <item name='org.apache.harmony.security.x509.GeneralName GeneralName(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.X509PublicKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.ExtensionValue void dumpValue(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.GeneralName int[] oidStrToInts(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.InfoAccessSyntax java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.Extension Extension(java.lang.String, boolean, org.apache.harmony.security.x509.ExtensionValue) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.CertificatePolicies org.apache.harmony.security.x509.CertificatePolicies addPolicyInformation(org.apache.harmony.security.x509.PolicyInformation)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.DNParser java.util.List&lt;java.util.List&lt;org.apache.harmony.security.x501.AttributeTypeAndValue&gt;&gt; parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.AlternativeName void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.GeneralName java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CertificateList java.lang.String toString()'>
+    <item name='org.apache.harmony.security.x509.Extension Extension(java.lang.String, boolean, org.apache.harmony.security.x509.ExtensionValue) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.AlternativeName void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.X509PublicKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.ExtendedKeyUsage void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
@@ -59,7 +47,7 @@
     <item name='org.apache.harmony.security.x509.InvalidityDate InvalidityDate(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CRLNumber java.math.BigInteger getNumber()'>
+    <item name='org.apache.harmony.security.x509.CertificatePolicies org.apache.harmony.security.x509.CertificatePolicies addPolicyInformation(org.apache.harmony.security.x509.PolicyInformation)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.PolicyInformation void dumpValue(java.lang.StringBuilder) 0'>
@@ -68,9 +56,6 @@
     <item name='org.apache.harmony.security.x509.ReasonFlags void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.X509PublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.SubjectKeyIdentifier void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -86,6 +71,9 @@
     <item name='org.apache.harmony.security.x509.InvalidityDate void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.CertificatePolicies java.util.List&lt;org.apache.harmony.security.x509.PolicyInformation&gt; getPolicyInformations()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.ReasonCode void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -101,6 +89,9 @@
     <item name='org.apache.harmony.security.x509.TBSCertList.RevokedCertificate void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.InfoAccessSyntax java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.CRLNumber void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -113,19 +104,25 @@
     <item name='org.apache.harmony.security.x509.CertificatePolicies void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.GeneralName int[] oidStrToInts(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.AuthorityKeyIdentifier org.apache.harmony.security.x509.AuthorityKeyIdentifier decode(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.NameConstraints boolean isAcceptable(java.util.List&lt;org.apache.harmony.security.x509.GeneralName&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.SubjectKeyIdentifier org.apache.harmony.security.x509.SubjectKeyIdentifier decode(byte[])'>
+    <item name='org.apache.harmony.security.x509.AuthorityKeyIdentifier org.apache.harmony.security.x509.AuthorityKeyIdentifier decode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CertificateList java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.TBSCertificate void dumpValue(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.IssuingDistributionPoint org.apache.harmony.security.x509.IssuingDistributionPoint decode(byte[])'>
+    <item name='org.apache.harmony.security.x509.GeneralName java.util.List&lt;java.lang.Object&gt; getAsList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.KeyUsage void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
@@ -140,36 +137,33 @@
     <item name='org.apache.harmony.security.x509.GeneralName GeneralName(int, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.Certificate java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.GeneralName GeneralName(int, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.X509PublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.AccessDescription java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.CertificateList byte[] getSignatureValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.CertificateList CertificateList(org.apache.harmony.security.x509.TBSCertList, org.apache.harmony.security.x509.AlgorithmIdentifier, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.AlgorithmIdentifier void dumpValue(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.GeneralNames java.util.Collection&lt;java.util.List&lt;?&gt;&gt; getPairsList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.NameConstraints void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.DistributionPointName void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.CRLNumber java.math.BigInteger getNumber()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.CertificatePolicies org.apache.harmony.security.x509.CertificatePolicies decode(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.AccessDescription java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.GeneralName void checkDNS(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -179,6 +173,9 @@
     <item name='org.apache.harmony.security.x509.DistributionPoint void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.CertificateList byte[] getSignatureValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.TBSCertList void dumpValue(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -188,7 +185,10 @@
     <item name='org.apache.harmony.security.x509.InfoAccessSyntax void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.GeneralNames java.util.Collection&lt;java.util.List&lt;?&gt;&gt; getPairsList()'>
+    <item name='org.apache.harmony.security.x509.Certificate java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.SubjectKeyIdentifier org.apache.harmony.security.x509.SubjectKeyIdentifier decode(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.AlternativeName AlternativeName(boolean, byte[]) 1'>
@@ -200,9 +200,6 @@
     <item name='org.apache.harmony.security.x509.DNParser DNParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.AuthorityKeyIdentifier org.apache.harmony.security.x509.AuthorityKeyIdentifier decode(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.GeneralName java.lang.String ipBytesToStr(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -215,6 +212,9 @@
     <item name='org.apache.harmony.security.x509.GeneralSubtree void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.IssuingDistributionPoint org.apache.harmony.security.x509.IssuingDistributionPoint decode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.BasicConstraints void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/harmony/security/x509/tsp/annotations.xml b/android-sdk-annotations/org/apache/harmony/security/x509/tsp/annotations.xml
index 223a7ab3c20..220703ac95b 100644
--- a/android-sdk-annotations/org/apache/harmony/security/x509/tsp/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/security/x509/tsp/annotations.xml
@@ -1,23 +1,17 @@
 <root>
-    <item name='org.apache.harmony.security.x509.tsp.TSTInfo java.lang.String toString()'>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatusInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.tsp.TimeStampResp java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.tsp.TimeStampReq java.lang.String toString()'>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo getInstance(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.tsp.PKIStatus org.apache.harmony.security.x509.tsp.PKIStatus valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo valueOf(java.lang.String) 0'>
+    <item name='org.apache.harmony.security.x509.tsp.TSTInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.tsp.PKIStatusInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.tsp.PKIStatus org.apache.harmony.security.x509.tsp.PKIStatus valueOf(java.lang.String) 0'>
+    <item name='org.apache.harmony.security.x509.tsp.TimeStampReq java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.tsp.PKIStatus org.apache.harmony.security.x509.tsp.PKIStatus getInstance(int)'>
@@ -26,7 +20,13 @@
     <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo getInstance(int)'>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo valueOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatus org.apache.harmony.security.x509.tsp.PKIStatus valueOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.TimeStampResp java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/harmony/xml/annotations.xml b/android-sdk-annotations/org/apache/harmony/xml/annotations.xml
index 7bcd2cef8cb..fb642014b62 100644
--- a/android-sdk-annotations/org/apache/harmony/xml/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/xml/annotations.xml
@@ -5,6 +5,9 @@
     <item name='org.apache.harmony.xml.ExpatReader void setFeature(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.xml.ExpatReader void setContentHandler(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.xml.ExpatReader void parse(org.xml.sax.InputSource) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/harmony/xml/dom/annotations.xml b/android-sdk-annotations/org/apache/harmony/xml/dom/annotations.xml
index 4f1b4c9f44f..1805901edfe 100644
--- a/android-sdk-annotations/org/apache/harmony/xml/dom/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/xml/dom/annotations.xml
@@ -1,32 +1,23 @@
 <root>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.CommentImpl java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Text createTextNode(java.lang.String)'>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.NodeList getChildNodes()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.CharacterDataImpl void appendDataTo(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.NodeList getChildNodes()'>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node importNode(org.w3c.dom.Node, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node renameNode(org.w3c.dom.Node, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.DOMImplementationImpl org.w3c.dom.Document createDocument(java.lang.String, java.lang.String, org.w3c.dom.DocumentType)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.xml.dom.CharacterDataImpl void setData(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.NodeList getElementsByTagNameNS(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentTypeImpl DocumentTypeImpl(org.apache.harmony.xml.dom.DocumentImpl, java.lang.String, java.lang.String, java.lang.String) 1'>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Text createTextNode(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.TextImpl TextImpl(org.apache.harmony.xml.dom.DocumentImpl, java.lang.String) 1'>
@@ -35,220 +26,283 @@
     <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.Attr removeAttributeNode(org.w3c.dom.Attr) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.ElementImpl void setIdAttributeNode(org.w3c.dom.Attr, boolean) 0'>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node insertChildAt(org.w3c.dom.Node, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DOMConfigurationImpl boolean canSetParameter(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.AttrImpl createAttributeNS(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node appendChild(org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.DocumentFragmentImpl createDocumentFragment()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentFragmentImpl java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Element createElementNS(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.AttrImpl void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.ElementImpl java.lang.String getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node renameNode(org.w3c.dom.Node, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.NodeList getElementsByTagNameNS(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.Attr setAttributeNodeNS(org.w3c.dom.Attr) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl boolean isSupported(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.TextImpl java.lang.String getWholeText()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DOMConfigurationImpl void setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DOMErrorImpl org.w3c.dom.DOMLocator getLocation()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.CommentImpl createComment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl java.lang.Object getUserData(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.CharacterDataImpl java.lang.String getNodeValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.NodeList getElementsByTagNameNS(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.CDATASectionImpl createCDATASection(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DOMConfigurationImpl java.lang.Object getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.CharacterDataImpl java.lang.String substringData(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.CDATASectionImpl CDATASectionImpl(org.apache.harmony.xml.dom.DocumentImpl, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.CDATASectionImpl java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.EntityReference createEntityReference(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DOMConfigurationImpl void setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node importNode(org.w3c.dom.Node, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.ElementImpl createElement(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node appendChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node appendChild(org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.Attr removeAttributeNode(org.w3c.dom.Attr)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.ElementImpl.ElementAttrNamedNodeMapImpl org.w3c.dom.Node setNamedItemNS(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DOMImplementationImpl boolean hasFeature(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Comment createComment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node removeChild(org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.CDATASectionImpl org.apache.harmony.xml.dom.TextImpl replaceWithText()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Attr createAttribute(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.ProcessingInstructionImpl createProcessingInstruction(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node removeChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DOMConfigurationImpl void normalize(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.CDATASectionImpl createCDATASection(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.ElementImpl void removeAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentTypeImpl DocumentTypeImpl(org.apache.harmony.xml.dom.DocumentImpl, java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.NodeList getElementsByTagName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.ElementImpl void setIdAttributeNode(org.w3c.dom.Attr, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.ElementImpl createElementNS(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.TextImpl java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DOMConfigurationImpl org.w3c.dom.DOMStringList getParameterNames()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.TextImpl org.w3c.dom.Text splitText(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node insertChildAt(org.w3c.dom.Node, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node importNode(org.w3c.dom.Node, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.CharacterDataImpl java.lang.String getData()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.xml.dom.DOMImplementationImpl org.w3c.dom.DocumentType createDocumentType(java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.Attr setAttributeNode(org.w3c.dom.Attr) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.DocumentFragmentImpl java.lang.String getNodeName()'>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Element getElementById(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.DocumentFragmentImpl createDocumentFragment()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.EntityReference createEntityReference(java.lang.String)'>
+    <item name='org.apache.harmony.xml.dom.TextImpl java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node insertChildAt(org.w3c.dom.Node, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.CDATASection createCDATASection(java.lang.String)'>
+    <item name='org.apache.harmony.xml.dom.ProcessingInstructionImpl void setData(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.DOMErrorImpl org.w3c.dom.DOMLocator getLocation()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Element createElementNS(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.NodeImpl java.lang.Object setUserData(java.lang.String, java.lang.Object, org.w3c.dom.UserDataHandler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Attr createAttribute(java.lang.String)'>
+    <item name='org.apache.harmony.xml.dom.DOMImplementationImpl org.w3c.dom.Document createDocument(java.lang.String, java.lang.String, org.w3c.dom.DocumentType)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Comment createComment(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.NodeList getChildNodes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.NodeImpl boolean isSupported(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node removeChild(org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.Attr setAttributeNodeNS(org.w3c.dom.Attr) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node removeChild(org.w3c.dom.Node)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.DocumentFragment createDocumentFragment()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DOMImplementationImpl org.w3c.dom.DocumentType createDocumentType(java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.CDATASection createCDATASection(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.CDATASectionImpl createCDATASection(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.CDATASectionImpl java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Text createTextNode(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node appendChild(org.w3c.dom.Node)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.EntityReferenceImpl createEntityReference(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.CommentImpl createComment(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.NodeImpl java.lang.Object getUserData(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.ProcessingInstruction createProcessingInstruction(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Element createElement(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.CDATASectionImpl createCDATASection(java.lang.String) 0'>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node removeChild(org.w3c.dom.Node)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.NamedNodeMap getAttributes()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.CDATASectionImpl CDATASectionImpl(org.apache.harmony.xml.dom.DocumentImpl, java.lang.String) 1'>
+    <item name='org.apache.harmony.xml.dom.CharacterDataImpl java.lang.String getData()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.TextImpl java.lang.String getWholeText()'>
+    <item name='org.apache.harmony.xml.dom.NodeImpl java.lang.Object setUserData(java.lang.String, java.lang.Object, org.w3c.dom.UserDataHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.Attr removeAttributeNode(org.w3c.dom.Attr)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.NodeList getElementsByTagName(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node importNode(org.w3c.dom.Node, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.CDATASectionImpl org.apache.harmony.xml.dom.TextImpl replaceWithText()'>
+    <item name='org.apache.harmony.xml.dom.DOMImplementationImpl org.w3c.dom.DocumentType createDocumentType(java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.TextImpl createTextNode(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node appendChild(org.w3c.dom.Node) 0'>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.NodeList getElementsByTagName(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.AttrImpl createAttribute(java.lang.String)'>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node removeChild(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.NodeImpl java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
+    <item name='org.apache.harmony.xml.dom.DOMConfigurationImpl org.w3c.dom.DOMStringList getParameterNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.CDATASection createCDATASection(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Text createTextNode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.EntityReferenceImpl createEntityReference(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.NodeList getChildNodes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node appendChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.DocumentFragment createDocumentFragment()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.CommentImpl java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.ElementImpl.ElementAttrNamedNodeMapImpl org.w3c.dom.Node setNamedItem(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.dom.CharacterDataImpl java.lang.String substringData(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.ProcessingInstructionImpl createProcessingInstruction(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.CommentImpl createComment(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node cloneNode(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.TextImpl createTextNode(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.ElementImpl.ElementAttrNamedNodeMapImpl org.w3c.dom.Node setNamedItemNS(org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.ElementImpl createElement(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Node renameNode(org.w3c.dom.Node, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DOMImplementationImpl boolean hasFeature(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.CharacterDataImpl java.lang.String getNodeValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.NodeList getElementsByTagName(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Comment createComment(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.InnerNodeImpl org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DOMImplementationImpl java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.ElementImpl org.w3c.dom.NodeList getElementsByTagNameNS(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.xml.dom.DOMConfigurationImpl void normalize(org.w3c.dom.Node) 0'>
+    <item name='org.apache.harmony.xml.dom.NodeImpl java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Attr createAttributeNS(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.ProcessingInstruction createProcessingInstruction(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.TextImpl createTextNode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.AttrImpl createAttribute(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.TextImpl org.w3c.dom.Text splitText(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.apache.harmony.xml.dom.CommentImpl createComment(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.Element createElement(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.NodeImpl org.w3c.dom.Node cloneNode(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DocumentImpl org.w3c.dom.CDATASection createCDATASection(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.dom.DOMImplementationImpl java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/harmony/xml/parsers/annotations.xml b/android-sdk-annotations/org/apache/harmony/xml/parsers/annotations.xml
index 6ea855defa5..321991ded27 100644
--- a/android-sdk-annotations/org/apache/harmony/xml/parsers/annotations.xml
+++ b/android-sdk-annotations/org/apache/harmony/xml/parsers/annotations.xml
@@ -2,6 +2,9 @@
     <item name='org.apache.harmony.xml.parsers.SAXParserFactoryImpl void setFeature(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.xml.parsers.DocumentBuilderFactoryImpl java.lang.Object getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.xml.parsers.SAXParserFactoryImpl boolean getFeature(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,10 +14,16 @@
     <item name='org.apache.harmony.xml.parsers.DocumentBuilderFactoryImpl void setFeature(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.xml.parsers.DocumentBuilderFactoryImpl javax.xml.parsers.DocumentBuilder newDocumentBuilder()'>
+    <item name='org.apache.harmony.xml.parsers.DocumentBuilderFactoryImpl void setAttribute(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.xml.parsers.SAXParserFactoryImpl javax.xml.parsers.SAXParser newSAXParser()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.xml.parsers.DocumentBuilderFactoryImpl void setAttribute(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.xml.parsers.DocumentBuilderFactoryImpl javax.xml.parsers.DocumentBuilder newDocumentBuilder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/annotations.xml b/android-sdk-annotations/org/apache/http/annotations.xml
index d8be36ae9e2..b5bf7e428f8 100644
--- a/android-sdk-annotations/org/apache/http/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/annotations.xml
@@ -1,47 +1,191 @@
 <root>
-    <item name='org.apache.http.ProtocolVersion ProtocolVersion(java.lang.String, int, int) 0'>
+    <item name='org.apache.http.HttpServerConnection void sendResponseEntity(org.apache.http.HttpResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.HttpHost HttpHost(java.lang.String, int, java.lang.String) 0'>
+    <item name='org.apache.http.HttpRequestFactory org.apache.http.HttpRequest newHttpRequest(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.ProtocolVersion java.lang.String toString()'>
+    <item name='org.apache.http.FormattedHeader org.apache.http.util.CharArrayBuffer getBuffer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.HttpHost HttpHost(java.lang.String) 0'>
+    <item name='org.apache.http.HttpResponse void setStatusLine(org.apache.http.ProtocolVersion, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.HttpVersion org.apache.http.ProtocolVersion forVersion(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.HttpHost java.lang.String getSchemeName()'>
+    <item name='org.apache.http.ConnectionReuseStrategy boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.HttpHost java.lang.String getHostName()'>
+    <item name='org.apache.http.HttpMessage void setParams(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.HttpHost java.lang.String toString()'>
+    <item name='org.apache.http.HttpResponseInterceptor void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.HttpHost HttpHost(org.apache.http.HttpHost) 0'>
+    <item name='org.apache.http.HttpResponse void setReasonPhrase(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.HttpHost java.lang.String toHostString()'>
+    <item name='org.apache.http.NameValuePair java.lang.String getName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.HttpHost HttpHost(java.lang.String, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.ProtocolVersion int compareToVersion(org.apache.http.ProtocolVersion) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.HttpHost java.lang.String toURI()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.ProtocolVersion java.lang.String getProtocol()'>
+    <item name='org.apache.http.HttpServerConnection void receiveRequestEntity(org.apache.http.HttpEntityEnclosingRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.ProtocolVersion org.apache.http.ProtocolVersion forVersion(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.HttpResponseFactory org.apache.http.HttpResponse newHttpResponse(org.apache.http.StatusLine, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpHost HttpHost(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpHost HttpHost(org.apache.http.HttpHost) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpClientConnection void sendRequestHeader(org.apache.http.HttpRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpRequestFactory org.apache.http.HttpRequest newHttpRequest(org.apache.http.RequestLine)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpMessage org.apache.http.HeaderIterator headerIterator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpResponse void setStatusLine(org.apache.http.StatusLine) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpRequestFactory org.apache.http.HttpRequest newHttpRequest(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpHost java.lang.String getHostName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpClientConnection void receiveResponseEntity(org.apache.http.HttpResponse) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpClientConnection void sendRequestEntity(org.apache.http.HttpEntityEnclosingRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpHost HttpHost(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HeaderElement org.apache.http.NameValuePair getParameterByName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpResponseInterceptor void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpServerConnection void sendResponseHeader(org.apache.http.HttpResponse) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpHost java.lang.String toURI()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpEntity org.apache.http.Header getContentType()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpMessage org.apache.http.Header[] getHeaders(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpClientConnection org.apache.http.HttpResponse receiveResponseHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.ProtocolVersion java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpRequestInterceptor void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.ProtocolVersion ProtocolVersion(java.lang.String, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.Header java.lang.String getValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.ProtocolVersion java.lang.String getProtocol()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpEntity java.io.InputStream getContent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpMessage void addHeader(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpMessage org.apache.http.ProtocolVersion getProtocolVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpResponseFactory org.apache.http.HttpResponse newHttpResponse(org.apache.http.ProtocolVersion, int, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpMessage void setHeader(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpHost java.lang.String toHostString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpResponse void setStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.RequestLine java.lang.String getMethod()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.Header java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HeaderElement java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpHost HttpHost(java.lang.String, int, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpRequestInterceptor void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.RequestLine java.lang.String getUri()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.ProtocolVersion int compareToVersion(org.apache.http.ProtocolVersion) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpHost java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpHost java.lang.String getSchemeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpEntity void writeTo(java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpMessage org.apache.http.Header[] getHeaders(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpRequestFactory org.apache.http.HttpRequest newHttpRequest(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.ConnectionReuseStrategy boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.StatusLine org.apache.http.ProtocolVersion getProtocolVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpRequestFactory org.apache.http.HttpRequest newHttpRequest(org.apache.http.RequestLine) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpResponse void setLocale(java.util.Locale) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpResponseFactory org.apache.http.HttpResponse newHttpResponse(org.apache.http.StatusLine, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.RequestLine org.apache.http.ProtocolVersion getProtocolVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpMessage org.apache.http.HeaderIterator headerIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.HttpResponseFactory org.apache.http.HttpResponse newHttpResponse(org.apache.http.ProtocolVersion, int, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/auth/annotations.xml b/android-sdk-annotations/org/apache/http/auth/annotations.xml
index 08c588954b6..0909ddc6bea 100644
--- a/android-sdk-annotations/org/apache/http/auth/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/auth/annotations.xml
@@ -2,28 +2,52 @@
     <item name='org.apache.http.auth.AuthSchemeRegistry void unregister(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.NTCredentials NTCredentials(java.lang.String, java.lang.String, java.lang.String, java.lang.String) 0'>
+    <item name='org.apache.http.auth.AuthScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.auth.AuthScope java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.UsernamePasswordCredentials UsernamePasswordCredentials(java.lang.String, java.lang.String) 0'>
+    <item name='org.apache.http.auth.NTCredentials NTCredentials(java.lang.String, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.UsernamePasswordCredentials java.lang.String toString()'>
+    <item name='org.apache.http.auth.AuthScheme java.lang.String getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.UsernamePasswordCredentials java.security.Principal getUserPrincipal()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.UsernamePasswordCredentials UsernamePasswordCredentials(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.auth.AuthSchemeRegistry void register(java.lang.String, org.apache.http.auth.AuthSchemeFactory) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.auth.NTCredentials java.lang.String getUserName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.AuthSchemeFactory org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.NTUserPrincipal java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.AuthScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.Credentials java.security.Principal getUserPrincipal()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.auth.NTCredentials java.security.Principal getUserPrincipal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.AuthScope AuthScope(org.apache.http.auth.AuthScope) 0'>
+    <item name='org.apache.http.auth.AuthSchemeRegistry java.util.List&lt;java.lang.String&gt; getSchemeNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.UsernamePasswordCredentials java.security.Principal getUserPrincipal()'>
+    <item name='org.apache.http.auth.AuthScheme java.lang.String getSchemeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.AuthScope AuthScope(org.apache.http.auth.AuthScope) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.auth.BasicUserPrincipal java.lang.String toString()'>
@@ -32,18 +56,12 @@
     <item name='org.apache.http.auth.BasicUserPrincipal java.lang.String getName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.UsernamePasswordCredentials java.lang.String getUserName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.auth.NTCredentials java.lang.String getUserName()'>
+    <item name='org.apache.http.auth.NTCredentials java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.auth.AuthSchemeRegistry org.apache.http.auth.AuthScheme getAuthScheme(java.lang.String, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.NTUserPrincipal java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.auth.UsernamePasswordCredentials UsernamePasswordCredentials(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -53,13 +71,19 @@
     <item name='org.apache.http.auth.NTUserPrincipal NTUserPrincipal(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.NTUserPrincipal java.lang.String getName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.auth.AuthSchemeRegistry void register(java.lang.String, org.apache.http.auth.AuthSchemeFactory) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.NTCredentials java.lang.String toString()'>
+    <item name='org.apache.http.auth.AuthScheme void processChallenge(org.apache.http.Header) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.UsernamePasswordCredentials java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.UsernamePasswordCredentials java.lang.String getUserName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.NTUserPrincipal java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.auth.NTUserPrincipal java.lang.String getUsername()'>
@@ -68,13 +92,13 @@
     <item name='org.apache.http.auth.AuthScope int match(org.apache.http.auth.AuthScope) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.BasicUserPrincipal BasicUserPrincipal(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.auth.AuthState java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.auth.AuthSchemeRegistry java.util.List&lt;java.lang.String&gt; getSchemeNames()'>
+    <item name='org.apache.http.auth.BasicUserPrincipal BasicUserPrincipal(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.auth.AuthScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/auth/params/annotations.xml b/android-sdk-annotations/org/apache/http/auth/params/annotations.xml
index 6f7a38d3009..1d780119fa0 100644
--- a/android-sdk-annotations/org/apache/http/auth/params/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/auth/params/annotations.xml
@@ -1,7 +1,4 @@
 <root>
-    <item name='org.apache.http.auth.params.AuthParams java.lang.String getCredentialCharset(org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.auth.params.AuthParams java.lang.String getCredentialCharset(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,4 +8,7 @@
     <item name='org.apache.http.auth.params.AuthParamBean AuthParamBean(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.auth.params.AuthParams java.lang.String getCredentialCharset(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/client/annotations.xml b/android-sdk-annotations/org/apache/http/client/annotations.xml
new file mode 100644
index 00000000000..da48b9ba240
--- /dev/null
+++ b/android-sdk-annotations/org/apache/http/client/annotations.xml
@@ -0,0 +1,83 @@
+<root>
+    <item name='org.apache.http.client.HttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.AuthenticationHandler org.apache.http.auth.AuthScheme selectScheme(java.util.Map&lt;java.lang.String,org.apache.http.Header&gt;, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.CredentialsProvider void setCredentials(org.apache.http.auth.AuthScope, org.apache.http.auth.Credentials) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.RedirectHandler java.net.URI getLocationURI(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.UserTokenHandler java.lang.Object getUserToken(org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.ResponseHandler T handleResponse(org.apache.http.HttpResponse) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.RedirectHandler boolean isRedirectRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.AuthenticationHandler org.apache.http.auth.AuthScheme selectScheme(java.util.Map&lt;java.lang.String,org.apache.http.Header&gt;, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.AuthenticationHandler java.util.Map&lt;java.lang.String,org.apache.http.Header&gt; getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.RequestDirector org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.CredentialsProvider org.apache.http.auth.Credentials getCredentials(org.apache.http.auth.AuthScope) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.AuthenticationHandler boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpRequestRetryHandler boolean retryRequest(java.io.IOException, int, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpRequestRetryHandler boolean retryRequest(java.io.IOException, int, org.apache.http.protocol.HttpContext) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.RedirectHandler java.net.URI getLocationURI(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.CookieStore java.util.List&lt;org.apache.http.cookie.Cookie&gt; getCookies()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.HttpClient org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/android-sdk-annotations/org/apache/http/client/methods/annotations.xml b/android-sdk-annotations/org/apache/http/client/methods/annotations.xml
index 07f033a49cb..250c12501cd 100644
--- a/android-sdk-annotations/org/apache/http/client/methods/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/client/methods/annotations.xml
@@ -1,62 +1,68 @@
 <root>
+    <item name='org.apache.http.client.methods.HttpPut java.lang.String getMethod()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.methods.HttpOptions java.util.Set&lt;java.lang.String&gt; getAllowedMethods(org.apache.http.HttpResponse)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.client.methods.HttpDelete HttpDelete(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.methods.HttpRequestBase org.apache.http.ProtocolVersion getProtocolVersion()'>
+    <item name='org.apache.http.client.methods.HttpRequestBase java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.client.methods.HttpOptions java.util.Set&lt;java.lang.String&gt; getAllowedMethods(org.apache.http.HttpResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.methods.HttpPost java.lang.String getMethod()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.client.methods.HttpGet HttpGet(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.client.methods.HttpTrace java.lang.String getMethod()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.client.methods.HttpHead HttpHead(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.client.methods.HttpGet java.lang.String getMethod()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.methods.HttpOptions java.lang.String getMethod()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.client.methods.HttpPost HttpPost(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.client.methods.HttpTrace HttpTrace(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.methods.HttpPut java.lang.String getMethod()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.client.methods.HttpPut HttpPut(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.client.methods.HttpOptions java.lang.String getMethod()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.client.methods.HttpRequestBase org.apache.http.RequestLine getRequestLine()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.client.methods.HttpOptions HttpOptions(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.client.methods.HttpDelete java.lang.String getMethod()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.client.methods.HttpEntityEnclosingRequestBase java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.methods.HttpRequestBase java.lang.Object clone()'>
+    <item name='org.apache.http.client.methods.HttpPut HttpPut(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.client.methods.HttpHead java.lang.String getMethod()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.methods.HttpTrace java.lang.String getMethod()'>
+    <item name='org.apache.http.client.methods.HttpRequestBase org.apache.http.RequestLine getRequestLine()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.methods.HttpGet java.lang.String getMethod()'>
+    <item name='org.apache.http.client.methods.HttpPost java.lang.String getMethod()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.methods.HttpOptions java.util.Set&lt;java.lang.String&gt; getAllowedMethods(org.apache.http.HttpResponse)'>
+    <item name='org.apache.http.client.methods.HttpOptions HttpOptions(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.methods.HttpRequestBase org.apache.http.ProtocolVersion getProtocolVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.methods.HttpUriRequest java.lang.String getMethod()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.methods.HttpRequestBase java.lang.String getMethod()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/client/params/annotations.xml b/android-sdk-annotations/org/apache/http/client/params/annotations.xml
index 5aa4cd80bbd..81858da38bc 100644
--- a/android-sdk-annotations/org/apache/http/client/params/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/client/params/annotations.xml
@@ -14,13 +14,13 @@
     <item name='org.apache.http.client.params.HttpClientParams boolean isAuthenticating(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.params.HttpClientParams java.lang.String getCookiePolicy(org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.client.params.HttpClientParams void setAuthenticating(org.apache.http.params.HttpParams, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.client.params.HttpClientParams void setCookiePolicy(org.apache.http.params.HttpParams, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.client.params.HttpClientParams java.lang.String getCookiePolicy(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/client/protocol/annotations.xml b/android-sdk-annotations/org/apache/http/client/protocol/annotations.xml
index 1b5aa00ea2c..06d604c413b 100644
--- a/android-sdk-annotations/org/apache/http/client/protocol/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/client/protocol/annotations.xml
@@ -2,6 +2,9 @@
     <item name='org.apache.http.client.protocol.RequestProxyAuthentication void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.client.protocol.RequestDefaultHeaders void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.client.protocol.RequestDefaultHeaders void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/http/client/utils/annotations.xml b/android-sdk-annotations/org/apache/http/client/utils/annotations.xml
index 327c4377a5b..8a0ee7309a8 100644
--- a/android-sdk-annotations/org/apache/http/client/utils/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/client/utils/annotations.xml
@@ -5,55 +5,55 @@
     <item name='org.apache.http.client.utils.URLEncodedUtils java.lang.String format(java.util.List&lt;? extends org.apache.http.NameValuePair&gt;, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.utils.URLEncodedUtils java.util.List&lt;org.apache.http.NameValuePair&gt; parse(org.apache.http.HttpEntity)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.client.utils.URIUtils java.net.URI resolve(java.net.URI, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.client.utils.URLEncodedUtils java.util.List&lt;org.apache.http.NameValuePair&gt; parse(java.net.URI, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.client.utils.URIUtils java.net.URI resolve(java.net.URI, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.utils.URLEncodedUtils java.lang.String format(java.util.List&lt;? extends org.apache.http.NameValuePair&gt;, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.client.utils.URIUtils java.net.URI resolve(java.net.URI, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.client.utils.URLEncodedUtils java.util.List&lt;org.apache.http.NameValuePair&gt; parse(java.net.URI, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.client.utils.URIUtils java.net.URI resolve(java.net.URI, java.net.URI) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.client.utils.URLEncodedUtils java.util.List&lt;org.apache.http.NameValuePair&gt; parse(org.apache.http.HttpEntity)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.client.utils.URIUtils java.net.URI rewriteURI(java.net.URI, org.apache.http.HttpHost) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.client.utils.URIUtils java.net.URI rewriteURI(java.net.URI, org.apache.http.HttpHost)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.client.utils.URIUtils java.net.URI resolve(java.net.URI, java.net.URI)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.client.utils.URIUtils java.net.URI rewriteURI(java.net.URI, org.apache.http.HttpHost, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.client.utils.URLEncodedUtils java.util.List&lt;org.apache.http.NameValuePair&gt; parse(org.apache.http.HttpEntity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.client.utils.URIUtils java.net.URI resolve(java.net.URI, java.net.URI) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.utils.URLEncodedUtils java.lang.String format(java.util.List&lt;? extends org.apache.http.NameValuePair&gt;, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.client.utils.URIUtils java.net.URI resolve(java.net.URI, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.client.utils.URIUtils java.net.URI rewriteURI(java.net.URI, org.apache.http.HttpHost, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.utils.URLEncodedUtils java.util.List&lt;org.apache.http.NameValuePair&gt; parse(java.net.URI, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.client.utils.URLEncodedUtils boolean isEncoded(org.apache.http.HttpEntity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.client.utils.URIUtils java.net.URI createURI(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.client.utils.URIUtils java.net.URI resolve(java.net.URI, java.net.URI)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.client.utils.URIUtils java.net.URI rewriteURI(java.net.URI, org.apache.http.HttpHost, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/conn/annotations.xml b/android-sdk-annotations/org/apache/http/conn/annotations.xml
index a98d21ca253..e878c242a6e 100644
--- a/android-sdk-annotations/org/apache/http/conn/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/conn/annotations.xml
@@ -1,35 +1,107 @@
 <root>
-    <item name='org.apache.http.conn.MultihomePlainSocketFactory org.apache.http.conn.MultihomePlainSocketFactory getSocketFactory()'>
+    <item name='org.apache.http.conn.OperatedClientConnection void update(java.net.Socket, org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.BasicManagedEntity java.io.InputStream getContent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.MultihomePlainSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) 5'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.EofSensorInputStream EofSensorInputStream(java.io.InputStream, org.apache.http.conn.EofSensorWatcher) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.MultihomePlainSocketFactory java.net.Socket createSocket()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.BasicEofSensorWatcher BasicEofSensorWatcher(org.apache.http.conn.ManagedClientConnection, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.MultihomePlainSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.BasicManagedEntity BasicManagedEntity(org.apache.http.HttpEntity, org.apache.http.conn.ManagedClientConnection, boolean) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.BasicManagedEntity BasicManagedEntity(org.apache.http.HttpEntity, org.apache.http.conn.ManagedClientConnection, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.MultihomePlainSocketFactory boolean isSecure(java.net.Socket) 0'>
+    <item name='org.apache.http.conn.OperatedClientConnection void update(java.net.Socket, org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.MultihomePlainSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.ConnectionKeepAliveStrategy long getKeepAliveDuration(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionOperator void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.BasicManagedEntity BasicManagedEntity(org.apache.http.HttpEntity, org.apache.http.conn.ManagedClientConnection, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ManagedClientConnection void tunnelTarget(boolean, org.apache.http.params.HttpParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.BasicManagedEntity void writeTo(java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.EofSensorInputStream int read(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionOperator void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionManager org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.MultihomePlainSocketFactory java.net.Socket createSocket()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionOperator void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ManagedClientConnection void layerProtocol(org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.BasicEofSensorWatcher BasicEofSensorWatcher(org.apache.http.conn.ManagedClientConnection, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionRequest org.apache.http.conn.ManagedClientConnection getConnection(long, java.util.concurrent.TimeUnit)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.BasicManagedEntity java.io.InputStream getContent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionManager void closeIdleConnections(long, java.util.concurrent.TimeUnit) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.MultihomePlainSocketFactory org.apache.http.conn.MultihomePlainSocketFactory getSocketFactory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ManagedClientConnection void tunnelProxy(org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.EofSensorInputStream EofSensorInputStream(java.io.InputStream, org.apache.http.conn.EofSensorWatcher) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionOperator org.apache.http.conn.OperatedClientConnection createConnection()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionManager void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionOperator void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ManagedClientConnection void tunnelProxy(org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.BasicManagedEntity BasicManagedEntity(org.apache.http.HttpEntity, org.apache.http.conn.ManagedClientConnection, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionOperator void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ManagedClientConnection void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.EofSensorInputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.OperatedClientConnection void openCompleted(boolean, org.apache.http.params.HttpParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.MultihomePlainSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ClientConnectionOperator void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.MultihomePlainSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ManagedClientConnection void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.MultihomePlainSocketFactory boolean isSecure(java.net.Socket) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/conn/params/annotations.xml b/android-sdk-annotations/org/apache/http/conn/params/annotations.xml
index c58bb990fe1..11f6264991e 100644
--- a/android-sdk-annotations/org/apache/http/conn/params/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/conn/params/annotations.xml
@@ -17,21 +17,27 @@
     <item name='org.apache.http.conn.params.ConnRouteParams void setDefaultProxy(org.apache.http.params.HttpParams, org.apache.http.HttpHost) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.params.ConnManagerParams org.apache.http.conn.params.ConnPerRoute getMaxConnectionsPerRoute(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.params.ConnPerRoute int getMaxForRoute(org.apache.http.conn.routing.HttpRoute) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.conn.params.ConnRouteParams org.apache.http.HttpHost getDefaultProxy(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.params.ConnRouteParams org.apache.http.conn.routing.HttpRoute getForcedRoute(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.params.ConnRouteParamBean ConnRouteParamBean(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.conn.params.ConnManagerParams long getTimeout(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.params.ConnPerRouteBean int getMaxForRoute(org.apache.http.conn.routing.HttpRoute) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.params.ConnRouteParamBean ConnRouteParamBean(org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.conn.params.ConnManagerParams int getMaxTotalConnections(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,9 +47,6 @@
     <item name='org.apache.http.conn.params.ConnManagerParamBean ConnManagerParamBean(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.params.ConnManagerParams org.apache.http.conn.params.ConnPerRoute getMaxConnectionsPerRoute(org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.conn.params.ConnManagerParams org.apache.http.conn.params.ConnPerRoute getMaxConnectionsPerRoute(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/http/conn/routing/annotations.xml b/android-sdk-annotations/org/apache/http/conn/routing/annotations.xml
index d179e0a4d55..93a676e57b7 100644
--- a/android-sdk-annotations/org/apache/http/conn/routing/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/conn/routing/annotations.xml
@@ -1,14 +1,8 @@
 <root>
-    <item name='org.apache.http.conn.routing.BasicRouteDirector int firstStep(org.apache.http.conn.routing.RouteInfo) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.routing.BasicRouteDirector int proxiedStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.conn.routing.HttpRoute HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost, boolean) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.routing.RouteTracker java.lang.String toString()'>
+    <item name='org.apache.http.conn.routing.BasicRouteDirector int proxiedStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.routing.HttpRoute HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, boolean) 0'>
@@ -17,25 +11,7 @@
     <item name='org.apache.http.conn.routing.HttpRoute HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.routing.RouteInfo.TunnelType org.apache.http.conn.routing.RouteInfo.TunnelType valueOf(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.routing.RouteInfo.LayerType org.apache.http.conn.routing.RouteInfo.LayerType valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.routing.RouteTracker RouteTracker(org.apache.http.HttpHost, java.net.InetAddress) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.routing.HttpRoute org.apache.http.conn.routing.RouteInfo.TunnelType getTunnelType()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.routing.BasicRouteDirector int directStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.routing.RouteTracker org.apache.http.HttpHost getTargetHost()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.routing.RouteTracker void connectProxy(org.apache.http.HttpHost, boolean) 0'>
+    <item name='org.apache.http.conn.routing.RouteInfo.TunnelType org.apache.http.conn.routing.RouteInfo.TunnelType valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.routing.RouteInfo.LayerType org.apache.http.conn.routing.RouteInfo.LayerType valueOf(java.lang.String) 0'>
@@ -44,31 +20,76 @@
     <item name='org.apache.http.conn.routing.HttpRoute HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost, boolean, org.apache.http.conn.routing.RouteInfo.TunnelType, org.apache.http.conn.routing.RouteInfo.LayerType) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.routing.RouteTracker void tunnelProxy(org.apache.http.HttpHost, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.conn.routing.HttpRoute HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost[], boolean, org.apache.http.conn.routing.RouteInfo.TunnelType, org.apache.http.conn.routing.RouteInfo.LayerType) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.routing.RouteTracker RouteTracker(org.apache.http.conn.routing.HttpRoute) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.routing.RouteInfo.TunnelType org.apache.http.conn.routing.RouteInfo.TunnelType valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.routing.HttpRoute org.apache.http.conn.routing.RouteInfo.LayerType getLayerType()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.conn.routing.HttpRoute org.apache.http.HttpHost getTargetHost()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.routing.HttpRoute java.lang.String toString()'>
+    <item name='org.apache.http.conn.routing.HttpRoute org.apache.http.conn.routing.RouteInfo.TunnelType getTunnelType()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.routing.HttpRoute HttpRoute(org.apache.http.HttpHost) 0'>
+    <item name='org.apache.http.conn.routing.HttpRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteInfo.LayerType org.apache.http.conn.routing.RouteInfo.LayerType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.HttpRoute org.apache.http.conn.routing.RouteInfo.LayerType getLayerType()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.HttpRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.routing.BasicRouteDirector int nextStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.routing.BasicRouteDirector int firstStep(org.apache.http.conn.routing.RouteInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteInfo org.apache.http.conn.routing.RouteInfo.TunnelType getTunnelType()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteTracker java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.HttpRoute java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteInfo org.apache.http.conn.routing.RouteInfo.LayerType getLayerType()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteInfo org.apache.http.HttpHost getTargetHost()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteInfo.TunnelType org.apache.http.conn.routing.RouteInfo.TunnelType valueOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteTracker RouteTracker(org.apache.http.HttpHost, java.net.InetAddress) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.BasicRouteDirector int directStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteTracker void connectProxy(org.apache.http.HttpHost, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteTracker void tunnelProxy(org.apache.http.HttpHost, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteTracker RouteTracker(org.apache.http.conn.routing.HttpRoute) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.HttpRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.RouteTracker org.apache.http.HttpHost getTargetHost()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.HttpRoute HttpRoute(org.apache.http.HttpHost) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.routing.HttpRouteDirector int nextStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/conn/scheme/annotations.xml b/android-sdk-annotations/org/apache/http/conn/scheme/annotations.xml
index 83e0b824325..c25cbbdc1e7 100644
--- a/android-sdk-annotations/org/apache/http/conn/scheme/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/conn/scheme/annotations.xml
@@ -1,14 +1,23 @@
 <root>
+    <item name='org.apache.http.conn.scheme.SocketFactory boolean isSecure(java.net.Socket) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.scheme.SocketFactory java.net.Socket createSocket()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.scheme.Scheme org.apache.http.conn.scheme.SocketFactory getSocketFactory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.conn.scheme.PlainSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.scheme.SchemeRegistry java.util.List&lt;java.lang.String&gt; getSchemeNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.conn.scheme.PlainSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.scheme.SchemeRegistry org.apache.http.conn.scheme.Scheme getScheme(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.scheme.PlainSocketFactory org.apache.http.conn.scheme.PlainSocketFactory getSocketFactory()'>
+    <item name='org.apache.http.conn.scheme.SocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.scheme.PlainSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) 5'>
@@ -17,10 +26,7 @@
     <item name='org.apache.http.conn.scheme.PlainSocketFactory boolean isSecure(java.net.Socket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.scheme.Scheme org.apache.http.conn.scheme.SocketFactory getSocketFactory()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.scheme.PlainSocketFactory java.net.Socket createSocket()'>
+    <item name='org.apache.http.conn.scheme.SocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.scheme.SchemeRegistry org.apache.http.conn.scheme.Scheme get(java.lang.String) 0'>
@@ -35,22 +41,34 @@
     <item name='org.apache.http.conn.scheme.SchemeRegistry org.apache.http.conn.scheme.Scheme getScheme(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.scheme.LayeredSocketFactory java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.scheme.PlainSocketFactory org.apache.http.conn.scheme.PlainSocketFactory getSocketFactory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.conn.scheme.Scheme java.lang.String getName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.scheme.SchemeRegistry org.apache.http.conn.scheme.Scheme getScheme(org.apache.http.HttpHost)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.scheme.SchemeRegistry java.util.List&lt;java.lang.String&gt; getSchemeNames()'>
+    <item name='org.apache.http.conn.scheme.SchemeRegistry org.apache.http.conn.scheme.Scheme getScheme(org.apache.http.HttpHost) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.scheme.SchemeRegistry org.apache.http.conn.scheme.Scheme getScheme(org.apache.http.HttpHost) 0'>
+    <item name='org.apache.http.conn.scheme.PlainSocketFactory java.net.Socket createSocket()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.scheme.Scheme Scheme(java.lang.String, org.apache.http.conn.scheme.SocketFactory, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.scheme.SchemeRegistry org.apache.http.conn.scheme.Scheme getScheme(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.conn.scheme.Scheme Scheme(java.lang.String, org.apache.http.conn.scheme.SocketFactory, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.scheme.SocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/conn/ssl/annotations.xml b/android-sdk-annotations/org/apache/http/conn/ssl/annotations.xml
index d5942ceecd0..8fe247793f8 100644
--- a/android-sdk-annotations/org/apache/http/conn/ssl/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/conn/ssl/annotations.xml
@@ -11,16 +11,28 @@
     <item name='org.apache.http.conn.ssl.AbstractVerifier boolean acceptableCountryWildcard(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.ssl.AllowAllHostnameVerifier java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ssl.X509HostnameVerifier void verify(java.lang.String, java.security.cert.X509Certificate) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ssl.StrictHostnameVerifier java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.conn.ssl.AbstractVerifier void verify(java.lang.String, javax.net.ssl.SSLSocket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.ssl.AbstractVerifier java.lang.String[] getCNs(java.security.cert.X509Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.ssl.BrowserCompatHostnameVerifier java.lang.String toString()'>
+    <item name='org.apache.http.conn.ssl.X509HostnameVerifier void verify(java.lang.String, javax.net.ssl.SSLSocket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.ssl.StrictHostnameVerifier java.lang.String toString()'>
+    <item name='org.apache.http.conn.ssl.X509HostnameVerifier void verify(java.lang.String, javax.net.ssl.SSLSocket) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ssl.SSLSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.conn.ssl.SSLSocketFactory boolean isSecure(java.net.Socket) 0'>
@@ -32,15 +44,15 @@
     <item name='org.apache.http.conn.ssl.AbstractVerifier int countDots(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.conn.ssl.SSLSocketFactory java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.conn.ssl.BrowserCompatHostnameVerifier java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.conn.ssl.SSLSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.conn.ssl.SSLSocketFactory java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.conn.ssl.AllowAllHostnameVerifier java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.conn.ssl.AbstractVerifier void verify(java.lang.String, java.security.cert.X509Certificate) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/http/cookie/annotations.xml b/android-sdk-annotations/org/apache/http/cookie/annotations.xml
index 8d55b257de7..5ca4077ad0e 100644
--- a/android-sdk-annotations/org/apache/http/cookie/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/cookie/annotations.xml
@@ -1,59 +1,122 @@
 <root>
-    <item name='org.apache.http.cookie.CookieOrigin java.lang.String getPath()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.cookie.CookiePathComparator int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.cookie.CookieSpecRegistry org.apache.http.cookie.CookieSpec getCookieSpec(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.cookie.CookiePathComparator int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.cookie.CookieIdentityComparator int compare(java.lang.Object, java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.cookie.CookieIdentityComparator int compare(java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.cookie.CookieOrigin CookieOrigin(java.lang.String, int, java.lang.String, boolean) 0'>
+    <item name='org.apache.http.cookie.SetCookie void setComment(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.cookie.CookieSpecRegistry void register(java.lang.String, org.apache.http.cookie.CookieSpecFactory) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.cookie.CookieOrigin CookieOrigin(java.lang.String, int, java.lang.String, boolean) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.cookie.CookieSpecRegistry java.util.List&lt;java.lang.String&gt; getSpecNames()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.cookie.CookieIdentityComparator int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.cookie.CookieOrigin java.lang.String getHost()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.cookie.CookieSpecRegistry void register(java.lang.String, org.apache.http.cookie.CookieSpecFactory) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.cookie.CookieIdentityComparator int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.cookie.CookiePathComparator int compare(java.lang.Object, java.lang.Object) 0'>
+    <item name='org.apache.http.cookie.CookieSpec void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.cookie.CookieOrigin java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.cookie.CookieSpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieSpecRegistry void register(java.lang.String, org.apache.http.cookie.CookieSpecFactory) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieOrigin java.lang.String getHost()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieSpec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieOrigin java.lang.String getPath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieSpec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieIdentityComparator int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookiePathComparator int compare(java.lang.Object, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieSpecRegistry java.util.List&lt;java.lang.String&gt; getSpecNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.cookie.CookieSpecRegistry void unregister(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.cookie.CookieSpec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieSpec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieSpec boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookiePathComparator int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieIdentityComparator int compare(java.lang.Object, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.ClientCookie java.lang.String getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieSpec void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieSpec boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieOrigin CookieOrigin(java.lang.String, int, java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.SetCookie void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieOrigin CookieOrigin(java.lang.String, int, java.lang.String, boolean) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieIdentityComparator int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieSpecRegistry void register(java.lang.String, org.apache.http.cookie.CookieSpecFactory) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.CookieAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.cookie.Cookie boolean isExpired(java.util.Date) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.cookie.CookieSpecRegistry org.apache.http.cookie.CookieSpec getCookieSpec(java.lang.String, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.cookie.CookieSpec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.cookie.CookiePathComparator int compare(java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.cookie.Cookie java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/entity/annotations.xml b/android-sdk-annotations/org/apache/http/entity/annotations.xml
index 64ac30d158a..df1929dbb11 100644
--- a/android-sdk-annotations/org/apache/http/entity/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/entity/annotations.xml
@@ -1,8 +1,5 @@
 <root>
-    <item name='org.apache.http.entity.ByteArrayEntity ByteArrayEntity(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.entity.EntityTemplate EntityTemplate(org.apache.http.entity.ContentProducer) 0'>
+    <item name='org.apache.http.entity.InputStreamEntity java.io.InputStream getContent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.entity.FileEntity void writeTo(java.io.OutputStream) 0'>
@@ -11,58 +8,73 @@
     <item name='org.apache.http.entity.SerializableEntity void writeTo(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.entity.StringEntity java.io.InputStream getContent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.entity.InputStreamEntity void writeTo(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.entity.FileEntity FileEntity(java.io.File, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.entity.FileEntity java.io.InputStream getContent()'>
+    <item name='org.apache.http.entity.AbstractHttpEntity org.apache.http.Header getContentType()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.HttpEntityWrapper HttpEntityWrapper(org.apache.http.HttpEntity) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.InputStreamEntity InputStreamEntity(java.io.InputStream, long) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.BufferedHttpEntity BufferedHttpEntity(org.apache.http.HttpEntity) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.EntityTemplate void writeTo(java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.ByteArrayEntity void writeTo(java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.StringEntity StringEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.StringEntity StringEntity(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.ContentLengthStrategy long determineLength(org.apache.http.HttpMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.ByteArrayEntity ByteArrayEntity(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.entity.SerializableEntity java.io.InputStream getContent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.entity.HttpEntityWrapper java.io.InputStream getContent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.ByteArrayEntity java.io.InputStream getContent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.EntityTemplate EntityTemplate(org.apache.http.entity.ContentProducer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.entity.StringEntity java.io.InputStream getContent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.entity.SerializableEntity SerializableEntity(java.io.Serializable, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.entity.BufferedHttpEntity void writeTo(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.entity.ByteArrayEntity java.io.InputStream getContent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.entity.InputStreamEntity InputStreamEntity(java.io.InputStream, long) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.entity.HttpEntityWrapper HttpEntityWrapper(org.apache.http.HttpEntity) 0'>
+    <item name='org.apache.http.entity.FileEntity java.io.InputStream getContent()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.entity.BasicHttpEntity void writeTo(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.entity.BufferedHttpEntity BufferedHttpEntity(org.apache.http.HttpEntity) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.entity.ByteArrayEntity void writeTo(java.io.OutputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.entity.EntityTemplate void writeTo(java.io.OutputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.entity.StringEntity StringEntity(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.entity.InputStreamEntity java.io.InputStream getContent()'>
+    <item name='org.apache.http.entity.HttpEntityWrapper void writeTo(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.entity.StringEntity void writeTo(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.entity.StringEntity StringEntity(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/impl/annotations.xml b/android-sdk-annotations/org/apache/http/impl/annotations.xml
index 6abf4fd468e..15a4a9f6d46 100644
--- a/android-sdk-annotations/org/apache/http/impl/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/impl/annotations.xml
@@ -2,13 +2,19 @@
     <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.io.HttpMessageParser createRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.impl.entity.EntitySerializer createEntitySerializer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.io.HttpMessageParser createResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.DefaultHttpRequestFactory org.apache.http.HttpRequest newHttpRequest(java.lang.String, java.lang.String)'>
+    <item name='org.apache.http.impl.SocketHttpClientConnection org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.SocketHttpClientConnection org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
+    <item name='org.apache.http.impl.SocketHttpServerConnection org.apache.http.io.SessionOutputBuffer createHttpDataTransmitter(java.net.Socket, int, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.DefaultHttpRequestFactory org.apache.http.HttpRequest newHttpRequest(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.DefaultHttpResponseFactory org.apache.http.HttpResponse newHttpResponse(org.apache.http.ProtocolVersion, int, org.apache.http.protocol.HttpContext) 0'>
@@ -20,25 +26,28 @@
     <item name='org.apache.http.impl.AbstractHttpServerConnection void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.HttpRequestFactory createHttpRequestFactory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.DefaultHttpRequestFactory org.apache.http.HttpRequest newHttpRequest(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.SocketHttpClientConnection org.apache.http.io.SessionOutputBuffer createSessionOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.DefaultHttpRequestFactory org.apache.http.HttpRequest newHttpRequest(org.apache.http.RequestLine)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.HttpResponse receiveResponseHeader()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.NoConnectionReuseStrategy boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.SocketHttpClientConnection org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.impl.entity.EntitySerializer createEntitySerializer()'>
+    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.io.HttpMessageParser createRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.AbstractHttpClientConnection void sendRequestHeader(org.apache.http.HttpRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.HttpRequestFactory createHttpRequestFactory()'>
+    <item name='org.apache.http.impl.DefaultHttpResponseFactory java.util.Locale determineLocale(org.apache.http.protocol.HttpContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.AbstractHttpClientConnection void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams) 0'>
@@ -47,18 +56,9 @@
     <item name='org.apache.http.impl.SocketHttpServerConnection org.apache.http.io.SessionOutputBuffer createHttpDataTransmitter(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.HttpResponseFactory createHttpResponseFactory()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.io.HttpMessageParser createRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.DefaultHttpResponseFactory java.util.Locale determineLocale(org.apache.http.protocol.HttpContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.impl.entity.EntityDeserializer createEntityDeserializer()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.SocketHttpClientConnection org.apache.http.io.SessionOutputBuffer createSessionOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -74,30 +74,39 @@
     <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.io.HttpMessageWriter createResponseWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.io.HttpMessageParser createResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.AbstractHttpServerConnection void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.DefaultHttpRequestFactory org.apache.http.HttpRequest newHttpRequest(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.SocketHttpServerConnection org.apache.http.io.SessionOutputBuffer createHttpDataTransmitter(java.net.Socket, int, org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.SocketHttpServerConnection org.apache.http.io.SessionInputBuffer createHttpDataReceiver(java.net.Socket, int, org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.HttpResponse receiveResponseHeader()'>
+    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.impl.entity.EntitySerializer createEntitySerializer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.SocketHttpClientConnection org.apache.http.io.SessionOutputBuffer createSessionOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.impl.entity.EntityDeserializer createEntityDeserializer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.SocketHttpServerConnection void bind(java.net.Socket, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.io.HttpMessageWriter createRequestWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.DefaultConnectionReuseStrategy org.apache.http.TokenIterator createTokenIterator(org.apache.http.HeaderIterator)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.DefaultHttpClientConnection java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.AbstractHttpClientConnection void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.impl.entity.EntityDeserializer createEntityDeserializer()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.SocketHttpServerConnection org.apache.http.io.SessionInputBuffer createHttpDataReceiver(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -107,6 +116,9 @@
     <item name='org.apache.http.impl.SocketHttpClientConnection void bind(java.net.Socket, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.io.HttpMessageWriter createRequestWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.DefaultHttpResponseFactory org.apache.http.HttpResponse newHttpResponse(org.apache.http.StatusLine, org.apache.http.protocol.HttpContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -119,12 +131,6 @@
     <item name='org.apache.http.impl.DefaultHttpResponseFactory DefaultHttpResponseFactory(org.apache.http.ReasonPhraseCatalog) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.DefaultHttpRequestFactory org.apache.http.HttpRequest newHttpRequest(org.apache.http.RequestLine)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.io.HttpMessageParser createResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.AbstractHttpServerConnection void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -134,66 +140,60 @@
     <item name='org.apache.http.impl.DefaultHttpClientConnection void bind(java.net.Socket, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.io.HttpMessageParser createRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.impl.entity.EntityDeserializer createEntityDeserializer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.AbstractHttpServerConnection void sendResponseHeader(org.apache.http.HttpResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.SocketHttpClientConnection org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.DefaultHttpRequestFactory org.apache.http.HttpRequest newHttpRequest(org.apache.http.RequestLine) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.DefaultHttpResponseFactory org.apache.http.HttpResponse newHttpResponse(org.apache.http.ProtocolVersion, int, org.apache.http.protocol.HttpContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.io.HttpMessageWriter createResponseWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.AbstractHttpClientConnection void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.AbstractHttpClientConnection void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams) 2'>
+    <item name='org.apache.http.impl.DefaultHttpServerConnection java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.SocketHttpClientConnection void bind(java.net.Socket, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.DefaultHttpClientConnection java.lang.String toString()'>
+    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.HttpResponseFactory createHttpResponseFactory()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.DefaultConnectionReuseStrategy org.apache.http.TokenIterator createTokenIterator(org.apache.http.HeaderIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.DefaultConnectionReuseStrategy org.apache.http.TokenIterator createTokenIterator(org.apache.http.HeaderIterator)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.DefaultConnectionReuseStrategy boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.DefaultHttpServerConnection void bind(java.net.Socket, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.io.HttpMessageWriter createResponseWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.DefaultHttpResponseFactory org.apache.http.HttpResponse newHttpResponse(org.apache.http.StatusLine, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.DefaultHttpClientConnection void bind(java.net.Socket, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.impl.entity.EntitySerializer createEntitySerializer()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.AbstractHttpServerConnection org.apache.http.io.HttpMessageParser createRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.AbstractHttpClientConnection void receiveResponseEntity(org.apache.http.HttpResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.SocketHttpServerConnection org.apache.http.io.SessionInputBuffer createHttpDataReceiver(java.net.Socket, int, org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.NoConnectionReuseStrategy boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.DefaultHttpServerConnection java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.AbstractHttpClientConnection org.apache.http.io.HttpMessageParser createResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/http/impl/auth/annotations.xml b/android-sdk-annotations/org/apache/http/impl/auth/annotations.xml
index 6d0f09cd87d..a167ee95924 100644
--- a/android-sdk-annotations/org/apache/http/impl/auth/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/impl/auth/annotations.xml
@@ -1,29 +1,17 @@
 <root>
-    <item name='org.apache.http.impl.auth.RFC2617Scheme void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) 0'>
+    <item name='org.apache.http.impl.auth.AuthSchemeBase void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.auth.NTLMScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest)'>
+    <item name='org.apache.http.impl.auth.NTLMScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.auth.NTLMScheme java.lang.String getSchemeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.auth.NTLMScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.auth.BasicScheme java.lang.String getSchemeName()'>
+    <item name='org.apache.http.impl.auth.DigestSchemeFactory org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.auth.NTLMScheme NTLMScheme(org.apache.http.impl.auth.NTLMEngine) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.auth.BasicSchemeFactory org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.auth.BasicScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.auth.AuthSchemeBase void processChallenge(org.apache.http.Header) 0'>
+    <item name='org.apache.http.impl.auth.BasicScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, java.lang.String, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.auth.RFC2617Scheme java.lang.String getParameter(java.lang.String) 0'>
@@ -32,19 +20,16 @@
     <item name='org.apache.http.impl.auth.DigestScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.auth.BasicScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.auth.BasicScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, java.lang.String, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.auth.BasicScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, java.lang.String, boolean)'>
+    <item name='org.apache.http.impl.auth.NTLMScheme java.lang.String getSchemeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.auth.DigestScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.auth.BasicScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, java.lang.String, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.auth.BasicScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 0'>
+    <item name='org.apache.http.impl.auth.BasicScheme void processChallenge(org.apache.http.Header) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.auth.DigestScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest)'>
@@ -56,10 +41,40 @@
     <item name='org.apache.http.impl.auth.NTLMScheme void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.auth.DigestSchemeFactory org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.auth.BasicSchemeFactory org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.auth.RFC2617Scheme void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.auth.NTLMScheme java.lang.String getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.auth.NTLMScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.auth.BasicScheme java.lang.String getSchemeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.auth.NTLMScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.auth.AuthSchemeBase void processChallenge(org.apache.http.Header) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.auth.DigestScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.auth.BasicScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.auth.DigestScheme java.lang.String getSchemeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.auth.BasicScheme org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.auth.DigestScheme void processChallenge(org.apache.http.Header) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/impl/client/annotations.xml b/android-sdk-annotations/org/apache/http/impl/client/annotations.xml
index e4679a211b0..1bd20af8a4a 100644
--- a/android-sdk-annotations/org/apache/http/impl/client/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/impl/client/annotations.xml
@@ -1,19 +1,145 @@
 <root>
-    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 4'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.protocol.HttpContext createHttpContext()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.BasicResponseHandler java.lang.String handleResponse(org.apache.http.HttpResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.AuthenticationHandler createProxyAuthenticationHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 9'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.client.RequestWrapper org.apache.http.RequestLine getRequestLine()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.ClientParamsStack boolean removeParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.BasicCredentialsProvider void setCredentials(org.apache.http.auth.AuthScope, org.apache.http.auth.Credentials) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.CookieStore createCookieStore()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 8'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultUserTokenHandler java.lang.Object getUserToken(org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy long getKeepAliveDuration(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 10'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.params.HttpParams determineParams(org.apache.http.HttpRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractAuthenticationHandler org.apache.http.auth.AuthScheme selectScheme(java.util.Map&lt;java.lang.String,org.apache.http.Header&gt;, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.BasicCookieStore java.util.List&lt;org.apache.http.cookie.Cookie&gt; getCookies()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.CredentialsProvider createCredentialsProvider()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.AuthenticationHandler createTargetAuthenticationHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 9'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.conn.ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractAuthenticationHandler java.util.List&lt;java.lang.String&gt; getAuthPreferences()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 11'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.ClientParamsStack org.apache.http.params.HttpParams copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.UserTokenHandler createUserTokenHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.AuthenticationHandler createTargetAuthenticationHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 6'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.ClientParamsStack java.lang.Object getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.AuthenticationHandler createProxyAuthenticationHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.params.HttpParams determineParams(org.apache.http.HttpRequest)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractAuthenticationHandler java.util.Map&lt;java.lang.String,org.apache.http.Header&gt; parseChallenges(org.apache.http.Header[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultRequestDirector org.apache.http.HttpRequest createConnectRequest(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.UserTokenHandler createUserTokenHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.auth.AuthSchemeRegistry createAuthSchemeRegistry()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 7'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractAuthenticationHandler java.util.Map&lt;java.lang.String,org.apache.http.Header&gt; parseChallenges(org.apache.http.Header[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.RequestWrapper org.apache.http.HttpRequest getOriginal()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.HttpRequestRetryHandler createHttpRequestRetryHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.client.AbstractAuthenticationHandler org.apache.http.auth.AuthScheme selectScheme(java.util.Map&lt;java.lang.String,org.apache.http.Header&gt;, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.CookieStore createCookieStore()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector org.apache.http.HttpRequest createConnectRequest(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,100 +149,76 @@
     <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.BasicCredentialsProvider void setCredentials(org.apache.http.auth.AuthScope, org.apache.http.auth.Credentials) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.DefaultHttpRequestRetryHandler boolean retryRequest(java.io.IOException, int, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.CredentialsProvider createCredentialsProvider()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.DefaultRedirectHandler java.net.URI getLocationURI(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.params.HttpParams determineParams(org.apache.http.HttpRequest)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 8'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.BasicCookieStore java.util.List&lt;org.apache.http.cookie.Cookie&gt; getCookies()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultUserTokenHandler java.lang.Object getUserToken(org.apache.http.protocol.HttpContext) 0'>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.ConnectionReuseStrategy createConnectionReuseStrategy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector void rewriteRequestURI(org.apache.http.impl.client.RequestWrapper, org.apache.http.conn.routing.HttpRoute) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.protocol.HttpRequestExecutor createRequestExecutor()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector boolean createTunnelToTarget(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy long getKeepAliveDuration(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 10'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.RedirectHandler createRedirectHandler()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultTargetAuthenticationHandler java.util.Map&lt;java.lang.String,org.apache.http.Header&gt; getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.protocol.BasicHttpProcessor createHttpProcessor()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.params.HttpParams createHttpParams()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.params.HttpParams determineParams(org.apache.http.HttpRequest) 0'>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.RedirectHandler createRedirectHandler()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.CookieStore createCookieStore()'>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.protocol.HttpContext createHttpContext()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.protocol.HttpContext createHttpContext()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.protocol.BasicHttpProcessor createHttpProcessor()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultTargetAuthenticationHandler java.util.Map&lt;java.lang.String,org.apache.http.Header&gt; getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.cookie.CookieSpecRegistry createCookieSpecRegistry()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.params.HttpParams createHttpParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.auth.AuthSchemeRegistry createAuthSchemeRegistry()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.protocol.BasicHttpProcessor createHttpProcessor()'>
+    <item name='org.apache.http.impl.client.DefaultProxyAuthenticationHandler boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 6'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultProxyAuthenticationHandler boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.cookie.CookieSpecRegistry createCookieSpecRegistry()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.RequestWrapper RequestWrapper(org.apache.http.HttpRequest) 0'>
@@ -125,10 +227,10 @@
     <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultRequestDirector void rewriteRequestURI(org.apache.http.impl.client.RequestWrapper, org.apache.http.conn.routing.HttpRoute) 0'>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RedirectHandler createRedirectHandler()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 9'>
+    <item name='org.apache.http.impl.client.DefaultRequestDirector void rewriteRequestURI(org.apache.http.impl.client.RequestWrapper, org.apache.http.conn.routing.HttpRoute) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.EntityEnclosingRequestWrapper EntityEnclosingRequestWrapper(org.apache.http.HttpEntityEnclosingRequest) 0'>
@@ -137,28 +239,19 @@
     <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.ConnectionReuseStrategy createConnectionReuseStrategy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.DefaultRedirectHandler boolean isRedirectRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultRedirectHandler java.net.URI getLocationURI(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.ClientParamsStack ClientParamsStack(org.apache.http.impl.client.ClientParamsStack) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.AbstractAuthenticationHandler org.apache.http.auth.AuthScheme selectScheme(java.util.Map&lt;java.lang.String,org.apache.http.Header&gt;, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext)'>
+    <item name='org.apache.http.impl.client.DefaultRedirectHandler java.net.URI getLocationURI(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 11'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.protocol.HttpRequestExecutor createRequestExecutor()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 2'>
@@ -167,6 +260,9 @@
     <item name='org.apache.http.impl.client.RequestWrapper void setMethod(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.client.ClientParamsStack org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 7'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -176,31 +272,7 @@
     <item name='org.apache.http.impl.client.DefaultHttpRequestRetryHandler boolean retryRequest(java.io.IOException, int, org.apache.http.protocol.HttpContext) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.ClientParamsStack org.apache.http.params.HttpParams copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.RequestWrapper org.apache.http.RequestLine getRequestLine()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.HttpRequestRetryHandler createHttpRequestRetryHandler()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.AuthenticationHandler createProxyAuthenticationHandler()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.AbstractAuthenticationHandler java.util.List&lt;java.lang.String&gt; getAuthPreferences()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.conn.routing.HttpRoutePlanner createHttpRoutePlanner()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 6'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultRequestDirector org.apache.http.HttpRequest createConnectRequest(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.ClientParamsStack java.lang.Object getParameter(java.lang.String) 0'>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.conn.routing.HttpRoutePlanner createHttpRoutePlanner()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 2'>
@@ -209,49 +281,34 @@
     <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.conn.ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector org.apache.http.impl.client.RoutedRequest handleResponse(org.apache.http.impl.client.RoutedRequest, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.protocol.HttpContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultProxyAuthenticationHandler java.util.Map&lt;java.lang.String,org.apache.http.Header&gt; getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 10'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.client.DefaultProxyAuthenticationHandler java.util.Map&lt;java.lang.String,org.apache.http.Header&gt; getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.client.BasicResponseHandler java.lang.Object handleResponse(org.apache.http.HttpResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.conn.ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.conn.routing.HttpRoutePlanner createHttpRoutePlanner()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.cookie.CookieSpecRegistry createCookieSpecRegistry()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler&lt;? extends T&gt;, org.apache.http.protocol.HttpContext) 2'>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.CredentialsProvider createCredentialsProvider()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.DefaultRequestDirector DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 8'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.AuthenticationHandler createTargetAuthenticationHandler()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 7'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.AbstractAuthenticationHandler java.util.Map&lt;java.lang.String,org.apache.http.Header&gt; parseChallenges(org.apache.http.Header[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.auth.AuthSchemeRegistry createAuthSchemeRegistry()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.client.RequestWrapper org.apache.http.HttpRequest getOriginal()'>
+    <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.protocol.HttpRequestExecutor createRequestExecutor()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.DefaultTargetAuthenticationHandler boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
@@ -260,16 +317,16 @@
     <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.UserTokenHandler createUserTokenHandler()'>
+    <item name='org.apache.http.impl.client.DefaultHttpClient org.apache.http.client.HttpRequestRetryHandler createHttpRequestRetryHandler()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.client.BasicCredentialsProvider org.apache.http.auth.Credentials getCredentials(org.apache.http.auth.AuthScope) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.client.ClientParamsStack org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.client.AbstractHttpClient org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams) 11'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.client.AbstractAuthenticationHandler java.util.Map&lt;java.lang.String,org.apache.http.Header&gt; parseChallenges(org.apache.http.Header[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/impl/conn/annotations.xml b/android-sdk-annotations/org/apache/http/impl/conn/annotations.xml
index eacc771b80b..29fed359a49 100644
--- a/android-sdk-annotations/org/apache/http/impl/conn/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/impl/conn/annotations.xml
@@ -1,13 +1,16 @@
 <root>
-    <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.HttpMessageParser createResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.conn.DefaultClientConnection void update(java.net.Socket, org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.DefaultClientConnectionOperator org.apache.http.conn.OperatedClientConnection createConnection()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.AbstractPooledConnAdapter void layerProtocol(org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.AbstractClientConnAdapter void receiveResponseEntity(org.apache.http.HttpResponse) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.SingleClientConnManager org.apache.http.conn.ManagedClientConnection getConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,37 +23,58 @@
     <item name='org.apache.http.impl.conn.AbstractPoolEntry void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.DefaultHttpRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.SessionOutputBuffer createSessionOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.AbstractPoolEntry void layerProtocol(org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.DefaultClientConnection void sendRequestHeader(org.apache.http.HttpRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.Wire void input(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.AbstractPooledConnAdapter void tunnelProxy(org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.LoggingSessionOutputBuffer void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner java.net.Proxy chooseProxy(java.util.List&lt;java.net.Proxy&gt;, org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.HttpMessageParser createResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.AbstractClientConnAdapter void assertValid(org.apache.http.conn.OperatedClientConnection) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.SessionOutputBuffer createSessionOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.DefaultClientConnectionOperator void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.LoggingSessionInputBuffer int readLine(org.apache.http.util.CharArrayBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner org.apache.http.HttpHost determineProxy(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.DefaultHttpRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner java.net.Proxy chooseProxy(java.util.List&lt;java.net.Proxy&gt;, org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.DefaultResponseParser DefaultResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.Wire void output(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner java.net.Proxy chooseProxy(java.util.List&lt;java.net.Proxy&gt;, org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext)'>
+    <item name='org.apache.http.impl.conn.SingleClientConnManager org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.AbstractPooledConnAdapter void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 0'>
@@ -62,9 +86,6 @@
     <item name='org.apache.http.impl.conn.DefaultClientConnectionOperator void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.DefaultClientConnectionOperator org.apache.http.conn.OperatedClientConnection createConnection()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.conn.AbstractPoolEntry AbstractPoolEntry(org.apache.http.conn.ClientConnectionOperator, org.apache.http.conn.routing.HttpRoute) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -77,10 +98,10 @@
     <item name='org.apache.http.impl.conn.DefaultHttpRoutePlanner DefaultHttpRoutePlanner(org.apache.http.conn.scheme.SchemeRegistry) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext)'>
+    <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
+    <item name='org.apache.http.impl.conn.LoggingSessionInputBuffer int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.DefaultClientConnectionOperator void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 4'>
@@ -95,6 +116,9 @@
     <item name='org.apache.http.impl.conn.SingleClientConnManager SingleClientConnManager(org.apache.http.params.HttpParams, org.apache.http.conn.scheme.SchemeRegistry) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.AbstractClientConnAdapter void sendRequestEntity(org.apache.http.HttpEntityEnclosingRequest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner ProxySelectorRoutePlanner(org.apache.http.conn.scheme.SchemeRegistry, java.net.ProxySelector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -107,6 +131,9 @@
     <item name='org.apache.http.impl.conn.DefaultClientConnection void update(java.net.Socket, org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.DefaultResponseParser DefaultResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -116,21 +143,33 @@
     <item name='org.apache.http.impl.conn.SingleClientConnManager void closeIdleConnections(long, java.util.concurrent.TimeUnit) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.HttpMessageParser createResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.DefaultClientConnectionOperator void prepareSocket(java.net.Socket, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.Wire void output(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.SingleClientConnManager void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.LoggingSessionInputBuffer int read(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.SessionOutputBuffer createSessionOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.DefaultClientConnectionOperator void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.SingleClientConnManager org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.Wire void input(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -149,7 +188,10 @@
     <item name='org.apache.http.impl.conn.DefaultClientConnectionOperator void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.SingleClientConnManager org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry)'>
+    <item name='org.apache.http.impl.conn.DefaultHttpRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.AbstractClientConnAdapter void sendRequestHeader(org.apache.http.HttpRequest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.AbstractPooledConnAdapter void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 2'>
@@ -158,10 +200,10 @@
     <item name='org.apache.http.impl.conn.SingleClientConnManager.ConnAdapter ConnAdapter(org.apache.http.impl.conn.SingleClientConnManager, org.apache.http.impl.conn.SingleClientConnManager.PoolEntry, org.apache.http.conn.routing.HttpRoute) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.DefaultClientConnection org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.ProxySelectorRoutePlanner org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+    <item name='org.apache.http.impl.conn.LoggingSessionOutputBuffer void write(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.SingleClientConnManager.PoolEntry PoolEntry(org.apache.http.impl.conn.SingleClientConnManager) 0'>
@@ -179,9 +221,6 @@
     <item name='org.apache.http.impl.conn.DefaultClientConnectionOperator void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.SingleClientConnManager org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.conn.DefaultResponseParser org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/http/impl/conn/tsccm/annotations.xml b/android-sdk-annotations/org/apache/http/impl/conn/tsccm/annotations.xml
index 18eff546380..c91625b08f1 100644
--- a/android-sdk-annotations/org/apache/http/impl/conn/tsccm/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/impl/conn/tsccm/annotations.xml
@@ -5,25 +5,25 @@
     <item name='org.apache.http.impl.conn.tsccm.RouteSpecificPool void createdEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.RouteSpecificPool newRouteSpecificPool(org.apache.http.conn.routing.HttpRoute)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute java.util.Queue&lt;org.apache.http.impl.conn.tsccm.WaitingThread&gt; createWaitingThreadQueue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute ConnPoolByRoute(org.apache.http.conn.ClientConnectionOperator, org.apache.http.params.HttpParams) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.BasicPoolEntry createEntry(org.apache.http.impl.conn.tsccm.RouteSpecificPool, org.apache.http.conn.ClientConnectionOperator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.BasicPoolEntry createEntry(org.apache.http.impl.conn.tsccm.RouteSpecificPool, org.apache.http.conn.ClientConnectionOperator)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.PoolEntryRequest requestPoolEntry(org.apache.http.conn.routing.HttpRoute, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.impl.conn.tsccm.AbstractConnPool createConnectionPool(org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.BasicPoolEntry getEntryBlocking(org.apache.http.conn.routing.HttpRoute, java.lang.Object, long, java.util.concurrent.TimeUnit, org.apache.http.impl.conn.tsccm.WaitingThreadAborter)'>
@@ -35,19 +35,22 @@
     <item name='org.apache.http.impl.conn.tsccm.RefQueueWorker RefQueueWorker(java.lang.ref.ReferenceQueue&lt;?&gt;, org.apache.http.impl.conn.tsccm.RefQueueHandler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute java.util.Map&lt;org.apache.http.conn.routing.HttpRoute,org.apache.http.impl.conn.tsccm.RouteSpecificPool&gt; createRouteToPoolMap()'>
+    <item name='org.apache.http.impl.conn.tsccm.AbstractConnPool org.apache.http.impl.conn.tsccm.PoolEntryRequest requestPoolEntry(org.apache.http.conn.routing.HttpRoute, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.tsccm.RouteSpecificPool void queueThread(org.apache.http.impl.conn.tsccm.WaitingThread) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.tsccm.WaitingThread java.util.concurrent.locks.Condition getCondition()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager ThreadSafeClientConnManager(org.apache.http.params.HttpParams, org.apache.http.conn.scheme.SchemeRegistry) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry)'>
+    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit) 0'>
+    <item name='org.apache.http.impl.conn.tsccm.RefQueueWorker java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute ConnPoolByRoute(org.apache.http.conn.ClientConnectionOperator, org.apache.http.params.HttpParams) 0'>
@@ -59,10 +62,19 @@
     <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.impl.conn.tsccm.AbstractConnPool createConnectionPool(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.impl.conn.tsccm.AbstractConnPool createConnectionPool(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.tsccm.WaitingThread WaitingThread(java.util.concurrent.locks.Condition, org.apache.http.impl.conn.tsccm.RouteSpecificPool) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute java.util.Queue&lt;org.apache.http.impl.conn.tsccm.WaitingThread&gt; createWaitingThreadQueue()'>
+    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute java.util.Queue&lt;org.apache.http.impl.conn.tsccm.BasicPoolEntry&gt; createFreeConnQueue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.WaitingThread newWaitingThread(java.util.concurrent.locks.Condition, org.apache.http.impl.conn.tsccm.RouteSpecificPool)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.tsccm.BasicPoolEntry org.apache.http.impl.conn.tsccm.BasicPoolEntryRef getWeakRef()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.tsccm.AbstractConnPool void closeIdleConnections(long, java.util.concurrent.TimeUnit) 1'>
@@ -71,31 +83,25 @@
     <item name='org.apache.http.impl.conn.tsccm.BasicPooledConnAdapter BasicPooledConnAdapter(org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager, org.apache.http.impl.conn.AbstractPoolEntry) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.WaitingThread newWaitingThread(java.util.concurrent.locks.Condition, org.apache.http.impl.conn.tsccm.RouteSpecificPool)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute java.util.Queue&lt;org.apache.http.impl.conn.tsccm.BasicPoolEntry&gt; createFreeConnQueue()'>
+    <item name='org.apache.http.impl.conn.tsccm.RefQueueWorker RefQueueWorker(java.lang.ref.ReferenceQueue&lt;?&gt;, org.apache.http.impl.conn.tsccm.RefQueueHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.BasicPoolEntry createEntry(org.apache.http.impl.conn.tsccm.RouteSpecificPool, org.apache.http.conn.ClientConnectionOperator) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.RefQueueWorker RefQueueWorker(java.lang.ref.ReferenceQueue&lt;?&gt;, org.apache.http.impl.conn.tsccm.RefQueueHandler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.conn.tsccm.BasicPoolEntry BasicPoolEntry(org.apache.http.conn.ClientConnectionOperator, org.apache.http.conn.routing.HttpRoute, java.lang.ref.ReferenceQueue&lt;java.lang.Object&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.BasicPoolEntry org.apache.http.impl.conn.tsccm.BasicPoolEntryRef getWeakRef()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.RouteSpecificPool newRouteSpecificPool(org.apache.http.conn.routing.HttpRoute)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute void freeEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry, boolean, long, java.util.concurrent.TimeUnit) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.WaitingThread java.util.concurrent.locks.Condition getCondition()'>
+    <item name='org.apache.http.impl.conn.tsccm.PoolEntryRequest org.apache.http.impl.conn.tsccm.BasicPoolEntry getPoolEntry(long, java.util.concurrent.TimeUnit)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.tsccm.AbstractConnPool void freeEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry, boolean, long, java.util.concurrent.TimeUnit) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute org.apache.http.impl.conn.tsccm.BasicPoolEntry createEntry(org.apache.http.impl.conn.tsccm.RouteSpecificPool, org.apache.http.conn.ClientConnectionOperator)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager ThreadSafeClientConnManager(org.apache.http.params.HttpParams, org.apache.http.conn.scheme.SchemeRegistry) 0'>
@@ -104,10 +110,13 @@
     <item name='org.apache.http.impl.conn.tsccm.BasicPoolEntryRef BasicPoolEntryRef(org.apache.http.impl.conn.tsccm.BasicPoolEntry, java.lang.ref.ReferenceQueue&lt;java.lang.Object&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute void deleteEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.conn.tsccm.RefQueueWorker java.lang.String toString()'>
+    <item name='org.apache.http.impl.conn.tsccm.ConnPoolByRoute java.util.Map&lt;org.apache.http.conn.routing.HttpRoute,org.apache.http.impl.conn.tsccm.RouteSpecificPool&gt; createRouteToPoolMap()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/impl/cookie/annotations.xml b/android-sdk-annotations/org/apache/http/impl/cookie/annotations.xml
index 7d64424b3f7..4ac338ac151 100644
--- a/android-sdk-annotations/org/apache/http/impl/cookie/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/impl/cookie/annotations.xml
@@ -1,19 +1,25 @@
 <root>
-    <item name='org.apache.http.impl.cookie.CookieSpecBase java.lang.String getDefaultPath(org.apache.http.cookie.CookieOrigin)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.cookie.CookieSpecBase void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.RFC2965Spec org.apache.http.Header getVersionHeader()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.cookie.BasicExpiresHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.RFC2965VersionAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2965DiscardAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.BasicCommentHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.CookieSpecBase java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.HeaderElement[], org.apache.http.cookie.CookieOrigin)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.RFC2965VersionAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.AbstractCookieSpec void registerAttribHandler(java.lang.String, org.apache.http.cookie.CookieAttributeHandler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,16 +29,19 @@
     <item name='org.apache.http.impl.cookie.NetscapeDomainHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2109Spec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.RFC2965Spec void formatCookieAsVer(org.apache.http.util.CharArrayBuffer, org.apache.http.cookie.Cookie, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.BestMatchSpec void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BasicExpiresHandler BasicExpiresHandler(java.lang.String[]) 0'>
+    <item name='org.apache.http.impl.cookie.RFC2965CommentUrlAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BasicClientCookie java.lang.String toString()'>
+    <item name='org.apache.http.impl.cookie.BasicExpiresHandler BasicExpiresHandler(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.DateUtils java.lang.String formatDate(java.util.Date, java.lang.String) 1'>
@@ -44,15 +53,18 @@
     <item name='org.apache.http.impl.cookie.RFC2109Spec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.RFC2109DomainHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.cookie.RFC2965DomainAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2109DomainHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.BasicPathHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.AbstractCookieAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.CookieSpecBase boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -62,12 +74,18 @@
     <item name='org.apache.http.impl.cookie.BasicExpiresHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.BrowserCompatSpec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.CookieSpecBase void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.BasicCommentHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2965VersionAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.NetscapeDomainHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -86,12 +104,18 @@
     <item name='org.apache.http.impl.cookie.RFC2965Spec void formatCookieAsVer(org.apache.http.util.CharArrayBuffer, org.apache.http.cookie.Cookie, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BestMatchSpec org.apache.http.Header getVersionHeader()'>
+    <item name='org.apache.http.impl.cookie.CookieSpecBase java.lang.String getDefaultPath(org.apache.http.cookie.CookieOrigin)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.BrowserCompatSpec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.BasicClientCookie2 java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.BasicClientCookie java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.BasicPathHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -104,72 +128,93 @@
     <item name='org.apache.http.impl.cookie.CookieSpecBase boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.NetscapeDraftHeaderParser org.apache.http.HeaderElement parseHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.RFC2109Spec void formatCookieAsVer(org.apache.http.util.CharArrayBuffer, org.apache.http.cookie.Cookie, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2965PortAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.CookieSpecBase java.lang.String getDefaultDomain(org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2965CommentUrlAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.NetscapeDraftSpec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.BestMatchSpec boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.RFC2965SpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.cookie.RFC2965Spec boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.CookieSpecBase java.lang.String getDefaultDomain(org.apache.http.cookie.CookieOrigin)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.cookie.BestMatchSpec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.NetscapeDraftHeaderParser org.apache.http.HeaderElement parseHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+    <item name='org.apache.http.impl.cookie.RFC2965Spec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BestMatchSpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.cookie.BrowserCompatSpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BrowserCompatSpec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;)'>
+    <item name='org.apache.http.impl.cookie.RFC2965Spec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.BasicPathHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.BasicClientCookie java.lang.String getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.RFC2109Spec void formatParamAsVer(org.apache.http.util.CharArrayBuffer, java.lang.String, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.RFC2965DomainAttributeHandler boolean domainMatch(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.BasicClientCookie java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.RFC2965DomainAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BasicDomainHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+    <item name='org.apache.http.impl.cookie.RFC2965DiscardAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.BasicClientCookie boolean isExpired(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.RFC2109Spec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;) 0'>
+    <item name='org.apache.http.impl.cookie.BasicDomainHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.RFC2109Spec void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2109Spec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.BasicSecureHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.CookieSpecBase java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.HeaderElement[], org.apache.http.cookie.CookieOrigin)'>
+    <item name='org.apache.http.impl.cookie.RFC2109SpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.RFC2965Spec org.apache.http.Header getVersionHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.RFC2965VersionAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.RFC2965PortAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2965SpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.DateUtils java.util.Date parseDate(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -179,25 +224,22 @@
     <item name='org.apache.http.impl.cookie.BestMatchSpec boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BasicClientCookie java.lang.String getName()'>
+    <item name='org.apache.http.impl.cookie.NetscapeDomainHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.NetscapeDomainHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+    <item name='org.apache.http.impl.cookie.AbstractCookieSpec org.apache.http.cookie.CookieAttributeHandler getAttribHandler(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.RFC2965Spec boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.DateUtils java.lang.String formatDate(java.util.Date, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BasicClientCookie java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.cookie.NetscapeDraftSpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.cookie.BasicSecureHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BasicClientCookie2 java.lang.Object clone()'>
+    <item name='org.apache.http.impl.cookie.RFC2965DomainAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.CookieSpecBase java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.HeaderElement[], org.apache.http.cookie.CookieOrigin) 0'>
@@ -215,34 +257,58 @@
     <item name='org.apache.http.impl.cookie.RFC2109DomainHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.AbstractCookieSpec org.apache.http.cookie.CookieAttributeHandler getAttribHandler(java.lang.String)'>
+    <item name='org.apache.http.impl.cookie.BasicPathHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.RFC2965CommentUrlAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.DateUtils java.util.Date parseDate(java.lang.String, java.lang.String[], java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.RFC2109SpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.cookie.NetscapeDraftSpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.RFC2109VersionHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.BasicClientCookie2 boolean isExpired(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.RFC2965PortAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BasicDomainHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+    <item name='org.apache.http.impl.cookie.RFC2965DiscardAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.RFC2109Spec void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.BasicDomainHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.BasicSecureHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.BasicDomainHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.RFC2109DomainHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+    <item name='org.apache.http.impl.cookie.RFC2965Spec void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.RFC2965DiscardAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.RFC2109VersionHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.RFC2109Spec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;)'>
+    <item name='org.apache.http.impl.cookie.RFC2109DomainHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.RFC2965CommentUrlAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.RFC2965CommentUrlAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.BasicClientCookie2 BasicClientCookie2(java.lang.String, java.lang.String) 0'>
@@ -251,16 +317,16 @@
     <item name='org.apache.http.impl.cookie.DateUtils java.util.Date parseDate(java.lang.String, java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.RFC2965Spec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin)'>
+    <item name='org.apache.http.impl.cookie.RFC2965DomainAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.RFC2965DomainAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+    <item name='org.apache.http.impl.cookie.BasicClientCookie java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.RFC2965Spec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.NetscapeDraftSpec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;)'>
+    <item name='org.apache.http.impl.cookie.BasicClientCookie void setValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.RFC2965VersionAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
@@ -269,6 +335,12 @@
     <item name='org.apache.http.impl.cookie.RFC2965PortAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2965DiscardAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.NetscapeDraftSpec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.RFC2109DomainHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -278,12 +350,24 @@
     <item name='org.apache.http.impl.cookie.NetscapeDomainHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2965DiscardAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.BestMatchSpec org.apache.http.Header getVersionHeader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.BasicDomainHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.CookieSpecBase java.lang.String getDefaultDomain(org.apache.http.cookie.CookieOrigin)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.NetscapeDraftHeaderParser org.apache.http.HeaderElement parseHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.AbstractCookieAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.RFC2965VersionAttributeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -296,9 +380,15 @@
     <item name='org.apache.http.impl.cookie.BasicMaxAgeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.AbstractCookieAttributeHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.RFC2109DomainHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.BasicClientCookie void setComment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.AbstractCookieSpec void registerAttribHandler(java.lang.String, org.apache.http.cookie.CookieAttributeHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -311,6 +401,9 @@
     <item name='org.apache.http.impl.cookie.BasicPathHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.RFC2109Spec java.util.List&lt;org.apache.http.Header&gt; formatCookies(java.util.List&lt;org.apache.http.cookie.Cookie&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.cookie.RFC2109DomainHandler void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -323,19 +416,25 @@
     <item name='org.apache.http.impl.cookie.RFC2109Spec java.util.List&lt;org.apache.http.cookie.Cookie&gt; parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BasicSecureHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
+    <item name='org.apache.http.impl.cookie.AbstractCookieAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.BrowserCompatSpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.impl.cookie.RFC2965CommentUrlAttributeHandler boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.BasicSecureHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.cookie.NetscapeDraftHeaderParser org.apache.http.HeaderElement parseHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.cookie.CookieSpecBase java.lang.String getDefaultPath(org.apache.http.cookie.CookieOrigin) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.cookie.BasicMaxAgeHandler void parse(org.apache.http.cookie.SetCookie, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.cookie.CookieSpecBase java.lang.String getDefaultPath(org.apache.http.cookie.CookieOrigin) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.cookie.BestMatchSpecFactory org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/impl/entity/annotations.xml b/android-sdk-annotations/org/apache/http/impl/entity/annotations.xml
index ba6767ebd00..b9375f6fa57 100644
--- a/android-sdk-annotations/org/apache/http/impl/entity/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/impl/entity/annotations.xml
@@ -1,7 +1,4 @@
 <root>
-    <item name='org.apache.http.impl.entity.EntityDeserializer org.apache.http.entity.BasicHttpEntity doDeserialize(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpMessage)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.entity.EntitySerializer void serialize(org.apache.http.io.SessionOutputBuffer, org.apache.http.HttpMessage, org.apache.http.HttpEntity) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,22 +20,25 @@
     <item name='org.apache.http.impl.entity.EntitySerializer void serialize(org.apache.http.io.SessionOutputBuffer, org.apache.http.HttpMessage, org.apache.http.HttpEntity) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.entity.EntityDeserializer org.apache.http.HttpEntity deserialize(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpMessage)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.entity.EntityDeserializer org.apache.http.HttpEntity deserialize(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpMessage) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.entity.EntityDeserializer org.apache.http.entity.BasicHttpEntity doDeserialize(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpMessage)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.entity.StrictContentLengthStrategy long determineLength(org.apache.http.HttpMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.entity.LaxContentLengthStrategy long determineLength(org.apache.http.HttpMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.entity.EntitySerializer EntitySerializer(org.apache.http.entity.ContentLengthStrategy) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.impl.entity.EntityDeserializer org.apache.http.HttpEntity deserialize(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpMessage)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.impl.entity.EntitySerializer java.io.OutputStream doSerialize(org.apache.http.io.SessionOutputBuffer, org.apache.http.HttpMessage)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.entity.EntitySerializer EntitySerializer(org.apache.http.entity.ContentLengthStrategy) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/impl/io/annotations.xml b/android-sdk-annotations/org/apache/http/impl/io/annotations.xml
index 287d906a3f6..f3c437a3eea 100644
--- a/android-sdk-annotations/org/apache/http/impl/io/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/impl/io/annotations.xml
@@ -1,4 +1,7 @@
 <root>
+    <item name='org.apache.http.impl.io.AbstractMessageWriter void writeHeadLine(org.apache.http.HttpMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.io.IdentityOutputStream IdentityOutputStream(org.apache.http.io.SessionOutputBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,12 +14,18 @@
     <item name='org.apache.http.impl.io.AbstractMessageParser AbstractMessageParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.params.HttpParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.io.AbstractSessionOutputBuffer void init(java.io.OutputStream, int, org.apache.http.params.HttpParams) 0'>
+    <item name='org.apache.http.impl.io.AbstractSessionOutputBuffer void write(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.io.AbstractSessionInputBuffer int readLine(org.apache.http.util.CharArrayBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.io.AbstractSessionOutputBuffer void init(java.io.OutputStream, int, org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.io.ChunkedOutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.io.IdentityInputStream IdentityInputStream(org.apache.http.io.SessionInputBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,6 +41,9 @@
     <item name='org.apache.http.impl.io.HttpRequestParser HttpRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.io.AbstractMessageParser org.apache.http.HttpMessage parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.io.AbstractMessageWriter AbstractMessageWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.message.LineFormatter, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,19 +53,22 @@
     <item name='org.apache.http.impl.io.HttpResponseParser HttpResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.io.ContentLengthInputStream int read(byte[]) 0'>
+    <item name='org.apache.http.impl.io.ContentLengthOutputStream void write(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.io.ContentLengthOutputStream void write(byte[]) 0'>
+    <item name='org.apache.http.impl.io.ContentLengthInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.io.SocketInputBuffer SocketInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.io.ChunkedInputStream int read(byte[]) 0'>
+    <item name='org.apache.http.impl.io.AbstractSessionInputBuffer int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.io.AbstractMessageParser org.apache.http.HttpMessage parse()'>
+    <item name='org.apache.http.impl.io.ContentLengthInputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.io.ChunkedInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.io.ChunkedInputStream ChunkedInputStream(org.apache.http.io.SessionInputBuffer) 0'>
@@ -71,6 +86,12 @@
     <item name='org.apache.http.impl.io.HttpRequestWriter HttpRequestWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.message.LineFormatter, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.io.AbstractMessageParser org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.io.AbstractSessionOutputBuffer void write(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.io.HttpRequestWriter void writeHeadLine(org.apache.http.HttpMessage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -83,27 +104,42 @@
     <item name='org.apache.http.impl.io.HttpResponseWriter HttpResponseWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.message.LineFormatter, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.io.HttpRequestParser HttpRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams) 0'>
+    <item name='org.apache.http.impl.io.AbstractSessionInputBuffer int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.io.AbstractMessageParser org.apache.http.Header[] parseHeaders(org.apache.http.io.SessionInputBuffer, int, int, org.apache.http.message.LineParser)'>
+    <item name='org.apache.http.impl.io.ContentLengthOutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.io.IdentityOutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.io.IdentityInputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.impl.io.HttpRequestParser HttpRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.io.HttpResponseParser HttpResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.io.IdentityOutputStream void write(byte[]) 0'>
+    <item name='org.apache.http.impl.io.ChunkedInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.impl.io.AbstractMessageParser AbstractMessageParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.params.HttpParams) 0'>
+    <item name='org.apache.http.impl.io.IdentityOutputStream void write(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.impl.io.HttpRequestParser HttpRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.io.AbstractMessageParser AbstractMessageParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.io.ContentLengthOutputStream ContentLengthOutputStream(org.apache.http.io.SessionOutputBuffer, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.impl.io.AbstractMessageParser org.apache.http.Header[] parseHeaders(org.apache.http.io.SessionInputBuffer, int, int, org.apache.http.message.LineParser)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.impl.io.SocketOutputBuffer SocketOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/http/io/annotations.xml b/android-sdk-annotations/org/apache/http/io/annotations.xml
new file mode 100644
index 00000000000..88194d8a1fd
--- /dev/null
+++ b/android-sdk-annotations/org/apache/http/io/annotations.xml
@@ -0,0 +1,23 @@
+<root>
+    <item name='org.apache.http.io.SessionInputBuffer int read(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.io.SessionOutputBuffer void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.io.SessionOutputBuffer void write(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.io.HttpMessageWriter void write(org.apache.http.HttpMessage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.io.SessionInputBuffer int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.io.HttpMessageParser org.apache.http.HttpMessage parse()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.io.SessionInputBuffer int readLine(org.apache.http.util.CharArrayBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/android-sdk-annotations/org/apache/http/message/annotations.xml b/android-sdk-annotations/org/apache/http/message/annotations.xml
index 2fb68a4f4eb..11eaae1913e 100644
--- a/android-sdk-annotations/org/apache/http/message/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/message/annotations.xml
@@ -8,9 +8,6 @@
     <item name='org.apache.http.message.BasicLineFormatter int estimateProtocolVersionLen(org.apache.http.ProtocolVersion) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineFormatter java.lang.String formatStatusLine(org.apache.http.StatusLine, org.apache.http.message.LineFormatter)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.message.BasicHttpEntityEnclosingRequest BasicHttpEntityEnclosingRequest(org.apache.http.RequestLine) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,19 +17,34 @@
     <item name='org.apache.http.message.BasicHeaderElement BasicHeaderElement(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicStatusLine java.lang.String toString()'>
+    <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer appendProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.ProtocolVersion)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair[], boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicHeaderValueFormatter java.lang.String formatElements(org.apache.http.HeaderElement[], boolean, org.apache.http.message.HeaderValueFormatter)'>
+    <item name='org.apache.http.message.LineParser org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHttpRequest BasicHttpRequest(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair createNameValuePair(java.lang.String, java.lang.String)'>
+    <item name='org.apache.http.message.HeaderValueFormatter org.apache.http.util.CharArrayBuffer formatHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.AbstractHttpMessage org.apache.http.HeaderIterator headerIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer formatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine createRequestLine(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement, boolean) 1'>
@@ -41,16 +53,19 @@
     <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatElements(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement[], boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.AbstractHttpMessage org.apache.http.Header[] getHeaders(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicHttpEntityEnclosingRequest BasicHttpEntityEnclosingRequest(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineFormatter void doFormatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicRequestLine java.lang.String getMethod()'>
+    <item name='org.apache.http.message.BasicStatusLine BasicStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicStatusLine BasicStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String) 0'>
+    <item name='org.apache.http.message.LineParser boolean hasProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer formatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine) 1'>
@@ -65,7 +80,7 @@
     <item name='org.apache.http.message.BasicLineParser org.apache.http.StatusLine parseStatusLine(java.lang.String, org.apache.http.message.LineParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BufferedHeader org.apache.http.util.CharArrayBuffer getBuffer()'>
+    <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatElements(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement[], boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair createNameValuePair(java.lang.String, java.lang.String) 0'>
@@ -74,31 +89,40 @@
     <item name='org.apache.http.message.BasicListHeaderIterator BasicListHeaderIterator(java.util.List, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineParser org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+    <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.AbstractHttpMessage org.apache.http.HeaderIterator headerIterator()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair[], boolean)'>
+    <item name='org.apache.http.message.LineFormatter org.apache.http.util.CharArrayBuffer formatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHttpResponse void setStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor, char[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair[] parseParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineParser org.apache.http.Header parseHeader(org.apache.http.util.CharArrayBuffer)'>
+    <item name='org.apache.http.message.BasicHeaderValueFormatter java.lang.String formatParameters(org.apache.http.NameValuePair[], boolean, org.apache.http.message.HeaderValueFormatter)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHttpEntityEnclosingRequest BasicHttpEntityEnclosingRequest(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.Header parseHeader(org.apache.http.util.CharArrayBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.AbstractHttpMessage void setHeader(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer appendProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.ProtocolVersion)'>
+    <item name='org.apache.http.message.HeaderValueFormatter org.apache.http.util.CharArrayBuffer formatParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair[], boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine parseRequestLine(java.lang.String, org.apache.http.message.LineParser) 0'>
@@ -107,66 +131,111 @@
     <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair[], boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.ParserCursor java.lang.String toString()'>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineParser void skipWhitespace(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicRequestLine org.apache.http.ProtocolVersion getProtocolVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicLineParser org.apache.http.ProtocolVersion createProtocolVersion(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineFormatter org.apache.http.util.CharArrayBuffer appendProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.ProtocolVersion) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicLineParser boolean hasProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor, char[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicRequestLine org.apache.http.ProtocolVersion getProtocolVersion()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeader java.lang.String getName()'>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.HeaderElement[] parseElements(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair[] parseParameters(java.lang.String, org.apache.http.message.HeaderValueParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BufferedHeader java.lang.String getName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeaderValueFormatter java.lang.String formatParameters(org.apache.http.NameValuePair[], boolean, org.apache.http.message.HeaderValueFormatter)'>
+    <item name='org.apache.http.message.BasicLineFormatter java.lang.String formatHeader(org.apache.http.Header, org.apache.http.message.LineFormatter)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine createRequestLine(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.AbstractHttpMessage org.apache.http.Header[] getHeaders(java.lang.String)'>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.NameValuePair[] parseParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicHeaderValueFormatter java.lang.String formatNameValuePair(org.apache.http.NameValuePair, boolean, org.apache.http.message.HeaderValueFormatter)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair[] parseParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicLineFormatter java.lang.String formatRequestLine(org.apache.http.RequestLine, org.apache.http.message.LineFormatter)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.ProtocolVersion parseProtocolVersion(java.lang.String, org.apache.http.message.LineParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.HeaderGroup org.apache.http.HeaderIterator iterator(java.lang.String)'>
+    <item name='org.apache.http.message.BasicHttpResponse BasicHttpResponse(org.apache.http.ProtocolVersion, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicHttpResponse BasicHttpResponse(org.apache.http.ProtocolVersion, int, java.lang.String) 0'>
+    <item name='org.apache.http.message.BasicLineFormatter java.lang.String formatStatusLine(org.apache.http.StatusLine, org.apache.http.message.LineFormatter)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineFormatter void doFormatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer formatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine)'>
+    <item name='org.apache.http.message.BasicLineParser org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicRequestLine java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicHeader java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicNameValuePair java.lang.String getName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.LineFormatter org.apache.http.util.CharArrayBuffer formatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicRequestLine java.lang.String getUri()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.Header parseHeader(org.apache.http.util.CharArrayBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineFormatter org.apache.http.util.CharArrayBuffer formatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicHeader java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.HeaderValueFormatter org.apache.http.util.CharArrayBuffer formatElements(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement[], boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicLineParser org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicHttpResponse void setStatusLine(org.apache.http.ProtocolVersion, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -176,31 +245,28 @@
     <item name='org.apache.http.message.BasicLineParser org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicRequestLine java.lang.String getUri()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHttpRequest BasicHttpRequest(java.lang.String, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.HeaderGroup org.apache.http.message.HeaderGroup copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair, boolean)'>
+    <item name='org.apache.http.message.HeaderValueFormatter org.apache.http.util.CharArrayBuffer formatParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair[], boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BufferedHeader java.lang.String getValue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicHttpRequest BasicHttpRequest(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer initBuffer(org.apache.http.util.CharArrayBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineFormatter org.apache.http.util.CharArrayBuffer appendProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.ProtocolVersion)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicLineFormatter void doFormatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineParser org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeaderValueFormatter java.lang.String formatNameValuePair(org.apache.http.NameValuePair, boolean, org.apache.http.message.HeaderValueFormatter)'>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.HeaderElement[] parseElements(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine createRequestLine(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 1'>
@@ -212,51 +278,54 @@
     <item name='org.apache.http.message.BasicLineParser org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineParser org.apache.http.StatusLine createStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String)'>
+    <item name='org.apache.http.message.LineParser boolean hasProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicNameValuePair java.lang.String getName()'>
+    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair createNameValuePair(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.AbstractHttpMessage void setParams(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicLineFormatter void doFormatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicHeaderValueFormatter java.lang.String formatHeaderElement(org.apache.http.HeaderElement, boolean, org.apache.http.message.HeaderValueFormatter)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicStatusLine org.apache.http.ProtocolVersion getProtocolVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicTokenIterator BasicTokenIterator(org.apache.http.HeaderIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.Header parseHeader(java.lang.String, org.apache.http.message.LineParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.HeaderElement createHeaderElement(java.lang.String, java.lang.String, org.apache.http.NameValuePair[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BufferedHeader BufferedHeader(org.apache.http.util.CharArrayBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicHeader java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor, char[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BufferedHeader java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeaderValueFormatter java.lang.String formatHeaderElement(org.apache.http.HeaderElement, boolean, org.apache.http.message.HeaderValueFormatter)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer formatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineFormatter java.lang.String formatProtocolVersion(org.apache.http.ProtocolVersion, org.apache.http.message.LineFormatter)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.message.BasicRequestLine BasicRequestLine(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -269,7 +338,16 @@
     <item name='org.apache.http.message.BasicLineFormatter void doFormatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.AbstractHttpMessage org.apache.http.HeaderIterator headerIterator(java.lang.String)'>
+    <item name='org.apache.http.message.HeaderGroup org.apache.http.HeaderIterator iterator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.HeaderGroup org.apache.http.message.HeaderGroup copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BufferedHeader org.apache.http.util.CharArrayBuffer getBuffer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.HeaderGroup org.apache.http.Header[] getHeaders(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
@@ -281,84 +359,99 @@
     <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine createRequestLine(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineFormatter java.lang.String formatRequestLine(org.apache.http.RequestLine, org.apache.http.message.LineFormatter)'>
+    <item name='org.apache.http.message.BasicStatusLine java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicRequestLine java.lang.String toString()'>
+    <item name='org.apache.http.message.LineFormatter org.apache.http.util.CharArrayBuffer formatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderElement BasicHeaderElement(java.lang.String, java.lang.String, org.apache.http.NameValuePair[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineParser org.apache.http.ProtocolVersion createProtocolVersion(int, int)'>
+    <item name='org.apache.http.message.BasicLineParser org.apache.http.Header parseHeader(org.apache.http.util.CharArrayBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.NameValuePair[] parseParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicRequestLine BasicRequestLine(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicTokenIterator java.lang.String createToken(java.lang.String, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicLineParser boolean hasProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHttpRequest BasicHttpRequest(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicTokenIterator java.lang.String createToken(java.lang.String, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine createRequestLine(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicLineFormatter java.lang.String formatHeader(org.apache.http.Header, org.apache.http.message.LineFormatter)'>
+    <item name='org.apache.http.message.HeaderValueFormatter org.apache.http.util.CharArrayBuffer formatNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor, char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.AbstractHttpMessage org.apache.http.HeaderIterator headerIterator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicHttpResponse void setLocale(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer formatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.HeaderElement parseHeaderElement(java.lang.String, org.apache.http.message.HeaderValueParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BufferedHeader java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicHttpEntityEnclosingRequest BasicHttpEntityEnclosingRequest(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatElements(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement[], boolean)'>
+    <item name='org.apache.http.message.BasicHeaderValueFormatter java.lang.String formatElements(org.apache.http.HeaderElement[], boolean, org.apache.http.message.HeaderValueFormatter)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.HeaderElement createHeaderElement(java.lang.String, java.lang.String, org.apache.http.NameValuePair[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BufferedHeader java.lang.String getName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicHttpRequest BasicHttpRequest(org.apache.http.RequestLine) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.HeaderValueFormatter org.apache.http.util.CharArrayBuffer formatNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.HeaderElement[] parseElements(java.lang.String, org.apache.http.message.HeaderValueParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.HeaderGroup org.apache.http.Header[] getHeaders(java.lang.String)'>
+    <item name='org.apache.http.message.BasicHeaderElement java.lang.String getName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderElementIterator BasicHeaderElementIterator(org.apache.http.HeaderIterator, org.apache.http.message.HeaderValueParser) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer formatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.HeaderElement createHeaderElement(java.lang.String, java.lang.String, org.apache.http.NameValuePair[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.message.HeaderGroup org.apache.http.HeaderIterator iterator()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.HeaderValueFormatter org.apache.http.util.CharArrayBuffer formatElements(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement[], boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicTokenIterator java.lang.String createToken(java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -368,10 +461,19 @@
     <item name='org.apache.http.message.BasicHttpEntityEnclosingRequest BasicHttpEntityEnclosingRequest(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicHeaderValueFormatter org.apache.http.util.CharArrayBuffer formatHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineFormatter org.apache.http.util.CharArrayBuffer formatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer formatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer initBuffer(org.apache.http.util.CharArrayBuffer)'>
+    <item name='org.apache.http.message.HeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineFormatter org.apache.http.util.CharArrayBuffer appendProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.ProtocolVersion) 1'>
@@ -380,10 +482,19 @@
     <item name='org.apache.http.message.BasicLineFormatter void doFormatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicHttpResponse BasicHttpResponse(org.apache.http.StatusLine) 0'>
+    <item name='org.apache.http.message.BasicHttpResponse void setReasonPhrase(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicLineParser org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+    <item name='org.apache.http.message.HeaderValueFormatter org.apache.http.util.CharArrayBuffer formatHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicNameValuePair java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicHeaderElement java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.BasicHttpResponse BasicHttpResponse(org.apache.http.StatusLine) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicLineParser org.apache.http.Header parseHeader(org.apache.http.util.CharArrayBuffer) 0'>
@@ -395,7 +506,10 @@
     <item name='org.apache.http.message.BasicHttpResponse void setStatusLine(org.apache.http.StatusLine) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicNameValuePair java.lang.String toString()'>
+    <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.HeaderGroup java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHeaderValueParser org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
@@ -404,16 +518,13 @@
     <item name='org.apache.http.message.BasicHeaderElementIterator BasicHeaderElementIterator(org.apache.http.HeaderIterator, org.apache.http.message.HeaderValueParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicHeaderElement java.lang.String toString()'>
+    <item name='org.apache.http.message.AbstractHttpMessage org.apache.http.Header[] getHeaders(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicStatusLine org.apache.http.ProtocolVersion getProtocolVersion()'>
+    <item name='org.apache.http.message.BasicLineFormatter java.lang.String formatProtocolVersion(org.apache.http.ProtocolVersion, org.apache.http.message.LineFormatter)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.message.BasicHeaderElement java.lang.String getName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.message.HeaderGroup java.lang.Object clone()'>
+    <item name='org.apache.http.message.BasicLineParser org.apache.http.StatusLine createStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.message.BasicHttpRequest BasicHttpRequest(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 0'>
@@ -425,7 +536,16 @@
     <item name='org.apache.http.message.BasicHttpEntityEnclosingRequest BasicHttpEntityEnclosingRequest(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.BasicRequestLine java.lang.String getMethod()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.message.BasicNameValuePair BasicNameValuePair(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.message.ParserCursor java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.message.LineParser org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/params/annotations.xml b/android-sdk-annotations/org/apache/http/params/annotations.xml
index 2f46e634188..5c54d1f3061 100644
--- a/android-sdk-annotations/org/apache/http/params/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/params/annotations.xml
@@ -1,20 +1,29 @@
 <root>
-    <item name='org.apache.http.params.HttpProtocolParams java.lang.String getHttpElementCharset(org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.params.HttpConnectionParams void setLinger(org.apache.http.params.HttpParams, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.HttpConnectionParams int getSoTimeout(org.apache.http.params.HttpParams) 0'>
+    <item name='org.apache.http.params.HttpParams org.apache.http.params.HttpParams setBooleanParameter(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpProtocolParams java.lang.String getContentCharset(org.apache.http.params.HttpParams)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpProtocolParams java.lang.String getHttpElementCharset(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.BasicHttpParams boolean removeParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.params.HttpConnectionParams void setSocketBufferSize(org.apache.http.params.HttpParams, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.AbstractHttpParams org.apache.http.params.HttpParams setDoubleParameter(java.lang.String, double)'>
+    <item name='org.apache.http.params.HttpParams org.apache.http.params.HttpParams setIntParameter(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.HttpConnectionParams void setStaleCheckingEnabled(org.apache.http.params.HttpParams, boolean) 0'>
+    <item name='org.apache.http.params.DefaultedHttpParams org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpParams java.lang.Object getParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.params.HttpProtocolParams void setUseExpectContinue(org.apache.http.params.HttpParams, boolean) 0'>
@@ -23,7 +32,7 @@
     <item name='org.apache.http.params.AbstractHttpParams org.apache.http.params.HttpParams setIntParameter(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.HttpProtocolParams java.lang.String getContentCharset(org.apache.http.params.HttpParams)'>
+    <item name='org.apache.http.params.HttpParams org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.params.HttpProtocolParams java.lang.String getContentCharset(org.apache.http.params.HttpParams) 0'>
@@ -38,10 +47,16 @@
     <item name='org.apache.http.params.AbstractHttpParams org.apache.http.params.HttpParams setLongParameter(java.lang.String, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.AbstractHttpParams org.apache.http.params.HttpParams setBooleanParameter(java.lang.String, boolean)'>
+    <item name='org.apache.http.params.HttpConnectionParams void setConnectionTimeout(org.apache.http.params.HttpParams, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.HttpConnectionParams void setConnectionTimeout(org.apache.http.params.HttpParams, int) 0'>
+    <item name='org.apache.http.params.BasicHttpParams org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.DefaultedHttpParams org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpProtocolParams java.lang.String getHttpElementCharset(org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.params.HttpConnectionParams void setTcpNoDelay(org.apache.http.params.HttpParams, boolean) 0'>
@@ -50,52 +65,19 @@
     <item name='org.apache.http.params.HttpProtocolParams void setHttpElementCharset(org.apache.http.params.HttpParams, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.DefaultedHttpParams org.apache.http.params.HttpParams copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.params.HttpConnectionParams boolean getTcpNoDelay(org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.params.BasicHttpParams org.apache.http.params.HttpParams copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.params.HttpAbstractParamBean HttpAbstractParamBean(org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.params.HttpConnectionParams int getLinger(org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.params.DefaultedHttpParams DefaultedHttpParams(org.apache.http.params.HttpParams, org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.params.HttpConnectionParams int getSocketBufferSize(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.params.HttpProtocolParams void setVersion(org.apache.http.params.HttpParams, org.apache.http.ProtocolVersion) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.HttpProtocolParams java.lang.String getHttpElementCharset(org.apache.http.params.HttpParams)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.params.BasicHttpParams org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.params.HttpConnectionParams void setSoTimeout(org.apache.http.params.HttpParams, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.HttpProtocolParams void setContentCharset(org.apache.http.params.HttpParams, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.params.HttpProtocolParams org.apache.http.ProtocolVersion getVersion(org.apache.http.params.HttpParams) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.HttpProtocolParams java.lang.String getUserAgent(org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.params.HttpConnectionParamBean HttpConnectionParamBean(org.apache.http.params.HttpParams) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.params.HttpConnectionParams boolean isStaleCheckingEnabled(org.apache.http.params.HttpParams) 0'>
+    <item name='org.apache.http.params.BasicHttpParams org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.params.HttpProtocolParamBean HttpProtocolParamBean(org.apache.http.params.HttpParams) 0'>
@@ -104,10 +86,82 @@
     <item name='org.apache.http.params.BasicHttpParams void setParameters(java.lang.String[], java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.params.HttpConnectionParams int getConnectionTimeout(org.apache.http.params.HttpParams) 0'>
+    <item name='org.apache.http.params.HttpParams org.apache.http.params.HttpParams copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.BasicHttpParams org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.params.HttpProtocolParams org.apache.http.ProtocolVersion getVersion(org.apache.http.params.HttpParams)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.params.HttpConnectionParams int getSoTimeout(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.AbstractHttpParams org.apache.http.params.HttpParams setBooleanParameter(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.AbstractHttpParams org.apache.http.params.HttpParams setDoubleParameter(java.lang.String, double)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.BasicHttpParams java.lang.Object getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpParams org.apache.http.params.HttpParams setLongParameter(java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpConnectionParams void setStaleCheckingEnabled(org.apache.http.params.HttpParams, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpParams org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.DefaultedHttpParams boolean removeParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpConnectionParams boolean getTcpNoDelay(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpConnectionParams int getLinger(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpAbstractParamBean HttpAbstractParamBean(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.DefaultedHttpParams DefaultedHttpParams(org.apache.http.params.HttpParams, org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpParams boolean removeParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.DefaultedHttpParams org.apache.http.params.HttpParams copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.BasicHttpParams org.apache.http.params.HttpParams copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpProtocolParams void setContentCharset(org.apache.http.params.HttpParams, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpConnectionParamBean HttpConnectionParamBean(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpProtocolParams java.lang.String getUserAgent(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.DefaultedHttpParams java.lang.Object getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpParams org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpConnectionParams boolean isStaleCheckingEnabled(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpConnectionParams int getConnectionTimeout(org.apache.http.params.HttpParams) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.params.HttpParams org.apache.http.params.HttpParams setDoubleParameter(java.lang.String, double)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/protocol/annotations.xml b/android-sdk-annotations/org/apache/http/protocol/annotations.xml
index ce0273c8cfb..7c6b3e7e3b6 100644
--- a/android-sdk-annotations/org/apache/http/protocol/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/protocol/annotations.xml
@@ -1,17 +1,32 @@
 <root>
-    <item name='org.apache.http.protocol.HttpRequestExecutor void preProcess(org.apache.http.HttpRequest, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 1'>
+    <item name='org.apache.http.protocol.HttpContext void setAttribute(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse doSendRequest(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.HttpRequestExecutor void postProcess(org.apache.http.HttpResponse, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 1'>
+    <item name='org.apache.http.protocol.HttpRequestExecutor void preProcess(org.apache.http.HttpRequest, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.BasicHttpProcessor void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.RequestDate void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.RequestExpectContinue void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.HttpRequestInterceptorList void setInterceptors(java.util.List) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.ResponseConnControl void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.HttpService void handleException(org.apache.http.HttpException, org.apache.http.HttpResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.ResponseConnControl void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+    <item name='org.apache.http.protocol.HttpRequestExecutor void postProcess(org.apache.http.HttpResponse, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.UriPatternMatcher void register(java.lang.String, java.lang.Object) 0'>
@@ -23,12 +38,21 @@
     <item name='org.apache.http.protocol.HttpRequestHandlerRegistry void register(java.lang.String, org.apache.http.protocol.HttpRequestHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.RequestUserAgent void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.DefaultedHttpContext void setAttribute(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.RequestConnControl void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.UriPatternMatcher void register(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.SyncBasicHttpContext void setAttribute(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.ResponseContent void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -38,6 +62,12 @@
     <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse doReceiveResponse(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.HttpContext java.lang.Object removeAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.ResponseServer void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.HttpRequestExecutor void preProcess(org.apache.http.HttpRequest, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -47,7 +77,13 @@
     <item name='org.apache.http.protocol.RequestDate void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.BasicHttpProcessor org.apache.http.protocol.BasicHttpProcessor copy()'>
+    <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse execute(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.HttpContext java.lang.Object getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.BasicHttpProcessor void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.HttpRequestHandlerRegistry boolean matchUriRequestPattern(java.lang.String, java.lang.String) 0'>
@@ -62,15 +98,18 @@
     <item name='org.apache.http.protocol.SyncBasicHttpContext java.lang.Object getAttribute(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.HttpRequestExecutor void postProcess(org.apache.http.HttpResponse, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.protocol.ResponseConnControl void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.HttpRequestExecutor void postProcess(org.apache.http.HttpResponse, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.ResponseDate void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.RequestConnControl void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.BasicHttpContext java.lang.Object getAttribute(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -86,18 +125,24 @@
     <item name='org.apache.http.protocol.UriPatternMatcher boolean matchUriRequestPattern(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse execute(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) 2'>
+    <item name='org.apache.http.protocol.BasicHttpProcessor org.apache.http.protocol.BasicHttpProcessor copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.HttpService void setHttpProcessor(org.apache.http.protocol.HttpProcessor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse execute(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.HttpService void setResponseFactory(org.apache.http.HttpResponseFactory) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse doSendRequest(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.BasicHttpProcessor void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse execute(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -110,13 +155,22 @@
     <item name='org.apache.http.protocol.BasicHttpProcessor void setInterceptors(java.util.List) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.RequestContent void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.ResponseDate void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.DefaultedHttpContext java.lang.Object getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.HttpService void handleRequest(org.apache.http.HttpServerConnection, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse doReceiveResponse(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext)'>
+    <item name='org.apache.http.protocol.HttpRequestHandlerRegistry void setHandlers(java.util.Map) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.HttpRequestHandlerRegistry void setHandlers(java.util.Map) 0'>
+    <item name='org.apache.http.protocol.HttpResponseInterceptorList void setInterceptors(java.util.List) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse doSendRequest(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) 0'>
@@ -128,13 +182,22 @@
     <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse execute(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.HttpRequestExecutor void postProcess(org.apache.http.HttpResponse, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 0'>
+    <item name='org.apache.http.protocol.BasicHttpProcessor void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse doReceiveResponse(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.RequestTargetHost void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.RequestExpectContinue void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.RequestTargetHost void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) 1'>
+    <item name='org.apache.http.protocol.HttpRequestExecutor void postProcess(org.apache.http.HttpResponse, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.protocol.HttpContext void setAttribute(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.HttpRequestHandlerRegistry org.apache.http.protocol.HttpRequestHandler lookup(java.lang.String) 0'>
@@ -146,9 +209,15 @@
     <item name='org.apache.http.protocol.BasicHttpContext java.lang.Object removeAttribute(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.BasicHttpContext void setAttribute(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.HttpRequestExecutor boolean canResponseHaveBody(org.apache.http.HttpRequest, org.apache.http.HttpResponse) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.DefaultedHttpContext void setAttribute(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.HttpRequestExecutor void preProcess(org.apache.http.HttpRequest, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -161,7 +230,7 @@
     <item name='org.apache.http.protocol.UriPatternMatcher void setHandlers(java.util.Map) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse execute(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext)'>
+    <item name='org.apache.http.protocol.DefaultedHttpContext java.lang.Object removeAttribute(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.UriPatternMatcher java.lang.Object lookup(java.lang.String) 0'>
@@ -170,10 +239,16 @@
     <item name='org.apache.http.protocol.HttpRequestExecutor org.apache.http.HttpResponse doReceiveResponse(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.ResponseContent void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.protocol.HttpService HttpService(org.apache.http.protocol.HttpProcessor, org.apache.http.ConnectionReuseStrategy, org.apache.http.HttpResponseFactory) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.protocol.HttpService void handleRequest(org.apache.http.HttpServerConnection, org.apache.http.protocol.HttpContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.protocol.HttpRequestHandlerResolver org.apache.http.protocol.HttpRequestHandler lookup(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/http/util/annotations.xml b/android-sdk-annotations/org/apache/http/util/annotations.xml
index 3bed2b2f552..695c4463150 100644
--- a/android-sdk-annotations/org/apache/http/util/annotations.xml
+++ b/android-sdk-annotations/org/apache/http/util/annotations.xml
@@ -5,112 +5,112 @@
     <item name='org.apache.http.util.EncodingUtils java.lang.String getString(byte[], int, int, java.lang.String) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.EntityUtils byte[] toByteArray(org.apache.http.HttpEntity)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.util.EncodingUtils byte[] getBytes(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.VersionInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.VersionInfo java.lang.String getRelease()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.CharArrayBuffer java.lang.String substring(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.EncodingUtils java.lang.String getString(byte[], java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.util.EncodingUtils byte[] getBytes(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.VersionInfo org.apache.http.util.VersionInfo fromMap(java.lang.String, java.util.Map, java.lang.ClassLoader) 0'>
+    <item name='org.apache.http.util.EncodingUtils java.lang.String getString(byte[], java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.VersionInfo VersionInfo(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.VersionInfo org.apache.http.util.VersionInfo[] loadVersionInfo(java.lang.String[], java.lang.ClassLoader)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.CharArrayBuffer java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.EncodingUtils java.lang.String getString(byte[], java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.VersionInfo java.lang.String getClassloader()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.EncodingUtils java.lang.String getAsciiString(byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.EntityUtils java.lang.String toString(org.apache.http.HttpEntity, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.VersionInfo java.lang.String getModule()'>
+    <item name='org.apache.http.util.VersionInfo java.lang.String getRelease()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.util.ByteArrayBuffer byte[] toByteArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.EncodingUtils java.lang.String getString(byte[], int, int, java.lang.String)'>
+    <item name='org.apache.http.util.EntityUtils java.lang.String toString(org.apache.http.HttpEntity)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.EncodingUtils byte[] getAsciiBytes(java.lang.String) 0'>
+    <item name='org.apache.http.util.EntityUtils java.lang.String toString(org.apache.http.HttpEntity, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.EntityUtils java.lang.String getContentCharSet(org.apache.http.HttpEntity) 0'>
+    <item name='org.apache.http.util.CharArrayBuffer java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.VersionInfo org.apache.http.util.VersionInfo fromMap(java.lang.String, java.util.Map, java.lang.ClassLoader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.VersionInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.VersionInfo VersionInfo(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.util.EncodingUtils byte[] getAsciiBytes(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.util.EncodingUtils java.lang.String getString(byte[], java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.VersionInfo java.lang.String getPackage()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.EncodingUtils java.lang.String getAsciiString(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.EntityUtils byte[] toByteArray(org.apache.http.HttpEntity)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.VersionInfo java.lang.String getTimestamp()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.EntityUtils java.lang.String toString(org.apache.http.HttpEntity, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.util.CharArrayBuffer char[] toCharArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.util.VersionInfo java.lang.String getClassloader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.VersionInfo org.apache.http.util.VersionInfo[] loadVersionInfo(java.lang.String[], java.lang.ClassLoader)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.EncodingUtils byte[] getAsciiBytes(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.VersionInfo org.apache.http.util.VersionInfo fromMap(java.lang.String, java.util.Map, java.lang.ClassLoader)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.EntityUtils java.lang.String getContentCharSet(org.apache.http.HttpEntity) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.http.util.CharArrayBuffer java.lang.String substring(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.util.VersionInfo org.apache.http.util.VersionInfo[] loadVersionInfo(java.lang.String[], java.lang.ClassLoader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.EncodingUtils java.lang.String getAsciiString(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.util.EncodingUtils java.lang.String getAsciiString(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.CharArrayBuffer java.lang.String substringTrimmed(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.util.EncodingUtils java.lang.String getString(byte[], int, int, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.util.EntityUtils java.lang.String toString(org.apache.http.HttpEntity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.EntityUtils java.lang.String toString(org.apache.http.HttpEntity)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.http.util.EncodingUtils byte[] getBytes(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.util.EntityUtils byte[] toByteArray(org.apache.http.HttpEntity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.http.util.EncodingUtils java.lang.String getString(byte[], int, int, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.http.util.VersionInfo org.apache.http.util.VersionInfo loadVersionInfo(java.lang.String, java.lang.ClassLoader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.EntityUtils java.lang.String toString(org.apache.http.HttpEntity, java.lang.String)'>
+    <item name='org.apache.http.util.VersionInfo java.lang.String getModule()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.VersionInfo java.lang.String getTimestamp()'>
+    <item name='org.apache.http.util.CharArrayBuffer java.lang.String substringTrimmed(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.http.util.VersionInfo java.lang.String getPackage()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.http.util.VersionInfo org.apache.http.util.VersionInfo fromMap(java.lang.String, java.util.Map, java.lang.ClassLoader)'>
+    <item name='org.apache.http.util.EncodingUtils java.lang.String getAsciiString(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.http.util.EncodingUtils java.lang.String getString(byte[], java.lang.String) 1'>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/annotations.xml
index 60c4dc59323..d80afb12631 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/annotations.xml
@@ -1,17 +1,8 @@
 <root>
-    <item name='org.apache.james.mime4j.LogFactory org.apache.james.mime4j.Log getLog(java.lang.Class)'>
+    <item name='org.apache.james.mime4j.ContentHandler void epilogue(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.EOLConvertingInputStream EOLConvertingInputStream(java.io.InputStream, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.MimeBoundaryInputStream MimeBoundaryInputStream(java.io.InputStream, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.SimpleContentHandler void body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.CloseShieldInputStream int read(byte[]) 0'>
+    <item name='org.apache.james.mime4j.ContentHandler void preamble(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.SimpleContentHandler void field(java.lang.String) 0'>
@@ -23,7 +14,49 @@
     <item name='org.apache.james.mime4j.EOLConvertingInputStream EOLConvertingInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.AbstractContentHandler void preamble(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.AbstractContentHandler void body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.AbstractContentHandler void body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.CloseShieldInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.ContentHandler void body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.EOLConvertingInputStream EOLConvertingInputStream(java.io.InputStream, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.MimeBoundaryInputStream MimeBoundaryInputStream(java.io.InputStream, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.LogFactory org.apache.james.mime4j.Log getLog(java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.SimpleContentHandler void body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.CloseShieldInputStream int read(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.ContentHandler void field(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.SimpleContentHandler void body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.AbstractContentHandler void field(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.AbstractContentHandler void epilogue(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.ContentHandler void body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/codec/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/codec/annotations.xml
index 7d1c6a22643..07a1bad88fb 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/codec/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/codec/annotations.xml
@@ -1,20 +1,20 @@
 <root>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeQ(byte[], org.apache.james.mime4j.codec.EncoderUtil.Usage)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil.Usage org.apache.james.mime4j.codec.EncoderUtil.Usage valueOf(java.lang.String)'>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeHeaderParameter(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeEncodedWord(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeEncodedWord(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.codec.EncoderUtil boolean hasToBeEncoded(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil.Encoding org.apache.james.mime4j.codec.EncoderUtil.Encoding valueOf(java.lang.String)'>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil boolean isToken(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil boolean isToken(java.lang.String) 0'>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeAddressDisplayName(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeHeaderParameter(java.lang.String, java.lang.String) 1'>
@@ -23,25 +23,25 @@
     <item name='org.apache.james.mime4j.codec.EncoderUtil.Encoding org.apache.james.mime4j.codec.EncoderUtil.Encoding valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeAddressDisplayName(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeEncodedWord(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage, int, java.nio.charset.Charset, org.apache.james.mime4j.codec.EncoderUtil.Encoding) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeEncodedWord(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeAddressLocalPart(java.lang.String) 0'>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil.Usage org.apache.james.mime4j.codec.EncoderUtil.Usage valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeAddressLocalPart(java.lang.String)'>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeAddressLocalPart(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeB(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeEncodedWord(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage, int, java.nio.charset.Charset, org.apache.james.mime4j.codec.EncoderUtil.Encoding)'>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeIfNecessary(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil.Encoding org.apache.james.mime4j.codec.EncoderUtil.Encoding valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.codec.EncoderUtil.Usage org.apache.james.mime4j.codec.EncoderUtil.Usage valueOf(java.lang.String) 0'>
@@ -53,10 +53,13 @@
     <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeIfNecessary(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeIfNecessary(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage, int)'>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeAddressLocalPart(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeHeaderParameter(java.lang.String, java.lang.String)'>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeB(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeQ(byte[], org.apache.james.mime4j.codec.EncoderUtil.Usage)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeEncodedWord(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage) 0'>
@@ -65,10 +68,7 @@
     <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeQ(byte[], org.apache.james.mime4j.codec.EncoderUtil.Usage) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeB(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeEncodedWord(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage)'>
+    <item name='org.apache.james.mime4j.codec.EncoderUtil java.lang.String encodeEncodedWord(java.lang.String, org.apache.james.mime4j.codec.EncoderUtil.Usage, int, java.nio.charset.Charset, org.apache.james.mime4j.codec.EncoderUtil.Encoding)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/decoder/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/decoder/annotations.xml
index 431045f6306..bd5743c97e3 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/decoder/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/decoder/annotations.xml
@@ -1,8 +1,8 @@
 <root>
-    <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeEncodedWords(java.lang.String)'>
+    <item name='org.apache.james.mime4j.decoder.DecoderUtil byte[] decodeBaseQuotedPrintable(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.decoder.DecoderUtil byte[] decodeBaseQuotedPrintable(java.lang.String)'>
+    <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeEncodedWords(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeB(java.lang.String, java.lang.String) 1'>
@@ -11,16 +11,13 @@
     <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeQ(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeQ(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.decoder.DecoderUtil byte[] decodeBase64(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.decoder.ByteQueue java.util.Iterator iterator()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeB(java.lang.String, java.lang.String)'>
+    <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeQ(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeQ(java.lang.String, java.lang.String) 1'>
@@ -29,4 +26,7 @@
     <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeEncodedWords(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.decoder.DecoderUtil java.lang.String decodeB(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/field/address/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/field/address/annotations.xml
index 619f684562c..a696f26dd78 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/field/address/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/field/address/annotations.xml
@@ -2,16 +2,28 @@
     <item name='org.apache.james.mime4j.field.address.NamedMailbox NamedMailbox(java.lang.String, org.apache.james.mime4j.field.address.Mailbox) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.Mailbox java.lang.String toString()'>
+    <item name='org.apache.james.mime4j.field.address.Mailbox java.lang.String getAddressString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.address.Group java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.address.NamedMailbox java.lang.String getAddressString(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.address.DomainList java.lang.String toRouteString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.address.Address void doAddMailboxesTo(java.util.ArrayList&lt;org.apache.james.mime4j.field.address.Address&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.address.AddressList org.apache.james.mime4j.field.address.AddressList parse(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.Mailbox java.lang.String getAddressString()'>
+    <item name='org.apache.james.mime4j.field.address.Mailbox java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.address.Group void doAddMailboxesTo(java.util.ArrayList&lt;org.apache.james.mime4j.field.address.Address&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.address.AddressList org.apache.james.mime4j.field.address.AddressList parse(java.lang.String) 0'>
@@ -23,12 +35,6 @@
     <item name='org.apache.james.mime4j.field.address.Mailbox java.lang.String getAddressString(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.NamedMailbox java.lang.String getAddressString(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.address.DomainList java.lang.String toRouteString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.address.AddressList org.apache.james.mime4j.field.address.MailboxList flatten()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/field/address/parser/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/field/address/parser/annotations.xml
index 9b1d98deb89..56e6d844839 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/field/address/parser/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/field/address/parser/annotations.xml
@@ -2,6 +2,9 @@
     <item name='org.apache.james.mime4j.field.address.parser.TokenMgrError java.lang.String addEscapes(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.address.parser.SimpleNode java.lang.String toString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.address.parser.SimpleNode java.lang.Object jjtAccept(org.apache.james.mime4j.field.address.parser.AddressListParserVisitor, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,9 +14,6 @@
     <item name='org.apache.james.mime4j.field.address.parser.AddressListParser void ReInit(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.parser.AddressListParser org.apache.james.mime4j.field.address.parser.ParseException generateParseException()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.address.parser.TokenMgrError java.lang.String LexicalError(boolean, int, int, int, java.lang.String, char) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -35,24 +35,18 @@
     <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, java.lang.String, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.parser.AddressListParserTokenManager org.apache.james.mime4j.field.address.parser.Token getNextToken()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.address.parser.ParseException java.lang.String add_escapes(java.lang.String)'>
+    <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream java.lang.String GetImage()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.parser.AddressListParserTokenManager org.apache.james.mime4j.field.address.parser.Token jjFillToken()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream java.lang.String GetImage()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.address.parser.ParseException java.lang.String add_escapes(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.address.parser.ParseException java.lang.String add_escapes(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.address.parser.ASTmailbox java.lang.Object jjtAccept(org.apache.james.mime4j.field.address.parser.AddressListParserVisitor, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -62,21 +56,33 @@
     <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.parser.Token org.apache.james.mime4j.field.address.parser.Token newToken(int)'>
+    <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream char[] GetSuffix(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.address.parser.AddressListParserTokenManager org.apache.james.mime4j.field.address.parser.Token jjFillToken()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.address.parser.TokenMgrError java.lang.String addEscapes(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.address.parser.AddressListParserTokenManager org.apache.james.mime4j.field.address.parser.Token getNextToken()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.address.parser.AddressListParser org.apache.james.mime4j.field.address.parser.ParseException generateParseException()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream void ReInit(java.io.InputStream, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.parser.SimpleNode java.lang.String toString(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.address.parser.AddressListParser void ReInit(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.address.parser.ASTname_addr java.lang.Object jjtAccept(org.apache.james.mime4j.field.address.parser.AddressListParserVisitor, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.address.parser.Token org.apache.james.mime4j.field.address.parser.Token newToken(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream void ReInit(java.io.InputStream, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -86,9 +92,6 @@
     <item name='org.apache.james.mime4j.field.address.parser.ASTangle_addr java.lang.Object jjtAccept(org.apache.james.mime4j.field.address.parser.AddressListParserVisitor, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream char[] GetSuffix(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.address.parser.ASTroute java.lang.Object jjtAccept(org.apache.james.mime4j.field.address.parser.AddressListParserVisitor, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -101,13 +104,13 @@
     <item name='org.apache.james.mime4j.field.address.parser.ASTdomain java.lang.Object jjtAccept(org.apache.james.mime4j.field.address.parser.AddressListParserVisitor, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.address.parser.TokenMgrError java.lang.String LexicalError(boolean, int, int, int, java.lang.String, char)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.address.parser.TokenMgrError java.lang.String addEscapes(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.address.parser.TokenMgrError java.lang.String LexicalError(boolean, int, int, int, java.lang.String, char)'>
+    <item name='org.apache.james.mime4j.field.address.parser.Node java.lang.Object jjtAccept(org.apache.james.mime4j.field.address.parser.AddressListParserVisitor, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.address.parser.SimpleCharStream void ReInit(java.io.InputStream) 0'>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/field/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/field/annotations.xml
index 572727e04bc..0e9f3e15448 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/field/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/field/annotations.xml
@@ -1,49 +1,94 @@
 <root>
-    <item name='org.apache.james.mime4j.field.DelegatingFieldParser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.MailboxListField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.Field org.apache.james.mime4j.field.DefaultFieldParser getParser()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.AddressListField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.ContentTypeField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
+    <item name='org.apache.james.mime4j.field.FieldParser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.Field org.apache.james.mime4j.field.Field parse(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.DelegatingFieldParser void setFieldParser(java.lang.String, org.apache.james.mime4j.field.FieldParser) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.ContentTransferEncodingField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
+    <item name='org.apache.james.mime4j.field.DateTimeField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.DateTimeField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.ContentTypeField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
+    <item name='org.apache.james.mime4j.field.MailboxListField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.UnstructuredField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
+    <item name='org.apache.james.mime4j.field.FieldParser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.Field org.apache.james.mime4j.field.Field parse(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.AddressListField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.MailboxField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.ContentTransferEncodingField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.MailboxField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.ContentTransferEncodingField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
+    <item name='org.apache.james.mime4j.field.ContentTypeField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.DelegatingFieldParser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.UnstructuredField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.UnstructuredField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.MailboxListField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.DateTimeField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.DelegatingFieldParser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.ContentTypeField java.util.Map&lt;java.lang.String,java.lang.String&gt; getParameters()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.AddressListField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.DelegatingFieldParser void setFieldParser(java.lang.String, org.apache.james.mime4j.field.FieldParser) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.ContentTransferEncodingField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.MailboxField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.ContentTransferEncodingField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.MailboxListField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.ContentTypeField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.Field org.apache.james.mime4j.field.DefaultFieldParser getParser()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.UnstructuredField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.FieldParser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.ContentTypeField.Parser org.apache.james.mime4j.field.Field parse(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.DelegatingFieldParser org.apache.james.mime4j.field.FieldParser getParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/field/contenttype/parser/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/field/contenttype/parser/annotations.xml
index 46ec2a44457..2c1253a38ef 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/field/contenttype/parser/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/field/contenttype/parser/annotations.xml
@@ -5,40 +5,52 @@
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream void ReInit(java.io.InputStream, java.lang.String, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.contenttype.parser.TokenMgrError java.lang.String addEscapes(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream void ReInit(java.io.InputStream, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, java.lang.String, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream char[] GetSuffix(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream java.lang.String GetImage()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream void ReInit(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParserTokenManager org.apache.james.mime4j.field.contenttype.parser.Token jjFillToken()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParser void ReInit(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParser void ReInit(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.contenttype.parser.TokenMgrError java.lang.String LexicalError(boolean, int, int, int, java.lang.String, char)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParser org.apache.james.mime4j.field.contenttype.parser.ParseException generateParseException()'>
+    <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParserTokenManager org.apache.james.mime4j.field.contenttype.parser.Token getNextToken()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream void ReInit(java.io.InputStream, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.contenttype.parser.TokenMgrError java.lang.String LexicalError(boolean, int, int, int, java.lang.String, char)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream SimpleCharStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.contenttype.parser.ParseException java.lang.String add_escapes(java.lang.String)'>
+    <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParser ContentTypeParser(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParser ContentTypeParser(java.io.InputStream) 0'>
+    <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParser org.apache.james.mime4j.field.contenttype.parser.ParseException generateParseException()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream void ReInit(java.io.InputStream, java.lang.String) 0'>
@@ -53,7 +65,7 @@
     <item name='org.apache.james.mime4j.field.contenttype.parser.ParseException java.lang.String add_escapes(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream java.lang.String GetImage()'>
+    <item name='org.apache.james.mime4j.field.contenttype.parser.ParseException java.lang.String add_escapes(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, int, int, int) 0'>
@@ -65,24 +77,12 @@
     <item name='org.apache.james.mime4j.field.contenttype.parser.TokenMgrError java.lang.String addEscapes(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.contenttype.parser.TokenMgrError java.lang.String addEscapes(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParserTokenManager org.apache.james.mime4j.field.contenttype.parser.Token getNextToken()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.TokenMgrError TokenMgrError(boolean, int, int, int, java.lang.String, char, int) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.contenttype.parser.SimpleCharStream char[] GetSuffix(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParserTokenManager org.apache.james.mime4j.field.contenttype.parser.Token jjFillToken()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.contenttype.parser.ContentTypeParser ContentTypeParser(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/field/datetime/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/field/datetime/annotations.xml
index f5ee68fd721..35fd30da909 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/field/datetime/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/field/datetime/annotations.xml
@@ -1,14 +1,14 @@
 <root>
-    <item name='org.apache.james.mime4j.field.datetime.DateTime java.util.Date getDate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.datetime.DateTime java.util.Date convertToDate(int, int, int, int, int, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.DateTime org.apache.james.mime4j.field.datetime.DateTime parse(java.lang.String)'>
+    <item name='org.apache.james.mime4j.field.datetime.DateTime org.apache.james.mime4j.field.datetime.DateTime parse(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.DateTime org.apache.james.mime4j.field.datetime.DateTime parse(java.lang.String) 0'>
+    <item name='org.apache.james.mime4j.field.datetime.DateTime java.util.Date getDate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.datetime.DateTime org.apache.james.mime4j.field.datetime.DateTime parse(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.datetime.DateTime DateTime(java.lang.String, int, int, int, int, int, int) 0'>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/field/datetime/parser/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/field/datetime/parser/annotations.xml
index a9dee4b0c46..dc1fce90a42 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/field/datetime/parser/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/field/datetime/parser/annotations.xml
@@ -1,10 +1,4 @@
 <root>
-    <item name='org.apache.james.mime4j.field.datetime.parser.TokenMgrError java.lang.String addEscapes(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParserTokenManager org.apache.james.mime4j.field.datetime.parser.Token getNextToken()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream void ReInit(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,46 +14,49 @@
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream void ReInit(java.io.InputStream, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.parser.DateTimeParser.Time time()'>
+    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParserTokenManager org.apache.james.mime4j.field.datetime.parser.Token jjFillToken()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.parser.ParseException generateParseException()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.Token org.apache.james.mime4j.field.datetime.parser.Token newToken(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream java.lang.String GetImage()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream void ReInit(java.io.InputStream, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.TokenMgrError java.lang.String LexicalError(boolean, int, int, int, java.lang.String, char) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.DateTime parseAll()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream void ReInit(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.TokenMgrError java.lang.String LexicalError(boolean, int, int, int, java.lang.String, char)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser DateTimeParser(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream char[] GetSuffix(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.DateTime parseLine()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParserTokenManager org.apache.james.mime4j.field.datetime.parser.Token getNextToken()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.DateTime parseAll()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser DateTimeParser(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser void ReInit(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.parser.DateTimeParser.Date date()'>
+    <item name='org.apache.james.mime4j.field.datetime.parser.TokenMgrError java.lang.String addEscapes(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.parser.ParseException generateParseException()'>
+    <item name='org.apache.james.mime4j.field.datetime.parser.TokenMgrError java.lang.String LexicalError(boolean, int, int, int, java.lang.String, char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.TokenMgrError TokenMgrError(boolean, int, int, int, java.lang.String, char, int) 4'>
@@ -68,30 +65,30 @@
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.datetime.parser.ParseException java.lang.String add_escapes(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.DateTime date_time()'>
+    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.parser.DateTimeParser.Time time()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream SimpleCharStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.ParseException java.lang.String add_escapes(java.lang.String)'>
+    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.parser.DateTimeParser.Date date()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream SimpleCharStream(java.io.InputStream, java.lang.String, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream java.lang.String GetImage()'>
+    <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream char[] GetSuffix(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.TokenMgrError java.lang.String addEscapes(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParserTokenManager org.apache.james.mime4j.field.datetime.parser.Token jjFillToken()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser DateTimeParser(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -101,4 +98,7 @@
     <item name='org.apache.james.mime4j.field.datetime.parser.SimpleCharStream void ReInit(java.io.InputStream, java.lang.String, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.field.datetime.parser.DateTimeParser org.apache.james.mime4j.field.datetime.DateTime date_time()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/message/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/message/annotations.xml
index d037960f66f..39b0ef71fe6 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/message/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/message/annotations.xml
@@ -1,40 +1,52 @@
 <root>
+    <item name='org.apache.james.mime4j.message.Multipart java.util.List&lt;org.apache.james.mime4j.message.BodyPart&gt; getBodyParts()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.message.Body void writeTo(java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.message.Header java.util.List&lt;org.apache.james.mime4j.field.Field&gt; getFields()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.message.Header org.apache.james.mime4j.field.Field getField(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.message.Entity void writeTo(java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.message.Header void addField(org.apache.james.mime4j.field.Field) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.message.Multipart void setBodyParts(java.util.List&lt;org.apache.james.mime4j.message.BodyPart&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.message.Header java.util.List&lt;org.apache.james.mime4j.field.Field&gt; getFields()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.message.Header java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.message.Multipart java.util.List&lt;org.apache.james.mime4j.message.BodyPart&gt; getBodyParts()'>
+    <item name='org.apache.james.mime4j.message.Multipart void addBodyPart(org.apache.james.mime4j.message.BodyPart) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.message.Header java.util.List&lt;org.apache.james.mime4j.field.Field&gt; getFields(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.message.Multipart void addBodyPart(org.apache.james.mime4j.message.BodyPart) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.message.Multipart void writeTo(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.message.BodyPart void writeTo(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.message.Header java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.message.Header java.util.List&lt;org.apache.james.mime4j.field.Field&gt; getFields(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.message.TextBody java.io.Reader getReader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.message.Message void writeTo(java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.message.BinaryBody java.io.InputStream getInputStream()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.james.mime4j.message.Entity void setBody(org.apache.james.mime4j.message.Body) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/james/mime4j/util/annotations.xml b/android-sdk-annotations/org/apache/james/mime4j/util/annotations.xml
index 49f584461ae..a67b1850512 100644
--- a/android-sdk-annotations/org/apache/james/mime4j/util/annotations.xml
+++ b/android-sdk-annotations/org/apache/james/mime4j/util/annotations.xml
@@ -2,37 +2,64 @@
     <item name='org.apache.james.mime4j.util.PartialInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.util.CharsetUtil java.nio.charset.Charset getCharset(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.util.CharsetUtil boolean isDecodingSupported(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.util.PositionInputStream int read(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.util.CharsetUtil java.lang.String toJavaCharset(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.james.mime4j.util.CharsetUtil boolean isEncodingSupported(java.lang.String) 0'>
+    <item name='org.apache.james.mime4j.util.TempPath org.apache.james.mime4j.util.TempFile createTempFile()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.util.PartialInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.util.TempStorage void setInstance(org.apache.james.mime4j.util.TempStorage) 0'>
+    <item name='org.apache.james.mime4j.util.CharsetUtil java.lang.String toMimeCharset(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.util.CharsetUtil java.lang.String toMimeCharset(java.lang.String) 0'>
+    <item name='org.apache.james.mime4j.util.TempPath org.apache.james.mime4j.util.TempPath createTempPath()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.james.mime4j.util.PositionInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.james.mime4j.util.CharsetUtil boolean isWhitespace(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.james.mime4j.util.PartialInputStream PartialInputStream(java.io.InputStream, long, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.james.mime4j.util.TempFile java.lang.String getAbsolutePath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.CharsetUtil java.nio.charset.Charset getCharset(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.TempFile java.io.OutputStream getOutputStream()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.CharsetUtil java.lang.String toJavaCharset(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.PositionInputStream int read(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.TempPath org.apache.james.mime4j.util.TempPath createTempPath(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.CharsetUtil boolean isEncodingSupported(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.TempPath org.apache.james.mime4j.util.TempFile createTempFile(java.lang.String, java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.TempFile java.io.InputStream getInputStream()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.TempStorage void setInstance(org.apache.james.mime4j.util.TempStorage) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.TempPath org.apache.james.mime4j.util.TempFile createTempFile(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.TempPath java.lang.String getAbsolutePath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.james.mime4j.util.CharsetUtil boolean isWhitespace(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xalan/annotations.xml b/android-sdk-annotations/org/apache/xalan/annotations.xml
index 2a10166f439..f263c74c652 100644
--- a/android-sdk-annotations/org/apache/xalan/annotations.xml
+++ b/android-sdk-annotations/org/apache/xalan/annotations.xml
@@ -1,11 +1,11 @@
 <root>
-    <item name='org.apache.xalan.Version java.lang.String getImplementationLanguage()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.Version java.lang.String getVersion()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.Version java.lang.String getProduct()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.Version java.lang.String getImplementationLanguage()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xalan/extensions/annotations.xml b/android-sdk-annotations/org/apache/xalan/extensions/annotations.xml
index 63882adcbdb..6a9dc4a3c13 100644
--- a/android-sdk-annotations/org/apache/xalan/extensions/annotations.xml
+++ b/android-sdk-annotations/org/apache/xalan/extensions/annotations.xml
@@ -2,6 +2,9 @@
     <item name='org.apache.xalan.extensions.ExtensionsTable void addExtensionNamespace(java.lang.String, org.apache.xalan.extensions.ExtensionHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.extensions.ExpressionContext org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xml.utils.QName)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.extensions.ExtensionsTable java.lang.Object extFunction(org.apache.xpath.functions.FuncExtFunction, java.util.Vector, org.apache.xalan.extensions.ExpressionContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,6 +14,12 @@
     <item name='org.apache.xalan.extensions.ExtensionNamespacesManager void registerExtension(org.apache.xalan.extensions.ExtensionNamespaceSupport) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.extensions.ExpressionContext java.lang.String toString(org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.extensions.ExpressionContext org.w3c.dom.traversal.NodeIterator getContextNodes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.extensions.ExtensionNamespacesManager int namespaceIndex(java.lang.String, java.util.Vector) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/xalan/processor/annotations.xml b/android-sdk-annotations/org/apache/xalan/processor/annotations.xml
index 889cd75553d..b6803546b2e 100644
--- a/android-sdk-annotations/org/apache/xalan/processor/annotations.xml
+++ b/android-sdk-annotations/org/apache/xalan/processor/annotations.xml
@@ -2,75 +2,51 @@
     <item name='org.apache.xalan.processor.XSLTElementProcessor void characters(org.apache.xalan.processor.StylesheetHandler, char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.TransformerFactoryImpl javax.xml.transform.sax.TemplatesHandler newTemplatesHandler()'>
+    <item name='org.apache.xalan.processor.XSLTElementProcessor void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.ProcessorExsltFunction void appendAndPush(org.apache.xalan.processor.StylesheetHandler, org.apache.xalan.templates.ElemTemplateElement) 1'>
+    <item name='org.apache.xalan.processor.StylesheetHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.processor.ProcessorCharacters void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.TransformerFactoryImpl java.lang.Object getAttribute(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.ProcessorText void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.processor.ProcessorInclude void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.TransformerFactoryImpl javax.xml.transform.sax.TransformerHandler newTransformerHandler()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.ProcessorLRE org.apache.xalan.templates.Stylesheet getStylesheetRoot(org.apache.xalan.processor.StylesheetHandler) 0'>
+    <item name='org.apache.xalan.processor.StylesheetHandler void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.processor.ProcessorExsltFunction void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.TransformerFactoryImpl void setFeature(java.lang.String, boolean) 0'>
+    <item name='org.apache.xalan.processor.ProcessorInclude void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.ProcessorExsltFunction void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
+    <item name='org.apache.xalan.processor.ProcessorStylesheetElement org.apache.xalan.templates.Stylesheet getStylesheetRoot(org.apache.xalan.processor.StylesheetHandler)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.processor.ProcessorLRE void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.processor.ProcessorExsltFunction void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.processor.TransformerFactoryImpl org.xml.sax.XMLFilter newXMLFilter(javax.xml.transform.Source) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.TransformerFactoryImpl java.lang.Object getAttribute(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.ProcessorText void appendAndPush(org.apache.xalan.processor.StylesheetHandler, org.apache.xalan.templates.ElemTemplateElement) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.ProcessorExsltFuncResult void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.TransformerFactoryImpl void setAttribute(java.lang.String, java.lang.Object) 1'>
+    <item name='org.apache.xalan.processor.ProcessorInclude java.lang.String getStylesheetInclErr()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.processor.TransformerFactoryImpl javax.xml.transform.sax.TransformerHandler newTransformerHandler(javax.xml.transform.Source) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.ProcessorTemplateElem void appendAndPush(org.apache.xalan.processor.StylesheetHandler, org.apache.xalan.templates.ElemTemplateElement) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.StylesheetHandler org.apache.xpath.XPath createXPath(java.lang.String, org.apache.xalan.templates.ElemTemplateElement)'>
+    <item name='org.apache.xalan.processor.StylesheetHandler void startPrefixMapping(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.processor.ProcessorExsltFunction void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.TransformerFactoryImpl boolean getFeature(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.ProcessorStylesheetElement org.apache.xalan.templates.Stylesheet getStylesheetRoot(org.apache.xalan.processor.StylesheetHandler)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.processor.TransformerFactoryImpl javax.xml.transform.Templates newTemplates(javax.xml.transform.Source) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,16 +56,127 @@
     <item name='org.apache.xalan.processor.ProcessorExsltFunction void appendAndPush(org.apache.xalan.processor.StylesheetHandler, org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.processor.ProcessorImport java.lang.String getStylesheetInclErr()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler org.xml.sax.InputSource resolveEntity(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorLRE void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.processor.StylesheetHandler void fatalError(org.xml.sax.SAXParseException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.ProcessorCharacters void characters(org.apache.xalan.processor.StylesheetHandler, char[], int, int) 0'>
+    <item name='org.apache.xalan.processor.ProcessorStylesheetElement void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.processor.ProcessorInclude void parse(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.ProcessorStylesheetElement void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
+    <item name='org.apache.xalan.processor.ProcessorStylesheetElement org.apache.xalan.templates.Stylesheet getStylesheetRoot(org.apache.xalan.processor.StylesheetHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler void warning(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler StylesheetHandler(org.apache.xalan.processor.TransformerFactoryImpl) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler org.apache.xpath.XPath createXPath(java.lang.String, org.apache.xalan.templates.ElemTemplateElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorLRE void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorExsltFunction void appendAndPush(org.apache.xalan.processor.StylesheetHandler, org.apache.xalan.templates.ElemTemplateElement) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorExsltFuncResult void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.TransformerFactoryImpl java.lang.Object getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorText void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.XSLTElementProcessor void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorLRE org.apache.xalan.templates.Stylesheet getStylesheetRoot(org.apache.xalan.processor.StylesheetHandler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorLRE org.apache.xalan.templates.Stylesheet getStylesheetRoot(org.apache.xalan.processor.StylesheetHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.TransformerFactoryImpl void setFeature(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.XSLTElementProcessor void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler org.apache.xpath.XPath createXPath(java.lang.String, org.apache.xalan.templates.ElemTemplateElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorExsltFuncResult void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorText void appendAndPush(org.apache.xalan.processor.StylesheetHandler, org.apache.xalan.templates.ElemTemplateElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.XSLTElementProcessor void startNonText(org.apache.xalan.processor.StylesheetHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.TransformerFactoryImpl javax.xml.transform.Transformer newTransformer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.TransformerFactoryImpl void setAttribute(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorTemplateElem void appendAndPush(org.apache.xalan.processor.StylesheetHandler, org.apache.xalan.templates.ElemTemplateElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.TransformerFactoryImpl boolean getFeature(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorTemplateElem void appendAndPush(org.apache.xalan.processor.StylesheetHandler, org.apache.xalan.templates.ElemTemplateElement) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.TransformerFactoryImpl javax.xml.transform.sax.TemplatesHandler newTemplatesHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorTemplateElem void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorStylesheetElement void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.ProcessorCharacters void characters(org.apache.xalan.processor.StylesheetHandler, char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.StylesheetHandler java.lang.String getNamespaceForPrefix(java.lang.String, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.processor.TransformerFactoryImpl java.lang.Object getAttribute(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.processor.ProcessorTemplateElem void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
@@ -101,43 +188,25 @@
     <item name='org.apache.xalan.processor.StylesheetHandler void setDocumentLocator(org.xml.sax.Locator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.ProcessorStylesheetElement org.apache.xalan.templates.Stylesheet getStylesheetRoot(org.apache.xalan.processor.StylesheetHandler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.ProcessorImport java.lang.String getStylesheetInclErr()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.processor.ProcessorStylesheetElement void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.processor.TransformerFactoryImpl void setErrorListener(javax.xml.transform.ErrorListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.processor.ProcessorText void appendAndPush(org.apache.xalan.processor.StylesheetHandler, org.apache.xalan.templates.ElemTemplateElement) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.StylesheetHandler void warning(org.xml.sax.SAXParseException) 0'>
+    <item name='org.apache.xalan.processor.TransformerFactoryImpl javax.xml.transform.sax.TransformerHandler newTransformerHandler()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.ProcessorInclude java.lang.String getStylesheetInclErr()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.ProcessorLRE org.apache.xalan.templates.Stylesheet getStylesheetRoot(org.apache.xalan.processor.StylesheetHandler)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.StylesheetHandler org.apache.xpath.XPath createXPath(java.lang.String, org.apache.xalan.templates.ElemTemplateElement) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.processor.StylesheetHandler StylesheetHandler(org.apache.xalan.processor.TransformerFactoryImpl) 0'>
+    <item name='org.apache.xalan.processor.StylesheetHandler java.lang.String getNamespaceForPrefix(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.processor.ProcessorTemplateElem void endElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.TransformerFactoryImpl javax.xml.transform.Transformer newTransformer()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.processor.StylesheetHandler void error(org.xml.sax.SAXParseException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.processor.ProcessorLRE void startElement(org.apache.xalan.processor.StylesheetHandler, java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xalan/templates/annotations.xml b/android-sdk-annotations/org/apache/xalan/templates/annotations.xml
index 321ba0a0e74..80d0f9e5dca 100644
--- a/android-sdk-annotations/org/apache/xalan/templates/annotations.xml
+++ b/android-sdk-annotations/org/apache/xalan/templates/annotations.xml
@@ -5,12 +5,18 @@
     <item name='org.apache.xalan.templates.OutputProperties void setQNameProperties(org.apache.xml.utils.QName, java.util.Vector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemNumber java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemVariable createLocalPseudoVarDecl(org.apache.xml.utils.QName, org.apache.xalan.templates.ElemTemplateElement, org.apache.xpath.axes.LocPathIterator) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemVariable void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemSort java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.Stylesheet void setNonXslTopLevel(org.apache.xml.utils.QName, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,9 +26,15 @@
     <item name='org.apache.xalan.templates.RedundentExprEliminator void eleminateSharedPartialPaths(org.apache.xalan.templates.ElemTemplateElement, java.util.Vector) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.AVTPart void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.OutputProperties int getIntProperty(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.AVTPartSimple void evaluate(org.apache.xpath.XPathContext, org.apache.xml.utils.FastStringBuffer, int, org.apache.xml.utils.PrefixResolver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemTemplateElement findCommonAncestor(org.apache.xalan.templates.RedundentExprEliminator.MultistepExprHolder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,33 +44,18 @@
     <item name='org.apache.xalan.templates.OutputProperties org.apache.xml.utils.QName getQNameProperty(org.apache.xml.utils.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemNumber java.lang.String long2roman(long, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemLiteralResult java.lang.String getPrefix()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemExsltFuncResult java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.XUnresolvedVariableSimple org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute org.w3c.dom.Node cloneNode(boolean)'>
+    <item name='org.apache.xalan.templates.FuncKey org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemIf void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemExsltFunction java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.OutputProperties boolean getBooleanProperty(org.apache.xml.utils.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemExsltFunction void execute(org.apache.xalan.transformer.TransformerImpl, org.apache.xpath.objects.XObject[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.OutputProperties boolean getBooleanProperty(org.apache.xml.utils.QName) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.templates.ElemLiteralResult boolean accept(org.apache.xalan.templates.XSLTVisitor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -68,9 +65,21 @@
     <item name='org.apache.xalan.templates.KeyDeclaration void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.FuncDocument org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemNumber void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute org.w3c.dom.Node appendChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemAttributeSet java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemVariable createLocalPseudoVarDecl(org.apache.xml.utils.QName, org.apache.xalan.templates.ElemTemplateElement, org.apache.xpath.axes.LocPathIterator) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,12 +89,15 @@
     <item name='org.apache.xalan.templates.StylesheetRoot StylesheetRoot(org.apache.xalan.processor.XSLTSchema, javax.xml.transform.ErrorListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemAttribute java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemUnknown void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemWithParam void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.AbsPathChecker boolean visitVariableRef(org.apache.xpath.ExpressionOwner, org.apache.xpath.operations.Variable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator void eleminateRedundent(org.apache.xalan.templates.ElemTemplateElement, java.util.Vector) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -98,7 +110,7 @@
     <item name='org.apache.xalan.templates.ElemValueOf org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.XUnresolvedVariable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xalan.templates.ElemForEach java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemParam ElemParam(org.apache.xalan.templates.ElemParam) 0'>
@@ -107,10 +119,7 @@
     <item name='org.apache.xalan.templates.OutputProperties void setBooleanProperty(org.apache.xml.utils.QName, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemVariable java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemFallback java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemTemplateElement void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.StylesheetRoot org.apache.xalan.templates.ElemTemplate getTemplateComposed(org.apache.xpath.XPathContext, int, org.apache.xml.utils.QName, boolean, org.apache.xml.dtm.DTM) 4'>
@@ -119,46 +128,43 @@
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xpath.axes.WalkingIterator createIteratorFromSteps(org.apache.xpath.axes.WalkingIterator, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemText java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.templates.ElemExsltFunction void execute(org.apache.xalan.transformer.TransformerImpl, org.apache.xpath.objects.XObject[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.KeyDeclaration java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.templates.ElemVariable ElemVariable(org.apache.xalan.templates.ElemVariable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.FuncKey org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemNumber java.lang.String tradAlphaCount(long, org.apache.xml.utils.res.XResourceBundle)'>
+    <item name='org.apache.xalan.templates.ElemTemplateElement java.lang.String getNamespaceForPrefix(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemForEach org.apache.xml.dtm.DTMIterator sortNodes(org.apache.xpath.XPathContext, java.util.Vector, org.apache.xml.dtm.DTMIterator) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.XUnresolvedVariableSimple org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemLiteralResult void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.OutputProperties void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.AVTPartSimple void callVisitors(org.apache.xalan.templates.XSLTVisitor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemExtensionCall boolean accept(org.apache.xalan.templates.XSLTVisitor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.XUnresolvedVariableSimple java.lang.String getTypeString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemForEach void setSelect(org.apache.xpath.XPath) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemElement void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xpath.axes.WalkingIterator createIteratorFromSteps(org.apache.xpath.axes.WalkingIterator, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemMessage java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.AVTPart void evaluate(org.apache.xpath.XPathContext, org.apache.xml.utils.FastStringBuffer, int, org.apache.xml.utils.PrefixResolver) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemTemplate void endCompose(org.apache.xalan.templates.StylesheetRoot) 0'>
@@ -170,16 +176,25 @@
     <item name='org.apache.xalan.templates.ElemTemplateElement void setPrefixes(org.xml.sax.helpers.NamespaceSupport, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemCallTemplate org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemCallTemplate org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemAttributeSet void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemVariable org.apache.xpath.objects.XObject getValue(org.apache.xalan.transformer.TransformerImpl, int)'>
+    <item name='org.apache.xalan.templates.ElemChoose org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemChoose org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
+    <item name='org.apache.xalan.templates.ElemNumber java.lang.String long2roman(long, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemApplyImport java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemTemplateElement void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
@@ -188,7 +203,10 @@
     <item name='org.apache.xalan.templates.ElemVariablePsuedo void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemChoose java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemWithParam org.apache.xpath.objects.XObject getValue(org.apache.xalan.transformer.TransformerImpl, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemComment org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.AVTPartXPath AVTPartXPath(java.lang.String, org.apache.xml.utils.PrefixResolver, org.apache.xpath.compiler.XPathParser, org.apache.xpath.XPathFactory, org.apache.xpath.XPathContext) 4'>
@@ -200,10 +218,7 @@
     <item name='org.apache.xalan.templates.ElemComment void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemChoose org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemCopyOf java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemTemplateElement void setParentElem(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.NamespaceAlias void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
@@ -215,22 +230,28 @@
     <item name='org.apache.xalan.templates.ElemNumber java.lang.String int2singlealphaCount(long, org.apache.xml.utils.res.CharArrayWrapper) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.XUnresolvedVariableSimple java.lang.String getTypeString()'>
+    <item name='org.apache.xalan.templates.AVTPart void evaluate(org.apache.xpath.XPathContext, org.apache.xml.utils.FastStringBuffer, int, org.apache.xml.utils.PrefixResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemApplyTemplates java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemTemplateElement java.lang.String getNamespaceForPrefix(java.lang.String, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemTemplateElement java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemVariable createGlobalPseudoVarDecl(org.apache.xml.utils.QName, org.apache.xalan.templates.StylesheetRoot, org.apache.xpath.axes.LocPathIterator)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemTemplateElement getElemFromExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemForEach org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
+    <item name='org.apache.xalan.templates.AVTPart java.lang.String getSimpleString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemTemplateElement getElemFromExpression(org.apache.xpath.Expression)'>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.LiteralElementAttributes org.w3c.dom.Node setNamedItem(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xpath.axes.LocPathIterator changePartToRef(org.apache.xml.utils.QName, org.apache.xpath.axes.WalkingIterator, int, boolean)'>
+    <item name='org.apache.xalan.templates.ElemWhen java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemNumber int getPreviousNode(org.apache.xpath.XPathContext, int) 0'>
@@ -245,10 +266,13 @@
     <item name='org.apache.xalan.templates.ElemExtensionDecl void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemPI org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
+    <item name='org.apache.xalan.templates.FuncDocument void error(org.apache.xpath.XPathContext, java.lang.String, java.lang.Object[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.FuncDocument void error(org.apache.xpath.XPathContext, java.lang.String, java.lang.Object[]) 0'>
+    <item name='org.apache.xalan.templates.ElemLiteralResult org.w3c.dom.NamedNodeMap getAttributes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemPI org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.TemplateList org.apache.xalan.templates.ElemTemplate getTemplateFast(org.apache.xpath.XPathContext, int, int, org.apache.xml.utils.QName, int, boolean, org.apache.xml.dtm.DTM) 6'>
@@ -266,13 +290,19 @@
     <item name='org.apache.xalan.templates.TemplateList org.apache.xalan.templates.ElemTemplate getTemplate(org.apache.xml.utils.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemTemplateElement void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemSort org.w3c.dom.Node appendChild(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.StylesheetRoot java.text.DecimalFormatSymbols getDecimalFormatComposed(org.apache.xml.utils.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.XUnresolvedVariable java.lang.String getTypeString()'>
+    <item name='org.apache.xalan.templates.ElemVariable org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemFallback java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemCopy void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
@@ -281,25 +311,37 @@
     <item name='org.apache.xalan.templates.TemplateList org.apache.xalan.templates.TemplateSubPatternAssociation getHead(org.apache.xpath.XPathContext, int, org.apache.xml.dtm.DTM) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemTemplateElement org.w3c.dom.NodeList getChildNodes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.OutputProperties java.util.Vector getQNameProperties(java.lang.String, java.util.Properties) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator boolean visitLocationPath(org.apache.xpath.ExpressionOwner, org.apache.xpath.axes.LocPathIterator) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xpath.axes.WalkingIterator createIteratorFromSteps(org.apache.xpath.axes.WalkingIterator, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemTemplateElement org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemTemplateElement java.lang.String getLocalName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.WhiteSpaceInfo void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemWithParam void setParentElem(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xpath.axes.LocPathIterator changePartToRef(org.apache.xml.utils.QName, org.apache.xpath.axes.WalkingIterator, int, boolean) 1'>
+    <item name='org.apache.xalan.templates.ElemChoose void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemForEach java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xpath.axes.LocPathIterator changePartToRef(org.apache.xml.utils.QName, org.apache.xpath.axes.WalkingIterator, int, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.OutputProperties void copyFrom(java.util.Properties) 0'>
@@ -311,61 +353,70 @@
     <item name='org.apache.xalan.templates.ElemTemplate void setLocaterInfo(javax.xml.transform.SourceLocator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.FuncFormatNumb org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemForEach void endCompose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.FuncFormatNumb org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+    <item name='org.apache.xalan.templates.ElemIf java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.OutputProperties int getIntProperty(org.apache.xml.utils.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.Stylesheet org.apache.xalan.templates.StylesheetComposed getStylesheetComposed()'>
+    <item name='org.apache.xalan.templates.AVTPartXPath java.lang.String getSimpleString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemNumber java.lang.String tradAlphaCount(long, org.apache.xml.utils.res.XResourceBundle)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute org.w3c.dom.Node cloneNode(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.FuncFormatNumb void warn(org.apache.xpath.XPathContext, java.lang.String, java.lang.Object[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemTemplateElement boolean accept(org.apache.xalan.templates.XSLTVisitor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemTemplateElement org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.StylesheetRoot org.apache.xalan.templates.ElemTemplate getTemplateComposed(org.apache.xml.utils.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.OutputProperties java.util.Vector getQNameProperties(java.lang.String, java.util.Properties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult java.lang.String getPrefix()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.OutputProperties java.lang.String getProperty(org.apache.xml.utils.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemCopy java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemWithParam java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.FuncFormatNumb org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemTemplateElement void setEndLocaterInfo(javax.xml.transform.SourceLocator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemSort java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator boolean stepsEqual(org.apache.xpath.axes.WalkingIterator, org.apache.xpath.axes.WalkingIterator, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.OutputProperties java.util.Properties getDefaultMethodProperties(java.lang.String)'>
+    <item name='org.apache.xalan.templates.ElemWithParam java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemTemplateElement org.w3c.dom.NodeList getChildNodes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemNumber void int2alphaCount(long, org.apache.xml.utils.res.CharArrayWrapper, org.apache.xml.utils.FastStringBuffer) 2'>
+    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemTemplateElement getElemFromExpression(org.apache.xpath.Expression)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.OutputProperties boolean getBooleanProperty(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemElement java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemNumber void int2alphaCount(long, org.apache.xml.utils.res.CharArrayWrapper, org.apache.xml.utils.FastStringBuffer) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemValueOf void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
@@ -374,10 +425,10 @@
     <item name='org.apache.xalan.templates.OutputProperties void setProperty(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemCallTemplate org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
+    <item name='org.apache.xalan.templates.ElemComment org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemComment org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
+    <item name='org.apache.xalan.templates.ElemText org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemTemplateElement void exprAddChild(org.apache.xpath.ExpressionNode, int) 0'>
@@ -389,9 +440,6 @@
     <item name='org.apache.xalan.templates.OutputProperties void setQNameProperty(java.lang.String, org.apache.xml.utils.QName) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemParam java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.templates.OutputProperties org.apache.xml.utils.QName getQNameProperty(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -404,9 +452,21 @@
     <item name='org.apache.xalan.templates.RedundentExprEliminator boolean stepsEqual(org.apache.xpath.axes.WalkingIterator, org.apache.xpath.axes.WalkingIterator, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute java.lang.Object getUserData(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.FuncDocument void warn(org.apache.xpath.XPathContext, java.lang.String, java.lang.Object[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemElement java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemComment java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.AVTPartSimple void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemVariable createPseudoVarDecl(org.apache.xalan.templates.ElemTemplateElement, org.apache.xpath.axes.LocPathIterator, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -416,24 +476,27 @@
     <item name='org.apache.xalan.templates.FuncKey org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemTemplate void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.templates.OutputProperties void copyFrom(java.util.Properties, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.AVTPartXPath java.lang.String getSimpleString()'>
+    <item name='org.apache.xalan.templates.ElemTemplate void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.XUnresolvedVariableSimple org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemApplyImport org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.FuncFormatNumb org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute java.lang.Object setUserData(java.lang.String, java.lang.Object, org.w3c.dom.UserDataHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator int oldFindAndEliminateRedundant(int, int, org.apache.xpath.ExpressionOwner, org.apache.xalan.templates.ElemTemplateElement, java.util.Vector) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemTextLiteral java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator int findAndEliminateRedundant(int, int, org.apache.xpath.ExpressionOwner, org.apache.xalan.templates.ElemTemplateElement, java.util.Vector) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -443,10 +506,19 @@
     <item name='org.apache.xalan.templates.ElemParam void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.Stylesheet org.apache.xalan.templates.StylesheetComposed getStylesheetComposed()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.OutputProperties OutputProperties(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemLiteralResult org.w3c.dom.NamedNodeMap getAttributes()'>
+    <item name='org.apache.xalan.templates.ElemTemplateElement org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemCallTemplate java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemApplyTemplates java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.TemplateList org.apache.xalan.templates.ElemTemplate getTemplate(org.apache.xpath.XPathContext, int, org.apache.xml.utils.QName, boolean, org.apache.xml.dtm.DTM) 4'>
@@ -455,37 +527,49 @@
     <item name='org.apache.xalan.templates.TemplateList void setTemplate(org.apache.xalan.templates.ElemTemplate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.TemplateList org.apache.xalan.templates.TemplateList.TemplateWalker getWalker()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemParam void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.FuncDocument org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemCallTemplate void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemCopyOf org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemTemplateElement java.lang.String getTagName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemWithParam org.apache.xpath.objects.XObject getValue(org.apache.xalan.transformer.TransformerImpl, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemTemplateElement void callVisitors(org.apache.xalan.templates.XSLTVisitor) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemApplyTemplates void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.templates.StylesheetRoot javax.xml.transform.Transformer newTransformer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemWithParam org.apache.xpath.objects.XObject getValue(org.apache.xalan.transformer.TransformerImpl, int) 0'>
+    <item name='org.apache.xalan.templates.ElemCallTemplate void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemNumber java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemCopyOf org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.AVTPartXPath void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemTemplateElement void callVisitors(org.apache.xalan.templates.XSLTVisitor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemMessage java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemTemplateElement org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.XUnresolvedVariable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.AVTPartXPath void callVisitors(org.apache.xalan.templates.XSLTVisitor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemApplyTemplates void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.LiteralElementAttributes org.w3c.dom.Node setNamedItemNS(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemWithParam org.apache.xpath.objects.XObject getValue(org.apache.xalan.transformer.TransformerImpl, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemForEach void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
@@ -500,6 +584,9 @@
     <item name='org.apache.xalan.templates.ElemForEach void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemCopyOf java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemMessage void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -512,7 +599,7 @@
     <item name='org.apache.xalan.templates.ElemTemplateElement void setPrefixes(org.xml.sax.helpers.NamespaceSupport) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemPI org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
+    <item name='org.apache.xalan.templates.DecimalFormatProperties java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator int oldFindAndEliminateRedundant(int, int, org.apache.xpath.ExpressionOwner, org.apache.xalan.templates.ElemTemplateElement, java.util.Vector) 4'>
@@ -521,13 +608,25 @@
     <item name='org.apache.xalan.templates.ElemExtensionCall void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemOtherwise java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemTextLiteral void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute org.w3c.dom.Node removeChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemForEach org.apache.xalan.templates.ElemTemplateElement getTemplateMatch()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemAttribute java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemLiteralResult void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemText org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
+    <item name='org.apache.xalan.templates.ElemValueOf java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.StylesheetRoot org.apache.xalan.templates.ElemTemplate getTemplateComposed(org.apache.xpath.XPathContext, int, org.apache.xml.utils.QName, int, int, boolean, org.apache.xml.dtm.DTM) 6'>
@@ -539,13 +638,16 @@
     <item name='org.apache.xalan.templates.ElemVariable void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemTemplate org.apache.xalan.templates.StylesheetComposed getStylesheetComposed()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemVariable addVarDeclToElem(org.apache.xalan.templates.ElemTemplateElement, org.apache.xpath.axes.LocPathIterator, org.apache.xalan.templates.ElemVariable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.OutputProperties void setIntProperty(org.apache.xml.utils.QName, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemCallTemplate java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemPI org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.OutputProperties org.apache.xml.utils.QName getQNameProperty(java.lang.String, java.util.Properties) 1'>
@@ -557,46 +659,55 @@
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.RedundentExprEliminator.MultistepExprHolder createMultistepExprList(java.util.Vector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.XSLTVisitor boolean visitTopLevelInstruction(org.apache.xalan.templates.ElemTemplateElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.Stylesheet void setLocaterInfo(javax.xml.transform.SourceLocator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemPI void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemUse void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemVariable void endCompose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.Stylesheet void replaceTemplate(org.apache.xalan.templates.ElemTemplate, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemVariable void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
+    <item name='org.apache.xalan.templates.Stylesheet java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemForEach org.apache.xml.dtm.DTMIterator sortNodes(org.apache.xpath.XPathContext, java.util.Vector, org.apache.xml.dtm.DTMIterator)'>
+    <item name='org.apache.xalan.templates.ElemForEach org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemIf java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemSort void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemComment org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
+    <item name='org.apache.xalan.templates.ElemChoose java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemTemplate java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemChoose org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemElement void setName(org.apache.xalan.templates.AVT) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemVariable void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemSort void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.OutputProperties org.apache.xml.utils.QName getQNameProperty(java.lang.String, java.util.Properties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemIf void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemNumber java.lang.String int2singlealphaCount(long, org.apache.xml.utils.res.CharArrayWrapper)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemComment java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemPI java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemCopy java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.AVTPartXPath void evaluate(org.apache.xpath.XPathContext, org.apache.xml.utils.FastStringBuffer, int, org.apache.xml.utils.PrefixResolver) 0'>
@@ -605,25 +716,19 @@
     <item name='org.apache.xalan.templates.ElemVariable boolean accept(org.apache.xalan.templates.XSLTVisitor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemTemplate org.apache.xalan.templates.StylesheetComposed getStylesheetComposed()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.templates.OutputProperties java.lang.String getProperty(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemNumber void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.Stylesheet org.apache.xalan.templates.Stylesheet getStylesheet()'>
+    <item name='org.apache.xalan.templates.XSLTVisitable void callVisitors(org.apache.xalan.templates.XSLTVisitor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemTemplateElement java.lang.String getLocalName()'>
+    <item name='org.apache.xalan.templates.ElemExsltFunction java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemTextLiteral java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemOtherwise java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemVariable org.apache.xpath.objects.XObject getValue(org.apache.xalan.transformer.TransformerImpl, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator boolean visitPredicate(org.apache.xpath.ExpressionOwner, org.apache.xpath.Expression) 1'>
@@ -638,13 +743,13 @@
     <item name='org.apache.xalan.templates.AbsPathChecker boolean checkAbsolute(org.apache.xpath.axes.LocPathIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.Stylesheet org.apache.xalan.templates.Stylesheet getStylesheet()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemNumber int getTargetNode(org.apache.xpath.XPathContext, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemValueOf java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.templates.ElemAttributeSet java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemNumber java.lang.String int2singlealphaCount(long, org.apache.xml.utils.res.CharArrayWrapper)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.OutputProperties java.util.Vector getQNameProperties(org.apache.xml.utils.QName) 0'>
@@ -653,10 +758,10 @@
     <item name='org.apache.xalan.templates.Stylesheet void setTemplate(org.apache.xalan.templates.ElemTemplate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemCopyOf void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
+    <item name='org.apache.xalan.templates.ElemTemplateElement org.apache.xalan.templates.StylesheetComposed getStylesheetComposed()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemTemplateElement org.w3c.dom.Node appendChild(org.w3c.dom.Node)'>
+    <item name='org.apache.xalan.templates.ElemCopyOf void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator boolean visitTopLevelInstruction(org.apache.xalan.templates.ElemTemplateElement) 0'>
@@ -671,24 +776,21 @@
     <item name='org.apache.xalan.templates.ElemUse void setUseAttributeSets(java.util.Vector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemApplyImport java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.DecimalFormatProperties void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.DecimalFormatProperties void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
+    <item name='org.apache.xalan.templates.ElemLiteralResult java.lang.String getAttribute(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.VarNameCollector boolean visitVariableRef(org.apache.xpath.ExpressionOwner, org.apache.xpath.operations.Variable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemTemplateElement org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement)'>
+    <item name='org.apache.xalan.templates.XSLTVisitor boolean visitInstruction(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemExsltFuncResult void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.DecimalFormatProperties java.lang.String getNodeName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.templates.OutputProperties void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -707,7 +809,13 @@
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemVariable createGlobalPseudoVarDecl(org.apache.xml.utils.QName, org.apache.xalan.templates.StylesheetRoot, org.apache.xpath.axes.LocPathIterator) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemTemplateElement java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemExsltFuncResult java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.OutputProperties java.util.Properties getDefaultMethodProperties(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.KeyDeclaration java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemSort void setSelect(org.apache.xpath.XPath) 0'>
@@ -716,10 +824,10 @@
     <item name='org.apache.xalan.templates.AVTPartSimple void evaluate(org.apache.xpath.XPathContext, org.apache.xml.utils.FastStringBuffer, int, org.apache.xml.utils.PrefixResolver) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.Stylesheet java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xpath.axes.LocPathIterator changePartToRef(org.apache.xml.utils.QName, org.apache.xpath.axes.WalkingIterator, int, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemVariable createGlobalPseudoVarDecl(org.apache.xml.utils.QName, org.apache.xalan.templates.StylesheetRoot, org.apache.xpath.axes.LocPathIterator)'>
+    <item name='org.apache.xalan.templates.ElemForEach org.apache.xml.dtm.DTMIterator sortNodes(org.apache.xpath.XPathContext, java.util.Vector, org.apache.xml.dtm.DTMIterator)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemAttributeSet org.apache.xalan.templates.ElemTemplateElement appendChildElem(org.apache.xalan.templates.ElemTemplateElement) 0'>
@@ -731,10 +839,10 @@
     <item name='org.apache.xalan.templates.OutputProperties boolean isLegalPropertyKey(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemVariable org.apache.xpath.objects.XObject getValue(org.apache.xalan.transformer.TransformerImpl, int) 0'>
+    <item name='org.apache.xalan.templates.ElemTemplateElement java.lang.String getTagName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemWhen java.lang.String getNodeName()'>
+    <item name='org.apache.xalan.templates.ElemVariable org.apache.xpath.objects.XObject getValue(org.apache.xalan.transformer.TransformerImpl, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.RedundentExprEliminator org.apache.xalan.templates.ElemTemplateElement getPrevElementWithinContext(org.apache.xalan.templates.ElemTemplateElement) 0'>
@@ -764,16 +872,25 @@
     <item name='org.apache.xalan.templates.ElemWhen void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute org.w3c.dom.NodeList getChildNodes()'>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute boolean isSupported(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.XUnresolvedVariable java.lang.String getTypeString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemWithParam org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemLiteralResult void setXmlSpace(org.apache.xalan.templates.AVT) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemPI java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemNumber org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.ElemForEach org.apache.xalan.templates.ElemTemplateElement getTemplateMatch()'>
+    <item name='org.apache.xalan.templates.AVTPartXPath void evaluate(org.apache.xpath.XPathContext, org.apache.xml.utils.FastStringBuffer, int, org.apache.xml.utils.PrefixResolver) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemAttributeSet void recompose(org.apache.xalan.templates.StylesheetRoot) 0'>
@@ -782,16 +899,25 @@
     <item name='org.apache.xalan.templates.RedundentExprEliminator boolean visitInstruction(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemVariable java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.ElemLiteralResult.Attribute org.w3c.dom.NodeList getChildNodes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.OutputProperties void setQNameProperty(org.apache.xml.utils.QName, org.apache.xml.utils.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemCallTemplate void endCompose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.OutputProperties void copyFrom(org.apache.xalan.templates.OutputProperties) 0'>
+    <item name='org.apache.xalan.templates.ElemParam java.lang.String getNodeName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.templates.TemplateList org.apache.xalan.templates.TemplateList.TemplateWalker getWalker()'>
+    <item name='org.apache.xalan.templates.ElemFallback void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.templates.OutputProperties void copyFrom(org.apache.xalan.templates.OutputProperties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.templates.ElemForEach org.apache.xalan.templates.ElemTemplateElement appendChild(org.apache.xalan.templates.ElemTemplateElement) 0'>
@@ -803,6 +929,9 @@
     <item name='org.apache.xalan.templates.ElemPI void execute(org.apache.xalan.transformer.TransformerImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.templates.ElemText java.lang.String getNodeName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.templates.ElemExsltFunction void compose(org.apache.xalan.templates.StylesheetRoot) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/xalan/transformer/annotations.xml b/android-sdk-annotations/org/apache/xalan/transformer/annotations.xml
index d9717815ef6..5fb0b4f24f2 100644
--- a/android-sdk-annotations/org/apache/xalan/transformer/annotations.xml
+++ b/android-sdk-annotations/org/apache/xalan/transformer/annotations.xml
@@ -1,83 +1,71 @@
 <root>
-    <item name='org.apache.xalan.transformer.TrAXFilter void setParent(org.xml.sax.XMLReader) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.transformer.TransformerImpl int transformToGlobalRTF(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerIdentityImpl void transform(javax.xml.transform.Source, javax.xml.transform.Result) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl void transform(javax.xml.transform.Source, javax.xml.transform.Result) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.transformer.TransformerIdentityImpl java.lang.String getOutputProperty(java.lang.String) 0'>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void endEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerImpl java.lang.Object extFunction(org.apache.xpath.functions.FuncExtFunction, java.util.Vector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl void transform(javax.xml.transform.Source, javax.xml.transform.Result, boolean) 1'>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void startPrefixMapping(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl void setErrorListener(javax.xml.transform.ErrorListener) 0'>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerImpl java.util.Vector processSortKeys(org.apache.xalan.templates.ElemForEach, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl void setParameter(java.lang.String, java.lang.String, java.lang.Object) 0'>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void startEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl void setOutputProperty(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl javax.xml.transform.Transformer getTransformer()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl TransformerImpl(org.apache.xalan.templates.StylesheetRoot) 0'>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerImpl void setParameter(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerHandlerImpl TransformerHandlerImpl(org.apache.xalan.transformer.TransformerImpl, boolean, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xalan.transformer.CountersTable int countNode(org.apache.xpath.XPathContext, org.apache.xalan.templates.ElemNumber, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl org.apache.xml.serializer.SerializationHandler createSerializationHandler(javax.xml.transform.Result)'>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl TransformerHandlerImpl(org.apache.xalan.transformer.TransformerImpl, boolean, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerImpl java.lang.String transformToString(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl void executeChildTemplates(org.apache.xalan.templates.ElemTemplateElement, org.w3c.dom.Node, org.apache.xml.utils.QName, org.xml.sax.ContentHandler) 0'>
+    <item name='org.apache.xalan.transformer.TrAXFilter void parse(org.xml.sax.InputSource) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerHandlerImpl void setResult(javax.xml.transform.Result) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void setDocumentLocator(org.xml.sax.Locator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.transformer.TransformerImpl int transformToRTF(org.apache.xalan.templates.ElemTemplateElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl org.apache.xml.serializer.SerializationHandler createSerializationHandler(javax.xml.transform.Result, org.apache.xalan.templates.OutputProperties) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.transformer.NodeSorter void sort(org.apache.xml.dtm.DTMIterator, java.util.Vector, org.apache.xpath.XPathContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.transformer.TransformerIdentityImpl javax.xml.transform.Transformer getTransformer()'>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void processingInstruction(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerIdentityImpl void setErrorListener(javax.xml.transform.ErrorListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl org.apache.xml.serializer.SerializationHandler createSerializationHandler(javax.xml.transform.Result, org.apache.xalan.templates.OutputProperties) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.transformer.TransformerIdentityImpl void setParameter(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl org.apache.xml.serializer.SerializationHandler createSerializationHandler(javax.xml.transform.Result, org.apache.xalan.templates.OutputProperties) 1'>
+    <item name='org.apache.xalan.transformer.TransformerImpl java.lang.Object getParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerImpl void executeChildTemplates(org.apache.xalan.templates.ElemTemplateElement, org.xml.sax.ContentHandler) 0'>
@@ -86,13 +74,133 @@
     <item name='org.apache.xalan.transformer.TrAXFilter void setContentHandler(org.xml.sax.ContentHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void warning(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl void init(org.apache.xml.serializer.ToXMLSAXHandler, javax.xml.transform.Transformer, org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl org.apache.xml.serializer.SerializationHandler createSerializationHandler(javax.xml.transform.Result, org.apache.xalan.templates.OutputProperties)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformState org.w3c.dom.traversal.NodeIterator getContextNodeList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl java.lang.Object extFunction(java.lang.String, java.lang.String, java.util.Vector, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl void transformNode(int, javax.xml.transform.Result) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void setDocumentLocator(org.xml.sax.Locator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl java.lang.String getOutputProperty(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void error(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl javax.xml.transform.Transformer getTransformer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TrAXFilter void setParent(org.xml.sax.XMLReader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl javax.xml.transform.Transformer getTransformer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void fatalError(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl void transform(javax.xml.transform.Source, javax.xml.transform.Result) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl java.lang.String getOutputProperty(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl void transform(javax.xml.transform.Source, javax.xml.transform.Result, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl void setErrorListener(javax.xml.transform.ErrorListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl void setParameter(java.lang.String, java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl void setOutputProperty(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.XalanTransformState org.w3c.dom.traversal.NodeIterator getContextNodeList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl TransformerImpl(org.apache.xalan.templates.StylesheetRoot) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl org.apache.xml.serializer.SerializationHandler createSerializationHandler(javax.xml.transform.Result)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl void executeChildTemplates(org.apache.xalan.templates.ElemTemplateElement, org.w3c.dom.Node, org.apache.xml.utils.QName, org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl java.lang.Object extFunction(java.lang.String, java.lang.String, java.util.Vector, java.lang.Object) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerImpl org.apache.xml.serializer.SerializationHandler createSerializationHandler(javax.xml.transform.Result, org.apache.xalan.templates.OutputProperties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl org.xml.sax.InputSource resolveEntity(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void endEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.NodeSorter void sort(org.apache.xml.dtm.DTMIterator, java.util.Vector, org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void setResult(javax.xml.transform.Result) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.transformer.TrAXFilter void setErrorListener(javax.xml.transform.ErrorListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TrAXFilter TrAXFilter(javax.xml.transform.Templates) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl void init(org.apache.xml.serializer.ToXMLSAXHandler, javax.xml.transform.Transformer, org.xml.sax.ContentHandler) 0'>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void startEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerImpl org.apache.xml.serializer.SerializationHandler createSerializationHandler(javax.xml.transform.Result) 0'>
@@ -101,19 +209,25 @@
     <item name='org.apache.xalan.transformer.TransformerImpl void executeChildTemplates(org.apache.xalan.templates.ElemTemplateElement, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl java.lang.Object getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.transformer.CountersTable int countNode(org.apache.xpath.XPathContext, org.apache.xalan.templates.ElemNumber, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.transformer.KeyTable org.apache.xpath.objects.XNodeSet getNodeSetDTMByKey(org.apache.xml.utils.QName, org.apache.xml.utils.XMLString)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.transformer.TransformerIdentityImpl void setOutputProperty(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerImpl void setParameter(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.XalanTransformState org.w3c.dom.traversal.NodeIterator getContextNodeList()'>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl void transformNode(int, javax.xml.transform.Result) 1'>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.KeyTable org.apache.xpath.objects.XNodeSet getNodeSetDTMByKey(org.apache.xml.utils.QName, org.apache.xml.utils.XMLString) 1'>
@@ -122,19 +236,16 @@
     <item name='org.apache.xalan.transformer.TransformerImpl void setContentHandler(org.xml.sax.ContentHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.KeyTable org.apache.xpath.objects.XNodeSet getNodeSetDTMByKey(org.apache.xml.utils.QName, org.apache.xml.utils.XMLString)'>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl java.lang.String getOutputProperty(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void setParameter(java.lang.String, java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xalan.transformer.TransformerImpl org.apache.xml.serializer.SerializationHandler createSerializationHandler(javax.xml.transform.Result, org.apache.xalan.templates.OutputProperties)'>
+    <item name='org.apache.xalan.transformer.TransformerHandlerImpl void startPrefixMapping(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.transformer.TransformerImpl void setParameters(java.util.Properties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.transformer.TransformerIdentityImpl void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xalan/xslt/annotations.xml b/android-sdk-annotations/org/apache/xalan/xslt/annotations.xml
index 08962f734a3..a7e5f4f34c5 100644
--- a/android-sdk-annotations/org/apache/xalan/xslt/annotations.xml
+++ b/android-sdk-annotations/org/apache/xalan/xslt/annotations.xml
@@ -14,10 +14,10 @@
     <item name='org.apache.xalan.xslt.EnvironmentCheck void main(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.xslt.EnvironmentCheck java.lang.String getApparentVersion(java.lang.String, long)'>
+    <item name='org.apache.xalan.xslt.EnvironmentCheck void checkSAXVersion(java.util.Hashtable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.xslt.EnvironmentCheck void checkSAXVersion(java.util.Hashtable) 0'>
+    <item name='org.apache.xalan.xslt.EnvironmentCheck java.util.Hashtable getEnvironmentHash()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xalan.xslt.EnvironmentCheck void checkAntVersion(java.util.Hashtable) 0'>
@@ -26,10 +26,10 @@
     <item name='org.apache.xalan.xslt.EnvironmentCheck void checkParserVersion(java.util.Hashtable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xalan.xslt.EnvironmentCheck java.lang.String getApparentVersion(java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xalan.xslt.EnvironmentCheck void logMsg(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xalan.xslt.EnvironmentCheck java.util.Hashtable getEnvironmentHash()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xml/dtm/annotations.xml b/android-sdk-annotations/org/apache/xml/dtm/annotations.xml
index 3ee5e998eb9..39c91c1d5bb 100644
--- a/android-sdk-annotations/org/apache/xml/dtm/annotations.xml
+++ b/android-sdk-annotations/org/apache/xml/dtm/annotations.xml
@@ -1,20 +1,65 @@
 <root>
-    <item name='org.apache.xml.dtm.DTMManager org.apache.xml.dtm.DTMManager newInstance(org.apache.xml.utils.XMLStringFactory)'>
+    <item name='org.apache.xml.dtm.DTMException java.lang.String getMessageAndLocation()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.DTMException java.lang.String getMessageAndLocation()'>
+    <item name='org.apache.xml.dtm.DTMManager org.apache.xml.dtm.DTM createDocumentFragment()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTMIterator void setRoot(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.DTMConfigurationException DTMConfigurationException(java.lang.Throwable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.DTMManager org.apache.xml.dtm.DTMManager newInstance(org.apache.xml.utils.XMLStringFactory)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTMManager boolean release(org.apache.xml.dtm.DTM, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.dtm.DTMException java.lang.Throwable initCause(java.lang.Throwable)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.DTMException DTMException(java.lang.Throwable) 0'>
+    <item name='org.apache.xml.dtm.DTM void setProperty(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTM int getExpandedTypeID(java.lang.String, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.DTMException void printStackTrace(java.io.PrintStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.DTM int getExpandedTypeID(java.lang.String, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTMIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTM boolean isSupported(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTMAxisIterator org.apache.xml.dtm.DTMAxisIterator reset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTM void setFeature(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTMManager org.apache.xml.dtm.DTM getDTM(javax.xml.transform.Source, boolean, org.apache.xml.dtm.DTMWSFilter, boolean, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTM int getElementById(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTM java.lang.String getLocalNameFromExpandedNameID(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTMAxisIterator org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTMException DTMException(java.lang.Throwable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.DTMException void printStackTrace(java.io.PrintWriter) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xml/dtm/ref/annotations.xml b/android-sdk-annotations/org/apache/xml/dtm/ref/annotations.xml
index bba284dd87e..f211f13512d 100644
--- a/android-sdk-annotations/org/apache/xml/dtm/ref/annotations.xml
+++ b/android-sdk-annotations/org/apache/xml/dtm/ref/annotations.xml
@@ -1,146 +1,338 @@
 <root>
-    <item name='org.apache.xml.dtm.ref.ExtendedType ExtendedType(int, java.lang.String, java.lang.String) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.ExpandedNameTable int getExpandedTypeID(java.lang.String, java.lang.String, int, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.ExpandedNameTable int getExpandedTypeID(java.lang.String, java.lang.String, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMDefaultBase int getExpandedTypeID(java.lang.String, java.lang.String, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMAxisIteratorBase org.apache.xml.dtm.DTMAxisIterator reset()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl java.lang.String getLocalNameFromExpandedNameID(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.DescendantIterator org.apache.xml.dtm.DTMAxisIterator reset()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.PrecedingIterator org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.String getTextContent()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.String getStringValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.NodeList getElementsByTagName(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void setIncrementalSAXSource(org.apache.xml.dtm.ref.IncrementalSAXSource) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.NamedNodeMap getAttributes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMManagerDefault org.apache.xml.dtm.DTM getDTM(javax.xml.transform.Source, boolean, org.apache.xml.dtm.DTMWSFilter, boolean, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.ExtendedType void redefine(int, java.lang.String, java.lang.String) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMManagerDefault boolean release(org.apache.xml.dtm.DTM, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMDefaultBase org.w3c.dom.Node getNode(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.FollowingIterator FollowingIterator(org.apache.xml.dtm.ref.DTMDefaultBaseIterators) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl java.lang.String getLocalName(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMAxisIteratorBase org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.ExtendedType ExtendedType(int, java.lang.String, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.NodeLocator java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.NodeList getElementsByTagNameNS(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMNodeIterator DTMNodeIterator(org.apache.xml.dtm.DTMIterator) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.DOMImplementation getImplementation()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.ExpandedNameTable int getExpandedTypeID(java.lang.String, java.lang.String, int) 0'>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMManagerDefault void addDTM(org.apache.xml.dtm.DTM, int) 0'>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void error(org.xml.sax.SAXParseException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.NodeList getChildNodes()'>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl boolean isSupported(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void endEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.DTMAxisIteratorBase org.apache.xml.dtm.DTMAxisIterator includeSelf()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void startPrefixMapping(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMManagerDefault org.apache.xml.dtm.DTM createDocumentFragment()'>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void startEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.AncestorIterator org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void setFeature(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMChildIterNodeList DTMChildIterNodeList(org.apache.xml.dtm.DTM, int) 0'>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Text createTextNode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl java.lang.String getNamespaceFromExpandedNameID(int)'>
+    <item name='org.apache.xml.dtm.ref.ExtendedType void redefine(int, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl java.lang.String getPrefix(int)'>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy void setValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl char[] getStringValueChunk(int, int, int[])'>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void setXMLReader(org.xml.sax.XMLReader) 0'>
+    <item name='org.apache.xml.dtm.ref.DTMManagerDefault boolean release(org.apache.xml.dtm.DTM, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter org.apache.xml.dtm.ref.IncrementalSAXSource createIncrementalSAXSource(org.apache.xml.dtm.ref.CoroutineManager, int)'>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.FollowingIterator FollowingIterator(org.apache.xml.dtm.ref.DTMDefaultBaseIterators) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMDefaultBase java.lang.String dumpNode(int)'>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBase int getElementById(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMDefaultBase java.lang.String getDocumentEncoding(int)'>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy void setData(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.ExpandedNameTable int getExpandedTypeID(java.lang.String, java.lang.String, int, boolean) 1'>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.Object getUserData(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.String substringData(int, int)'>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.DTMDefaultBase int getExpandedTypeID(java.lang.String, java.lang.String, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.dtm.ref.DTMAxisIteratorBase org.apache.xml.dtm.DTMAxisIterator resetPosition()'>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void fatalError(org.xml.sax.SAXParseException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.ParentIterator org.apache.xml.dtm.DTMAxisIterator setNodeType(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl java.lang.String getLocalNameFromExpandedNameID(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Node renameNode(org.w3c.dom.Node, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Element getElementById(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl int getExpandedTypeID(java.lang.String, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.DescendantIterator org.apache.xml.dtm.DTMAxisIterator reset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.ExpandedNameTable int getExpandedTypeID(java.lang.String, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.ExpandedNameTable int getExpandedTypeID(java.lang.String, java.lang.String, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBase int getExpandedTypeID(java.lang.String, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl java.lang.String getPrefix(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.String getTextContent()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy void setIdAttributeNode(org.w3c.dom.Attr, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMManagerDefault org.apache.xml.dtm.DTM getDTM(javax.xml.transform.Source, boolean, org.apache.xml.dtm.DTMWSFilter, boolean, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl java.lang.String getLocalName(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBase java.lang.String dumpNode(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy boolean isSupported(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBase void setFeature(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.ExpandedNameTable int getExpandedTypeID(java.lang.String, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Attr setAttributeNodeNS(org.w3c.dom.Attr) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void setDocumentLocator(org.xml.sax.Locator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void setXMLReader(org.xml.sax.XMLReader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.NamedNodeMap getAttributes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter org.apache.xml.dtm.ref.IncrementalSAXSource createIncrementalSAXSource(org.apache.xml.dtm.ref.CoroutineManager, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Node removeChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.dtm.ref.DTMManagerDefault void addDTM(org.apache.xml.dtm.DTM, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.ExtendedType void redefine(int, java.lang.String, java.lang.String) 1'>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Node importNode(org.w3c.dom.Node, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.TypedFollowingIterator TypedFollowingIterator(org.apache.xml.dtm.ref.DTMDefaultBaseIterators, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.ExtendedType void redefine(int, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBase org.w3c.dom.Node getNode(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNamedNodeMap org.w3c.dom.Node setNamedItem(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.CDATASection createCDATASection(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Attr removeAttributeNode(org.w3c.dom.Attr) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.NodeList getElementsByTagNameNS(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void setIncrementalSAXSource(org.apache.xml.dtm.ref.IncrementalSAXSource) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl int getElementById(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.String substringData(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void setDocumentLocator(org.xml.sax.Locator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMAxisIteratorBase org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeIterator DTMNodeIterator(org.apache.xml.dtm.DTMIterator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMManagerDefault void addDTM(org.apache.xml.dtm.DTM, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.NodeList getElementsByTagName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBase java.lang.String getDocumentEncoding(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl java.lang.String getNamespaceFromExpandedNameID(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.String getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.ExpandedNameTable int getExpandedTypeID(java.lang.String, java.lang.String, int, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBase int getExpandedTypeID(java.lang.String, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.AncestorIterator org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void startPrefixMapping(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.Object setUserData(java.lang.String, java.lang.Object, org.w3c.dom.UserDataHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.ExtendedType ExtendedType(int, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void warning(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.NodeList getChildNodes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Comment createComment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.NodeLocator java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource void setContentHandler(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMManagerDefault org.apache.xml.dtm.DTM createDocumentFragment()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl int getExpandedTypeID(java.lang.String, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl char[] getStringValueChunk(int, int, int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void setProperty(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy java.lang.String getStringValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.ExtendedType ExtendedType(int, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy void removeAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBaseIterators.PrecedingIterator org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void endEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDefaultBase boolean isSupported(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void startEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMAxisIteratorBase org.apache.xml.dtm.DTMAxisIterator reset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMDocumentImpl void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMChildIterNodeList DTMChildIterNodeList(org.apache.xml.dtm.DTM, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMAxisIteratorBase org.apache.xml.dtm.DTMAxisIterator resetPosition()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Node appendChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNamedNodeMap org.w3c.dom.Node setNamedItemNS(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.DTMNodeProxy org.w3c.dom.Attr setAttributeNode(org.w3c.dom.Attr) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.IncrementalSAXSource_Filter void setContentHandler(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xml/dtm/ref/dom2dtm/annotations.xml b/android-sdk-annotations/org/apache/xml/dtm/ref/dom2dtm/annotations.xml
index aba60f645ba..433cb147140 100644
--- a/android-sdk-annotations/org/apache/xml/dtm/ref/dom2dtm/annotations.xml
+++ b/android-sdk-annotations/org/apache/xml/dtm/ref/dom2dtm/annotations.xml
@@ -1,20 +1,56 @@
 <root>
-    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM java.lang.String getPrefix(int)'>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode org.w3c.dom.Node removeChild(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode org.w3c.dom.TypeInfo getSchemaTypeInfo()'>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode java.lang.Object setUserData(java.lang.String, java.lang.Object, org.w3c.dom.UserDataHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode java.lang.Object getUserData(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode java.lang.String getNamespaceURI()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM int addNode(org.w3c.dom.Node, int, int, int) 0'>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM java.lang.String getPrefix(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM void dispatchNodeData(org.w3c.dom.Node, org.xml.sax.ContentHandler, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM int getElementById(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode boolean isSupported(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM DOM2DTM(org.apache.xml.dtm.DTMManager, javax.xml.transform.dom.DOMSource, int, org.apache.xml.dtm.DTMWSFilter, org.apache.xml.utils.XMLStringFactory, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM void dispatchNodeData(org.w3c.dom.Node, org.xml.sax.ContentHandler, int) 0'>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM int addNode(org.w3c.dom.Node, int, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode org.w3c.dom.Node appendChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM void setProperty(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode org.w3c.dom.TypeInfo getSchemaTypeInfo()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.dom2dtm.DOM2DTM void getNodeData(org.w3c.dom.Node, org.apache.xml.utils.FastStringBuffer) 0'>
diff --git a/android-sdk-annotations/org/apache/xml/dtm/ref/sax2dtm/annotations.xml b/android-sdk-annotations/org/apache/xml/dtm/ref/sax2dtm/annotations.xml
index d22cff8ee57..4b59ba71268 100644
--- a/android-sdk-annotations/org/apache/xml/dtm/ref/sax2dtm/annotations.xml
+++ b/android-sdk-annotations/org/apache/xml/dtm/ref/sax2dtm/annotations.xml
@@ -1,8 +1,11 @@
 <root>
-    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2.PrecedingIterator org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM org.xml.sax.InputSource resolveEntity(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2.DescendantIterator org.apache.xml.dtm.DTMAxisIterator reset()'>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void setProperty(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void processingInstruction(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void setIncrementalSAXSource(org.apache.xml.dtm.ref.IncrementalSAXSource) 0'>
@@ -11,42 +14,63 @@
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2RTFDTM SAX2RTFDTM(org.apache.xml.dtm.DTMManager, javax.xml.transform.Source, int, org.apache.xml.dtm.DTMWSFilter, org.apache.xml.utils.XMLStringFactory, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void startPrefixMapping(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM org.xml.sax.EntityResolver getEntityResolver()'>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void error(org.xml.sax.SAXParseException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM org.xml.sax.DTDHandler getDTDHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 SAX2DTM2(org.apache.xml.dtm.DTMManager, javax.xml.transform.Source, int, org.apache.xml.dtm.DTMWSFilter, org.apache.xml.utils.XMLStringFactory, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 java.lang.String copyElement(int, int, org.apache.xml.serializer.SerializationHandler) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM int getElementById(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM org.xml.sax.ErrorHandler getErrorHandler()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 SAX2DTM2(org.apache.xml.dtm.DTMManager, javax.xml.transform.Source, int, org.apache.xml.dtm.DTMWSFilter, org.apache.xml.utils.XMLStringFactory, boolean, int, boolean, boolean, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void copyAttribute(int, int, org.apache.xml.serializer.SerializationHandler) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2.ParentIterator org.apache.xml.dtm.DTMAxisIterator setNodeType(int)'>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM org.xml.sax.ErrorHandler getErrorHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void endEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void processingInstruction(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM SAX2DTM(org.apache.xml.dtm.DTMManager, javax.xml.transform.Source, int, org.apache.xml.dtm.DTMWSFilter, org.apache.xml.utils.XMLStringFactory, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void warning(org.xml.sax.SAXParseException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -56,31 +80,58 @@
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void processingInstruction(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM org.xml.sax.DTDHandler getDTDHandler()'>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void fatalError(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void startEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2.AncestorIterator org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void setDocumentLocator(org.xml.sax.Locator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM org.xml.sax.EntityResolver getEntityResolver()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void setIDAttribute(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2.AncestorIterator org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2.PrecedingIterator org.apache.xml.dtm.DTMAxisIterator cloneIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2.DescendantIterator org.apache.xml.dtm.DTMAxisIterator reset()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM org.xml.sax.ext.DeclHandler getDeclHandler()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2 void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM SAX2DTM(org.apache.xml.dtm.DTMManager, javax.xml.transform.Source, int, org.apache.xml.dtm.DTMWSFilter, org.apache.xml.utils.XMLStringFactory, boolean, int, boolean, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2.ParentIterator org.apache.xml.dtm.DTMAxisIterator setNodeType(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.dtm.ref.sax2dtm.SAX2DTM void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xml/serializer/annotations.xml b/android-sdk-annotations/org/apache/xml/serializer/annotations.xml
index 52bd2a4caca..e39c64e56f5 100644
--- a/android-sdk-annotations/org/apache/xml/serializer/annotations.xml
+++ b/android-sdk-annotations/org/apache/xml/serializer/annotations.xml
@@ -5,208 +5,601 @@
     <item name='org.apache.xml.serializer.ToXMLSAXHandler boolean startPrefixMapping(java.lang.String, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToUnknownStream void characters(java.lang.String) 0'>
+    <item name='org.apache.xml.serializer.ToSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.SerializerBase void characters(org.w3c.dom.Node) 0'>
+    <item name='org.apache.xml.serializer.ToStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToStream java.util.Properties getOutputFormat()'>
+    <item name='org.apache.xml.serializer.ToHTMLStream void namespaceAfterStartElement(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToHTMLStream void addUniqueAttribute(java.lang.String, java.lang.String, int) 1'>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler void characters(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToHTMLStream void processAttribute(java.io.Writer, java.lang.String, java.lang.String, org.apache.xml.serializer.ElemDesc) 1'>
+    <item name='org.apache.xml.serializer.ToXMLStream void addUniqueAttribute(java.lang.String, java.lang.String, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToXMLSAXHandler void characters(java.lang.String) 0'>
+    <item name='org.apache.xml.serializer.ToUnknownStream boolean startPrefixMapping(java.lang.String, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.SerializerBase java.lang.String getPrefixPart(java.lang.String) 0'>
+    <item name='org.apache.xml.serializer.ToUnknownStream void addUniqueAttribute(java.lang.String, java.lang.String, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.SerializerBase org.xml.sax.ContentHandler asContentHandler()'>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void comment(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.SerializerBase void entityReference(java.lang.String) 0'>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void comment(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.Version java.lang.String getImplementationLanguage()'>
+    <item name='org.apache.xml.serializer.ToUnknownStream void addAttributes(org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.NamespaceMappings java.lang.String[] lookupAllPrefixes(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.OutputPropertyUtils boolean getBooleanProperty(java.lang.String, java.util.Properties) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.ToXMLSAXHandler void startPrefixMapping(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.SerializerBase java.lang.String patchName(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.SerializerBase org.apache.xml.serializer.DOMSerializer asDOMSerializer()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.SerializerBase void comment(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.ToStream void startPrefixMapping(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.NamespaceMappings boolean pushNamespace(java.lang.String, java.lang.String, int) 0'>
+    <item name='org.apache.xml.serializer.Version java.lang.String getProduct()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.ToStream boolean startPrefixMapping(java.lang.String, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToHTMLStream void processAttribute(java.io.Writer, java.lang.String, java.lang.String, org.apache.xml.serializer.ElemDesc) 0'>
+    <item name='org.apache.xml.serializer.SerializerBase void setEncoding(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.SerializerBase java.lang.String getLocalName(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.ToStream void startEntity(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.SerializerBase java.lang.String getNamespaceURI(java.lang.String, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.NamespaceMappings java.lang.String generateNextPrefix()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.ToXMLSAXHandler void namespaceAfterStartElement(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.SerializerBase java.lang.Object asDOM3Serializer()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.ToStream void setNewLine(char[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.SerializerFactory org.apache.xml.serializer.Serializer getSerializer(java.util.Properties) 0'>
+    <item name='org.apache.xml.serializer.ToUnknownStream void endEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.OutputPropertiesFactory java.util.Properties getDefaultMethodProperties(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.SerializerBase java.lang.String getNamespaceURI(java.lang.String, boolean) 0'>
+    <item name='org.apache.xml.serializer.ToXMLStream void addUniqueAttribute(java.lang.String, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToStream void writeAttrString(java.io.Writer, java.lang.String, java.lang.String) 1'>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler void characters(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToStream int writeUTF16Surrogate(char, char[], int, int) 1'>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler boolean startPrefixMapping(java.lang.String, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.OutputPropertiesFactory java.util.Properties getDefaultMethodProperties(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.OutputPropertyUtils int getIntProperty(java.lang.String, java.util.Properties) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.AttributesImplSerializer void setAttributes(org.xml.sax.Attributes) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.Encodings char getHighChar(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.NamespaceMappings java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.ToUnknownStream org.xml.sax.ContentHandler asContentHandler()'>
+    <item name='org.apache.xml.serializer.SerializerBase void setDocumentLocator(org.xml.sax.Locator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.ToStream void setOutputFormat(java.util.Properties) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.TreeWalker void startNode(org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.ToTextSAXHandler void comment(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.serializer.SerializerBase java.lang.String getLocalName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.SerializerBase void addAttributes(org.xml.sax.Attributes) 0'>
+    <item name='org.apache.xml.serializer.NamespaceMappings java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.Encodings boolean isRecognizedEncoding(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.NamespaceMappings java.lang.String lookupNamespace(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.ToXMLStream void CopyFrom(org.apache.xml.serializer.ToXMLStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.ToTextStream void characters(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.SerializerFactory org.apache.xml.serializer.Serializer getSerializer(java.util.Properties)'>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler boolean startPrefixMapping(java.lang.String, java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.ToHTMLStream void writeAttrString(java.io.Writer, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.serializer.ToStream void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.Serializer org.apache.xml.serializer.DOMSerializer asDOMSerializer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.serializer.ToHTMLStream void entityReference(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.ToHTMLStream void processingInstruction(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.serializer.ToTextStream boolean startPrefixMapping(java.lang.String, java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.serializer.NamespaceMappings java.lang.String lookupNamespace(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.Version java.lang.String getProduct()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.OutputPropertyUtils int getIntProperty(java.lang.String, java.util.Properties) 1'>
+    <item name='org.apache.xml.serializer.ToUnknownStream void addUniqueAttribute(java.lang.String, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.ToSAXHandler void characters(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToHTMLStream org.apache.xml.serializer.ElemDesc getElemDesc(java.lang.String) 0'>
+    <item name='org.apache.xml.serializer.AttributesImplSerializer int getIndex(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase void warning(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void startPrefixMapping(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.ToTextStream void comment(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.serializer.Serializer java.lang.Object asDOM3Serializer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerFactory org.apache.xml.serializer.Serializer getSerializer(java.util.Properties)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void setOutputFormat(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void processAttribute(java.io.Writer, java.lang.String, java.lang.String, org.apache.xml.serializer.ElemDesc) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void startEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void setDocumentLocator(org.xml.sax.Locator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.AttributesImplSerializer int getIndex(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void characters(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream org.xml.sax.ContentHandler asContentHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler void namespaceAfterStartElement(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.DOM3Serializer void serializeDOM3(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase org.apache.xml.serializer.DOMSerializer asDOMSerializer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream java.util.Properties getOutputFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void setOutputFormat(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.OutputPropertyUtils boolean getBooleanProperty(java.lang.String, java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void entityReference(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.Serializer void setOutputFormat(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase void comment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void setOutputFormat(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void startPrefixMapping(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.NamespaceMappings boolean pushNamespace(java.lang.String, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void entityReference(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void fatalError(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.AttributesImplSerializer int getIndex(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void setNewLine(char[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase void error(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void warning(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase java.lang.Object asDOM3Serializer()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void addUniqueAttribute(java.lang.String, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.AttributesImplSerializer void setAttributes(org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.TreeWalker void startNode(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.Encodings boolean isRecognizedEncoding(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase void addAttributes(org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void startPrefixMapping(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler void addUniqueAttribute(java.lang.String, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.Version java.lang.String getVersion()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void startEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void addUniqueAttribute(java.lang.String, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase java.lang.String getOutputProperty(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.Serializer org.xml.sax.ContentHandler asContentHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream org.apache.xml.serializer.ElemDesc getElemDesc(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler void addUniqueAttribute(java.lang.String, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void characters(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.OutputPropertyUtils boolean getBooleanProperty(java.lang.String, java.util.Properties) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void setEncoding(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLStream void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void characters(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void addUniqueAttribute(java.lang.String, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ExtendedLexicalHandler void comment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void addUniqueAttribute(java.lang.String, java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void characters(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase java.lang.String getPrefixPart(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void setOutputFormat(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void startEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void setContentHandler(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLStream void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void setEncoding(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void startPrefixMapping(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void comment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void startEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void addUniqueAttribute(java.lang.String, java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void namespaceAfterStartElement(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerFactory org.apache.xml.serializer.Serializer getSerializer(java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void writeAttrString(java.io.Writer, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase java.lang.String patchName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.OutputPropertyUtils int getIntProperty(java.lang.String, java.util.Properties) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler java.lang.String getNamespaceURI(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializationHandler void setContentHandler(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler void addAttributes(org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void comment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.Version java.lang.String getImplementationLanguage()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream java.lang.String getNamespaceURI(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.NamespaceMappings java.lang.String[] lookupAllPrefixes(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream void setContentHandler(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.OutputPropertyUtils int getIntProperty(java.lang.String, java.util.Properties) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.serializer.TreeWalker void endNode(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.ToHTMLStream void addUniqueAttribute(java.lang.String, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.SerializerBase java.lang.String patchName(java.lang.String) 0'>
+    <item name='org.apache.xml.serializer.SerializerBase void setOutputProperty(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.SerializerBase void endEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToHTMLStream void setOutputFormat(java.util.Properties) 0'>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.Version java.lang.String getVersion()'>
+    <item name='org.apache.xml.serializer.ToUnknownStream void comment(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.ToTextSAXHandler void characters(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToHTMLStream void processAttribute(java.io.Writer, java.lang.String, java.lang.String, org.apache.xml.serializer.ElemDesc) 2'>
+    <item name='org.apache.xml.serializer.ToHTMLStream void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void comment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void namespaceAfterStartElement(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase void characters(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase org.xml.sax.ContentHandler asContentHandler()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void processAttribute(java.io.Writer, java.lang.String, java.lang.String, org.apache.xml.serializer.ElemDesc) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase void entityReference(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.OutputPropertiesFactory java.util.Properties getDefaultMethodProperties(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void namespaceAfterStartElement(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase void namespaceAfterStartElement(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase java.lang.String getLocalName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToHTMLStream void processAttribute(java.io.Writer, java.lang.String, java.lang.String, org.apache.xml.serializer.ElemDesc) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void startPrefixMapping(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler void entityReference(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void setContentHandler(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase java.lang.String getNamespaceURI(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.NamespaceMappings java.lang.String lookupNamespace(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToStream int writeUTF16Surrogate(char, char[], int, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void error(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void namespaceAfterStartElement(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToUnknownStream void setDocumentLocator(org.xml.sax.Locator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.Encodings char getHighChar(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase void fatalError(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase java.lang.String getNamespaceURI(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLStream void CopyFrom(org.apache.xml.serializer.ToXMLStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToTextStream void characters(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.NamespaceMappings java.lang.String generateNextPrefix()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ExtendedContentHandler java.lang.String getNamespaceURI(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLStream void namespaceAfterStartElement(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.SerializerBase java.lang.String patchName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.ToXMLSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.ToHTMLStream void writeAttrURI(java.io.Writer, java.lang.String, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.OutputPropertyUtils boolean getBooleanProperty(java.lang.String, java.util.Properties) 1'>
+    <item name='org.apache.xml.serializer.ToTextSAXHandler void setDocumentLocator(org.xml.sax.Locator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.ToSAXHandler void characters(java.lang.String) 0'>
+    <item name='org.apache.xml.serializer.ToSAXHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xml/serializer/dom3/annotations.xml b/android-sdk-annotations/org/apache/xml/serializer/dom3/annotations.xml
index c6e5718e0cf..c211a1c089a 100644
--- a/android-sdk-annotations/org/apache/xml/serializer/dom3/annotations.xml
+++ b/android-sdk-annotations/org/apache/xml/serializer/dom3/annotations.xml
@@ -1,8 +1,8 @@
 <root>
-    <item name='org.apache.xml.serializer.dom3.NamespaceSupport java.util.Enumeration getAllPrefixes()'>
+    <item name='org.apache.xml.serializer.dom3.LSSerializerImpl void setParameter(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.dom3.LSSerializerImpl org.w3c.dom.DOMConfiguration getDomConfig()'>
+    <item name='org.apache.xml.serializer.dom3.LSSerializerImpl org.w3c.dom.DOMStringList getParameterNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.dom3.LSSerializerImpl boolean write(org.w3c.dom.Node, org.w3c.dom.ls.LSOutput) 1'>
@@ -14,16 +14,19 @@
     <item name='org.apache.xml.serializer.dom3.LSSerializerImpl java.lang.Object getParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.dom3.DOM3SerializerImpl void serializeDOM3(org.w3c.dom.Node) 0'>
+    <item name='org.apache.xml.serializer.dom3.NamespaceSupport.Prefixes java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.dom3.NamespaceSupport.Prefixes java.lang.String toString()'>
+    <item name='org.apache.xml.serializer.dom3.DOM3SerializerImpl void serializeDOM3(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.dom3.LSSerializerImpl boolean canSetParameter(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.dom3.LSSerializerImpl org.w3c.dom.DOMStringList getParameterNames()'>
+    <item name='org.apache.xml.serializer.dom3.NamespaceSupport java.util.Enumeration getAllPrefixes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.dom3.LSSerializerImpl org.w3c.dom.DOMConfiguration getDomConfig()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xml/serializer/utils/annotations.xml b/android-sdk-annotations/org/apache/xml/serializer/utils/annotations.xml
index d2bc9dbba6e..4c693c037a3 100644
--- a/android-sdk-annotations/org/apache/xml/serializer/utils/annotations.xml
+++ b/android-sdk-annotations/org/apache/xml/serializer/utils/annotations.xml
@@ -1,32 +1,62 @@
 <root>
+    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getType(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getType(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.AttList int getIndex(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_de java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.serializer.utils.SerializerMessages_pl java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_cs java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_tr java.lang.Object[][] getContents()'>
+    <item name='org.apache.xml.serializer.utils.AttList int getIndex(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.utils.SerializerMessages_sl java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_sv java.lang.Object[][] getContents()'>
+    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.utils.XML11Char boolean isXML11ValidNmtoken(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.serializer.utils.XML11Char boolean isXML11ValidNCName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getType(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.XMLChar boolean isValidNmtoken(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.XMLChar boolean isValidNCName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.DOM2Helper java.lang.String getLocalNameOfNode(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.serializer.utils.SystemIDResolver java.lang.String getAbsoluteURI(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getValue(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.XML11Char boolean isXML11ValidName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.serializer.utils.SerializerMessages_ru java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.utils.XML11Char boolean isXML11ValidNCName(java.lang.String) 0'>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_ko java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.utils.XMLChar boolean isValidNmtoken(java.lang.String) 0'>
+    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.utils.SerializerMessages java.lang.Object[][] getContents()'>
@@ -35,73 +65,70 @@
     <item name='org.apache.xml.serializer.utils.SerializerMessages_sk java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.utils.StringToIntTable java.lang.String[] keys()'>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_tr java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.serializer.utils.XMLChar boolean isValidNCName(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SystemIDResolver java.lang.String getAbsoluteURI(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_ca java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.DOM2Helper java.lang.String getLocalNameOfNode(org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SystemIDResolver java.lang.String getAbsoluteURIFromRelative(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.XML11Char boolean isXML11ValidName(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_pt_BR java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_ko java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getType(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_ja java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_zh java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_fr java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_de java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_it java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.SerializerMessages_zh_TW java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.DOM2Helper java.lang.String getNamespaceOfNode(org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getType(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.XMLChar boolean isValidName(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getType(java.lang.String, java.lang.String)'>
+    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getType(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.serializer.utils.SerializerMessages_es java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.serializer.utils.StringToIntTable java.lang.String[] keys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_zh_TW java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_zh java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_it java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_pt_BR java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.AttList int getIndex(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getType(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.DOM2Helper java.lang.String getNamespaceOfNode(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_fr java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.XMLChar boolean isValidName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_ca java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.AttList java.lang.String getValue(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_ja java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.serializer.utils.SerializerMessages_hu java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.serializer.utils.SystemIDResolver java.lang.String getAbsoluteURIFromRelative(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.serializer.utils.WrappedRuntimeException WrappedRuntimeException(java.lang.Exception) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.serializer.utils.SystemIDResolver java.lang.String getAbsoluteURI(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_sv java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.serializer.utils.SerializerMessages_cs java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xml/utils/annotations.xml b/android-sdk-annotations/org/apache/xml/utils/annotations.xml
index 07793f2c5dd..4023ca7cbe7 100644
--- a/android-sdk-annotations/org/apache/xml/utils/annotations.xml
+++ b/android-sdk-annotations/org/apache/xml/utils/annotations.xml
@@ -1,65 +1,71 @@
 <root>
-    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toUpperCase()'>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getExpandedElementName(org.w3c.dom.Element)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault boolean startsWith(java.lang.String, int) 0'>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Attr setAttributeNodeNS(org.w3c.dom.Attr) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Text createTextNode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.AttList java.lang.String getValue(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.DOM2Helper org.w3c.dom.Element getElementByID(java.lang.String, org.w3c.dom.Document) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.StringToIntTable java.lang.String[] keys()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.URI java.lang.String getPath(boolean, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.ObjectStack ObjectStack(org.apache.xml.utils.ObjectStack) 0'>
+    <item name='org.apache.xml.utils.XMLString int lastIndexOf(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toLowerCase(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.NodeVector void appendNodes(org.apache.xml.utils.NodeVector) 0'>
+    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString fixWhiteSpace(boolean, boolean, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.QName QName(java.lang.String, java.util.Stack, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.utils.NodeVector void appendNodes(org.apache.xml.utils.NodeVector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Comment createComment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.utils.QName java.lang.String getPrefixPart(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.DefaultErrorHandler void error(javax.xml.transform.TransformerException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper boolean isNamespaceNode(org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.DOMBuilder void comment(char[], int, int) 0'>
+    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toLowerCase()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.QName QName(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString substring(int)'>
+    <item name='org.apache.xml.utils.DOMBuilder void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Attr setAttributeNode(org.w3c.dom.Attr) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString boolean endsWith(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.PrefixResolver java.lang.String getNamespaceForPrefix(java.lang.String, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.AttList java.lang.String getType(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XML11Char boolean isXML11ValidNCName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.NamespaceSupport2 java.util.Enumeration getDeclaredPrefixes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.XMLStringDefault int compareToIgnoreCase(org.apache.xml.utils.XMLString) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getExpandedElementName(org.w3c.dom.Element) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.DefaultErrorHandler void warning(org.xml.sax.SAXParseException) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.TreeWalker void endNode(org.w3c.dom.Node) 0'>
+    <item name='org.apache.xml.utils.XMLStringDefault boolean equals(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.DefaultErrorHandler void warning(javax.xml.transform.TransformerException) 0'>
@@ -68,40 +74,40 @@
     <item name='org.apache.xml.utils.URI URI(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getUnparsedEntityURI(java.lang.String, org.w3c.dom.Document) 1'>
+    <item name='org.apache.xml.utils.SystemIDResolver java.lang.String getAbsoluteURIFromRelative(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper void getNodeData(org.w3c.dom.Node, org.apache.xml.utils.FastStringBuffer) 0'>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Element getElementById(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toLowerCase()'>
+    <item name='org.apache.xml.utils.UnImplNode java.lang.Object getUserData(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMBuilder void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+    <item name='org.apache.xml.utils.XMLString boolean equalsIgnoreCase(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getExpandedAttributeName(org.w3c.dom.Attr)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.DOMHelper org.w3c.dom.Node getParentOfNode(org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.IntStack java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.XMLStringDefault int indexOf(java.lang.String, int) 0'>
+    <item name='org.apache.xml.utils.PrefixResolver java.lang.String getNamespaceForPrefix(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.QName QName(java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getNodeData(org.w3c.dom.Node)'>
+    <item name='org.apache.xml.utils.DOMBuilder void startPrefixMapping(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode java.lang.String getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.IntStack java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getExpandedAttributeName(org.w3c.dom.Attr)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XMLCharacterRecognizer boolean isWhiteSpace(java.lang.StringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.QName QName(java.lang.String, java.lang.String) 1'>
+    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString substring(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.DOM2Helper java.lang.String getNamespaceOfNode(org.w3c.dom.Node) 0'>
@@ -110,120 +116,90 @@
     <item name='org.apache.xml.utils.URI URI(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.ObjectVector java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.QName QName(java.lang.String, org.apache.xml.utils.PrefixResolver) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.utils.URI URI(org.apache.xml.utils.URI) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.AttList java.lang.String getType(java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.utils.DOMHelper java.lang.String getExpandedAttributeName(org.w3c.dom.Attr) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.QName QName(java.lang.String, java.util.Stack) 0'>
+    <item name='org.apache.xml.utils.XMLString void dispatchCharactersEvents(org.xml.sax.ContentHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.FastStringBuffer java.lang.String toString()'>
+    <item name='org.apache.xml.utils.XMLString boolean startsWith(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toUpperCase(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault boolean equals(org.apache.xml.utils.XMLString) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.DOM2Helper org.w3c.dom.Node getParentOfNode(org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.ObjectStack java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString concat(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.PrefixResolverDefault java.lang.String getNamespaceForPrefix(java.lang.String) 0'>
+    <item name='org.apache.xml.utils.NamespaceSupport2 java.util.Enumeration getPrefixes(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString trim()'>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Attr removeAttributeNode(org.w3c.dom.Attr) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.QName java.lang.String getLocalPart(java.lang.String)'>
+    <item name='org.apache.xml.utils.IntVector java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.AttList int getIndex(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.QName QName(java.lang.String, org.w3c.dom.Element, org.apache.xml.utils.PrefixResolver, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.ObjectVector ObjectVector(org.apache.xml.utils.ObjectVector) 0'>
+    <item name='org.apache.xml.utils.StylesheetPIHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLChar boolean isValidName(java.lang.String) 0'>
+    <item name='org.apache.xml.utils.XMLString int compareTo(org.apache.xml.utils.XMLString) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.ObjectVector ObjectVector(org.apache.xml.utils.ObjectVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.QName java.lang.String getLocalPart(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.SystemIDResolver java.lang.String getAbsoluteURI(java.lang.String, java.lang.String)'>
+    <item name='org.apache.xml.utils.AttList java.lang.String getType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.URI URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString substring(int, int)'>
+    <item name='org.apache.xml.utils.DOMBuilder void endEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.WrappedRuntimeException WrappedRuntimeException(java.lang.Exception) 0'>
+    <item name='org.apache.xml.utils.XMLStringDefault boolean equalsIgnoreCase(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.QName org.apache.xml.utils.QName getQNameFromString(java.lang.String) 0'>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString toLowerCase(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.ThreadControllerWrapper.ThreadController void waitThread(java.lang.Thread, java.lang.Runnable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.QName java.lang.String getPrefixFromXMLNSDecl(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.QName org.apache.xml.utils.QName getQNameFromString(java.lang.String)'>
+    <item name='org.apache.xml.utils.StylesheetPIHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.QName QName(java.lang.String, org.apache.xml.utils.PrefixResolver, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.ThreadControllerWrapper void waitThread(java.lang.Thread, java.lang.Runnable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getUniqueID(org.w3c.dom.Node) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.SystemIDResolver java.lang.String getAbsoluteURI(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.XMLStringDefault int lastIndexOf(java.lang.String, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString fixWhiteSpace(boolean, boolean, boolean)'>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString concat(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XMLStringDefault boolean startsWith(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault int indexOf(java.lang.String) 0'>
+    <item name='org.apache.xml.utils.AttList int getIndex(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.FastStringBuffer java.lang.String getOneChunkString(int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.URI java.lang.String toString()'>
+    <item name='org.apache.xml.utils.XMLStringFactory org.apache.xml.utils.XMLString emptystr()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XML11Char boolean isXML11ValidQName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.utils.XMLStringDefault void dispatchCharactersEvents(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.utils.PrefixResolverDefault java.lang.String getNamespaceForPrefix(java.lang.String, org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -233,36 +209,24 @@
     <item name='org.apache.xml.utils.URI URI(java.lang.String, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.AttList java.lang.String getType(java.lang.String)'>
+    <item name='org.apache.xml.utils.DOMHelper org.w3c.dom.Element getElementByID(java.lang.String, org.w3c.dom.Document) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.QName java.lang.String getPrefixFromXMLNSDecl(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.NamespaceSupport2 java.util.Enumeration getPrefixes()'>
+    <item name='org.apache.xml.utils.XMLStringFactory org.apache.xml.utils.XMLString newstr(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.FastStringBuffer java.lang.String getString(int, int)'>
+    <item name='org.apache.xml.utils.XMLString int indexOf(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLReaderManager org.apache.xml.utils.XMLReaderManager getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.NamespaceSupport2 boolean declarePrefix(java.lang.String, java.lang.String) 0'>
+    <item name='org.apache.xml.utils.XMLString boolean startsWith(org.apache.xml.utils.XMLString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.NamespaceSupport2 java.lang.String[] processName(java.lang.String, java.lang.String[], boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.AttList java.lang.String getType(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.IntVector IntVector(org.apache.xml.utils.IntVector) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.IntStack IntStack(org.apache.xml.utils.IntStack) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.utils.QName boolean isXMLNSDecl(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -272,22 +236,22 @@
     <item name='org.apache.xml.utils.DefaultErrorHandler void printLocation(java.io.PrintWriter, java.lang.Throwable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XML11Char boolean isXML11ValidNmtoken(java.lang.String) 0'>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString substring(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault int lastIndexOf(java.lang.String) 0'>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Node removeChild(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XML11Char boolean isXML11ValidName(java.lang.String) 0'>
+    <item name='org.apache.xml.utils.DOMBuilder void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.QName QName(java.lang.String) 0'>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.CDATASection createCDATASection(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getUniqueID(org.w3c.dom.Node)'>
+    <item name='org.apache.xml.utils.AttList java.lang.String getType(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getNodeData(org.w3c.dom.Node) 0'>
+    <item name='org.apache.xml.utils.XMLString int indexOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.DefaultErrorHandler DefaultErrorHandler(java.io.PrintStream) 0'>
@@ -296,21 +260,327 @@
     <item name='org.apache.xml.utils.XMLStringDefault boolean endsWith(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.QName QName(java.lang.String, java.lang.String, java.lang.String, boolean) 2'>
+    <item name='org.apache.xml.utils.SAXSourceLocator SAXSourceLocator(javax.xml.transform.SourceLocator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.SAXSourceLocator SAXSourceLocator(javax.xml.transform.SourceLocator) 0'>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString toLowerCase()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XMLChar boolean isValidQName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.ThreadControllerWrapper.ThreadController java.lang.Thread run(java.lang.Runnable, int)'>
+    <item name='org.apache.xml.utils.ObjectStack java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.DefaultErrorHandler void printLocation(java.io.PrintStream, org.xml.sax.SAXParseException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.utils.UnImplNode void removeAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.FastStringBuffer java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName QName(java.lang.String, org.w3c.dom.Element, org.apache.xml.utils.PrefixResolver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.AttList java.lang.String getType(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString trim()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.AttList java.lang.String getValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.AttList int getIndex(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString boolean startsWith(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.StylesheetPIHandler void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getNamespaceForPrefix(java.lang.String, org.w3c.dom.Element) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName java.lang.String getLocalPart(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString toLowerCase(java.util.Locale) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName org.apache.xml.utils.QName getQNameFromString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.NamespaceSupport2 java.util.Enumeration getPrefixes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.SystemIDResolver java.lang.String getAbsoluteURI(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString int compareToIgnoreCase(org.apache.xml.utils.XMLString) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.SystemIDResolver java.lang.String getAbsoluteURI(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString int indexOf(org.apache.xml.utils.XMLString) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString boolean equals(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMBuilder void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault void getChars(int, int, char[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.FastStringBuffer java.lang.String getOneChunkString(int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault boolean startsWith(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.URI java.lang.String getPath(boolean, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.ObjectStack ObjectStack(org.apache.xml.utils.ObjectStack) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString boolean startsWith(org.apache.xml.utils.XMLString, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper boolean isNamespaceNode(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault int compareToIgnoreCase(org.apache.xml.utils.XMLString) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getExpandedElementName(org.w3c.dom.Element) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DefaultErrorHandler void warning(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString void dispatchAsComment(org.xml.sax.ext.LexicalHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.TreeWalker void endNode(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName java.lang.String getPrefixPart(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMBuilder void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMBuilder void startEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString trim()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.FastStringBuffer java.lang.String getString(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper void getNodeData(org.w3c.dom.Node, org.apache.xml.utils.FastStringBuffer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getUnparsedEntityURI(java.lang.String, org.w3c.dom.Document) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMBuilder void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper org.w3c.dom.Node getParentOfNode(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString toUpperCase(java.util.Locale) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString boolean equals(org.apache.xml.utils.XMLString) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault int indexOf(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode boolean isSupported(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString substring(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getNodeData(org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.StylesheetPIHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toUpperCase()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName QName(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName QName(java.lang.String, org.apache.xml.utils.PrefixResolver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString concat(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName QName(java.lang.String, java.util.Stack) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault boolean equals(org.apache.xml.utils.XMLString) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOM2Helper org.w3c.dom.Node getParentOfNode(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.AttList java.lang.String getType(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DefaultErrorHandler void fatalError(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMBuilder void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.PrefixResolverDefault java.lang.String getNamespaceForPrefix(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.NamespaceSupport2 java.util.Enumeration getDeclaredPrefixes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.ObjectVector java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.StylesheetPIHandler void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLChar boolean isValidName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString concat(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.WrappedRuntimeException WrappedRuntimeException(java.lang.Exception) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString void getChars(int, int, char[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName java.lang.String getPrefixFromXMLNSDecl(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName org.apache.xml.utils.QName getQNameFromString(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.ThreadControllerWrapper.ThreadController void waitThread(java.lang.Thread, java.lang.Runnable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.ThreadControllerWrapper java.lang.Thread runThread(java.lang.Runnable, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLReaderManager org.apache.xml.utils.XMLReaderManager getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.ThreadControllerWrapper void waitThread(java.lang.Thread, java.lang.Runnable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Node appendChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getUniqueID(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault int lastIndexOf(java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.StringToIntTable java.lang.String[] keys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault int indexOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode void setIdAttributeNode(org.w3c.dom.Attr, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode java.lang.Object setUserData(java.lang.String, java.lang.Object, org.w3c.dom.UserDataHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toLowerCase(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getLocalNameOfNode(org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.AttList java.lang.String getType(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.AttList java.lang.String getLocalName(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.NamespaceSupport2 boolean declarePrefix(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString int lastIndexOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Node renameNode(org.w3c.dom.Node, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.IntVector IntVector(org.apache.xml.utils.IntVector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.IntStack IntStack(org.apache.xml.utils.IntStack) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString substring(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringFactory org.apache.xml.utils.XMLString newstr(org.apache.xml.utils.FastStringBuffer, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.URI java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XML11Char boolean isXML11ValidNmtoken(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault int lastIndexOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Node importNode(org.w3c.dom.Node, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XML11Char boolean isXML11ValidName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName QName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString toUpperCase()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getNodeData(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString fixWhiteSpace(boolean, boolean, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.QName QName(java.lang.String, java.lang.String, java.lang.String, boolean) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.utils.XMLStringDefault boolean startsWith(org.apache.xml.utils.XMLString, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -320,30 +590,36 @@
     <item name='org.apache.xml.utils.SAXSourceLocator SAXSourceLocator(org.xml.sax.SAXParseException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toUpperCase(java.util.Locale)'>
+    <item name='org.apache.xml.utils.XMLString org.apache.xml.utils.XMLString toUpperCase(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.IntVector java.lang.Object clone()'>
+    <item name='org.apache.xml.utils.DOMBuilder void processingInstruction(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getLocalNameOfNode(org.w3c.dom.Node)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.ThreadControllerWrapper java.lang.Thread runThread(java.lang.Runnable, int)'>
+    <item name='org.apache.xml.utils.DOMBuilder void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XMLChar boolean isValidNCName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.utils.DefaultErrorHandler void error(org.xml.sax.SAXParseException) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringFactory org.apache.xml.utils.XMLString newstr(char[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.utils.XMLStringDefault int compareTo(org.apache.xml.utils.XMLString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.QName QName(java.lang.String, org.w3c.dom.Element, org.apache.xml.utils.PrefixResolver) 0'>
+    <item name='org.apache.xml.utils.UnImplNode org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.DOMHelper java.lang.String getLocalNameOfNode(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.utils.DOMHelper java.lang.String getUniqueID(org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xml.utils.DOMHelper org.w3c.dom.Node getRootNode(org.w3c.dom.Node) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -353,42 +629,33 @@
     <item name='org.apache.xml.utils.URI void setScheme(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.QName java.lang.String getPrefixPart(java.lang.String)'>
+    <item name='org.apache.xml.utils.URI java.lang.String getSchemeSpecificPart()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XMLStringDefault int indexOf(org.apache.xml.utils.XMLString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.URI java.lang.String getSchemeSpecificPart()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.utils.FastStringBuffer void sendSAXComment(org.xml.sax.ext.LexicalHandler, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.StylesheetPIHandler void processingInstruction(java.lang.String, java.lang.String) 0'>
+    <item name='org.apache.xml.utils.StylesheetPIHandler void processingInstruction(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getNamespaceForPrefix(java.lang.String, org.w3c.dom.Element) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.NamespaceSupport2 java.util.Enumeration getPrefixes(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toLowerCase(java.util.Locale)'>
+    <item name='org.apache.xml.utils.XMLStringDefault void dispatchAsComment(org.xml.sax.ext.LexicalHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XMLStringDefault boolean startsWith(org.apache.xml.utils.XMLString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString concat(java.lang.String)'>
+    <item name='org.apache.xml.utils.DOMBuilder void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.XMLStringDefault org.apache.xml.utils.XMLString toUpperCase(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.DefaultErrorHandler void printLocation(java.io.PrintStream, javax.xml.transform.TransformerException) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.SystemIDResolver java.lang.String getAbsoluteURIFromRelative(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.utils.QName QName(java.lang.String, java.lang.String, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -398,10 +665,13 @@
     <item name='org.apache.xml.utils.SAXSourceLocator SAXSourceLocator(org.xml.sax.Locator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.AttList java.lang.String getLocalName(int)'>
+    <item name='org.apache.xml.utils.AttList java.lang.String getValue(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.DOMHelper java.lang.String getExpandedElementName(org.w3c.dom.Element)'>
+    <item name='org.apache.xml.utils.DOMBuilder void setDocumentLocator(org.xml.sax.Locator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.ThreadControllerWrapper.ThreadController java.lang.Thread run(java.lang.Runnable, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.XMLChar boolean isValidNmtoken(java.lang.String) 0'>
diff --git a/android-sdk-annotations/org/apache/xml/utils/res/annotations.xml b/android-sdk-annotations/org/apache/xml/utils/res/annotations.xml
index 90da5c03065..bbf2d265122 100644
--- a/android-sdk-annotations/org/apache/xml/utils/res/annotations.xml
+++ b/android-sdk-annotations/org/apache/xml/utils/res/annotations.xml
@@ -1,5 +1,8 @@
 <root>
-    <item name='org.apache.xml.utils.res.XResources_ja_JP_I java.lang.Object[][] getContents()'>
+    <item name='org.apache.xml.utils.res.XResources_ja_JP_HA java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResourceBundle org.apache.xml.utils.res.XResourceBundle loadResourceBundle(java.lang.String, java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.res.XResourceBundle org.apache.xml.utils.res.XResourceBundle loadResourceBundle(java.lang.String, java.util.Locale) 1'>
@@ -8,58 +11,55 @@
     <item name='org.apache.xml.utils.res.XResources_en java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.res.XResources_ja_JP_A java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResources_zh_TW java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResources_de java.lang.Object[][] getContents()'>
+    <item name='org.apache.xml.utils.res.XResourceBundle java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.res.XResources_it java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.res.XResources_fr java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResources_cy java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xml.utils.res.XResources_sv java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.res.XResources_es java.lang.Object[][] getContents()'>
+    <item name='org.apache.xml.utils.res.XResources_ja_JP_A java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xml.utils.res.XResources_hy java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResourceBundle org.apache.xml.utils.res.XResourceBundle loadResourceBundle(java.lang.String, java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResources_ko java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResourceBundle java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResources_el java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResources_he java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResources_ka java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResources_ja_JP_HA java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xml.utils.res.XResources_zh_CN java.lang.Object[][] getContents()'>
+    <item name='org.apache.xml.utils.res.XResources_ja_JP_I java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xml.utils.res.XResources_ja_JP_HI java.lang.Object[][] getContents()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xml.utils.res.XResources_de java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_zh_TW java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_ka java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_cy java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_hy java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_he java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_ko java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_es java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_zh_CN java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_el java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xml.utils.res.XResources_fr java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xpath/annotations.xml b/android-sdk-annotations/org/apache/xpath/annotations.xml
index dfb3b70bc64..33ae213b4ea 100644
--- a/android-sdk-annotations/org/apache/xpath/annotations.xml
+++ b/android-sdk-annotations/org/apache/xpath/annotations.xml
@@ -1,29 +1,35 @@
 <root>
-    <item name='org.apache.xpath.NodeSet org.w3c.dom.traversal.NodeIterator cloneWithReset()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.apache.xml.dtm.DTMIterator) 0'>
+    <item name='org.apache.xpath.XPathContext org.apache.xml.dtm.DTMIterator createDTMIterator(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xpath.XPathContext, org.apache.xml.utils.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.XPathContext.XPathExpressionContext java.lang.String toString(org.w3c.dom.Node)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.XPath boolean bool(org.apache.xpath.XPathContext, int, org.apache.xml.utils.PrefixResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
+    <item name='org.apache.xpath.ExtensionsProvider java.lang.Object extFunction(org.apache.xpath.functions.FuncExtFunction, java.util.Vector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.XPathException org.apache.xpath.ExpressionNode getExpressionOwner(org.apache.xpath.ExpressionNode) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.Expression int asNode(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.XPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.XPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String) 0'>
+    <item name='org.apache.xpath.NodeSet org.w3c.dom.traversal.NodeIterator cloneWithReset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.Expression void warn(org.apache.xpath.XPathContext, java.lang.String, java.lang.Object[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.XPath double getMatchScore(org.apache.xpath.XPathContext, int) 0'>
@@ -32,106 +38,70 @@
     <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.NodeSet void addNodesInDocOrder(org.w3c.dom.traversal.NodeIterator, org.apache.xpath.XPathContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.NodeSet void addNodesInDocOrder(org.w3c.dom.NodeList, org.apache.xpath.XPathContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String, org.apache.xml.utils.PrefixResolver) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.NodeSetDTM org.apache.xml.dtm.DTMIterator cloneWithReset()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathContext org.apache.xml.dtm.DTMIterator createDTMIterator(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathException XPathException(java.lang.String, org.apache.xpath.ExpressionNode) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.SourceTreeManager int getSourceTree(javax.xml.transform.Source, javax.xml.transform.SourceLocator, org.apache.xpath.XPathContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPath void error(org.apache.xpath.XPathContext, int, java.lang.String, java.lang.Object[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPath void warn(org.apache.xpath.XPathContext, int, java.lang.String, java.lang.Object[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getLocalVariable(org.apache.xpath.XPathContext, int, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String, org.apache.xml.utils.PrefixResolver) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathContext.XPathExpressionContext org.w3c.dom.traversal.NodeIterator getContextNodes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.w3c.dom.traversal.NodeIterator, org.apache.xpath.XPathContext) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPath XPath(java.lang.String, javax.xml.transform.SourceLocator, org.apache.xml.utils.PrefixResolver, int, javax.xml.transform.ErrorListener) 0'>
+    <item name='org.apache.xpath.Expression org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.XPathContext.XPathExpressionContext org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xml.utils.QName)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.Expression org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int, org.apache.xml.dtm.DTM, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathException XPathException(java.lang.String, org.apache.xpath.ExpressionNode) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPath void error(org.apache.xpath.XPathContext, int, java.lang.String, java.lang.Object[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xpath.XPathContext, org.apache.xml.utils.QName)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPath void warn(org.apache.xpath.XPathContext, int, java.lang.String, java.lang.Object[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.CachedXPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String, org.apache.xml.utils.PrefixResolver) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.CachedXPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPath XPath(java.lang.String, javax.xml.transform.SourceLocator, org.apache.xml.utils.PrefixResolver, int, javax.xml.transform.ErrorListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathVisitor boolean visitVariableRef(org.apache.xpath.ExpressionOwner, org.apache.xpath.operations.Variable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.XPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.XPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getGlobalVariable(org.apache.xpath.XPathContext, int, boolean)'>
+    <item name='org.apache.xpath.XPathException void printStackTrace(java.io.PrintStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.Expression boolean bool(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.Expression org.apache.xml.dtm.DTMIterator asIteratorRaw(org.apache.xpath.XPathContext, int)'>
+    <item name='org.apache.xpath.ExpressionNode void exprAddChild(org.apache.xpath.ExpressionNode, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.XPath XPath(java.lang.String, javax.xml.transform.SourceLocator, org.apache.xml.utils.PrefixResolver, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.w3c.dom.NodeList, org.apache.xpath.XPathContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.SourceTreeManager int parseToNode(javax.xml.transform.Source, javax.xml.transform.SourceLocator, org.apache.xpath.XPathContext) 2'>
+    <item name='org.apache.xpath.NodeSetDTM void setRoot(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.XPathException org.w3c.dom.Node getStylesheetNode(org.apache.xpath.ExpressionNode) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.XPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String) 1'>
+    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String) 1'>
+    <item name='org.apache.xpath.XPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.SourceTreeManager int getNode(javax.xml.transform.Source) 0'>
@@ -146,34 +116,163 @@
     <item name='org.apache.xpath.XPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.NodeSetDTM void appendNodes(org.apache.xml.utils.NodeVector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathException void printStackTrace(java.io.PrintWriter) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.ExtensionsProvider java.lang.Object extFunction(java.lang.String, java.lang.String, java.util.Vector, java.lang.Object) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getGlobalVariable(org.apache.xpath.XPathContext, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.XPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
+    <item name='org.apache.xpath.Expression org.apache.xml.dtm.DTMIterator asIterator(org.apache.xpath.XPathContext, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.XPathContext.XPathExpressionContext java.lang.String toString(org.w3c.dom.Node)'>
+    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.CachedXPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.Expression void exprAddChild(org.apache.xpath.ExpressionNode, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathContext void setErrorListener(javax.xml.transform.ErrorListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPath org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int, org.apache.xml.utils.PrefixResolver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.apache.xml.dtm.DTMIterator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathVisitor boolean visitPredicate(org.apache.xpath.ExpressionOwner, org.apache.xpath.Expression) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getLocalVariable(org.apache.xpath.XPathContext, int, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPath void setExpression(org.apache.xpath.Expression) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.Expression void error(org.apache.xpath.XPathContext, java.lang.String, java.lang.Object[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.Expression void executeCharsToContentHandler(org.apache.xpath.XPathContext, org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.NodeSetDTM org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.NodeSet void addNodesInDocOrder(org.w3c.dom.traversal.NodeIterator, org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.NodeSet void addNodesInDocOrder(org.w3c.dom.NodeList, org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.ExtensionsProvider java.lang.Object extFunction(java.lang.String, java.lang.String, java.util.Vector, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getGlobalVariable(org.apache.xpath.XPathContext, int, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String, org.apache.xml.utils.PrefixResolver) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.SourceTreeManager int getSourceTree(javax.xml.transform.Source, javax.xml.transform.SourceLocator, org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.Expression org.apache.xml.dtm.DTMIterator asIteratorRaw(org.apache.xpath.XPathContext, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathVisitor boolean visitLocationPath(org.apache.xpath.ExpressionOwner, org.apache.xpath.axes.LocPathIterator) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathContext.XPathExpressionContext org.w3c.dom.traversal.NodeIterator getContextNodes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.w3c.dom.traversal.NodeIterator, org.apache.xpath.XPathContext) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.Expression org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.Expression void fixupVariables(java.util.Vector, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.VariableStack java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.NodeSet void appendNodes(org.apache.xpath.NodeSet) 0'>
+    <item name='org.apache.xpath.XPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.NodeSetDTM void appendNodes(org.apache.xml.utils.NodeVector) 0'>
+    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPath XPath(java.lang.String, javax.xml.transform.SourceLocator, org.apache.xml.utils.PrefixResolver, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.w3c.dom.NodeList, org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.SourceTreeManager int parseToNode(javax.xml.transform.Source, javax.xml.transform.SourceLocator, org.apache.xpath.XPathContext) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.XPathContext boolean release(org.apache.xml.dtm.DTM, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.NodeSet void appendNodes(org.apache.xpath.NodeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.w3c.dom.traversal.NodeIterator, org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xpath.XPathContext, org.apache.xml.utils.QName) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.CachedXPathAPI CachedXPathAPI(org.apache.xpath.CachedXPathAPI) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.NodeSetDTM void addNodesInDocOrder(org.apache.xml.dtm.DTMIterator, org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.XPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.NodeSetDTM void addNodesInDocOrder(org.apache.xml.dtm.DTMIterator, org.apache.xpath.XPathContext) 0'>
+    <item name='org.apache.xpath.Expression org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.XPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String) 1'>
@@ -185,52 +284,31 @@
     <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.apache.xpath.NodeSetDTM) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xpath.XPathContext, org.apache.xml.utils.QName)'>
+    <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.w3c.dom.NodeList, org.apache.xpath.XPathContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.Expression org.apache.xml.dtm.DTMIterator asIteratorRaw(org.apache.xpath.XPathContext, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.NodeSetDTM NodeSetDTM(org.w3c.dom.NodeList, org.apache.xpath.XPathContext) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.XPath XPath(java.lang.String, javax.xml.transform.SourceLocator, org.apache.xml.utils.PrefixResolver, int, javax.xml.transform.ErrorListener, org.apache.xpath.compiler.FunctionTable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.XPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.XPathVisitable void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getLocalVariable(org.apache.xpath.XPathContext, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.SourceTreeManager void putDocumentInCache(int, javax.xml.transform.Source) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.XPath org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, org.w3c.dom.Node, org.apache.xml.utils.PrefixResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.Expression org.apache.xml.dtm.DTMIterator asIterator(org.apache.xpath.XPathContext, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.w3c.dom.traversal.NodeIterator selectNodeIterator(org.w3c.dom.Node, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.CachedXPathAPI org.apache.xpath.objects.XObject eval(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.VariableStack org.apache.xpath.objects.XObject getLocalVariable(org.apache.xpath.XPathContext, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathContext void setErrorListener(javax.xml.transform.ErrorListener) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPathAPI org.w3c.dom.Node selectSingleNode(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.XPath org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int, org.apache.xml.utils.PrefixResolver) 0'>
+    <item name='org.apache.xpath.ExpressionOwner void setExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.XPathAPI org.w3c.dom.NodeList selectNodeList(org.w3c.dom.Node, java.lang.String, org.w3c.dom.Node) 1'>
diff --git a/android-sdk-annotations/org/apache/xpath/axes/annotations.xml b/android-sdk-annotations/org/apache/xpath/axes/annotations.xml
index d16fa533f36..2cc8eb582ad 100644
--- a/android-sdk-annotations/org/apache/xpath/axes/annotations.xml
+++ b/android-sdk-annotations/org/apache/xpath/axes/annotations.xml
@@ -5,40 +5,46 @@
     <item name='org.apache.xpath.axes.WalkingIterator void setExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.LocPathIterator org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.axes.PredicatedNodeTest int getProximityPosition(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.LocPathIterator org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.MatchPatternIterator void setRoot(int, java.lang.Object) 1'>
+    <item name='org.apache.xpath.axes.ChildTestIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.DescendantIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+    <item name='org.apache.xpath.axes.MatchPatternIterator void setRoot(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.UnionPathIterator void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.WalkerFactory java.lang.String getAnalysisString(int)'>
+    <item name='org.apache.xpath.axes.PredicatedNodeTest void fixupVariables(java.util.Vector, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.OneStepIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+    <item name='org.apache.xpath.axes.ContextNodeList org.w3c.dom.traversal.NodeIterator cloneWithReset()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.AxesWalker void setExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.LocPathIterator org.apache.xml.dtm.DTMIterator asIterator(org.apache.xpath.XPathContext, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.AxesWalker int getLastPos(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.LocPathIterator void setRoot(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.UnionPathIterator void setRoot(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.LocPathIterator org.apache.xml.dtm.DTMIterator asIterator(org.apache.xpath.XPathContext, int)'>
+    <item name='org.apache.xpath.axes.OneStepIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.AxesWalker java.lang.Object clone()'>
+    <item name='org.apache.xpath.axes.FilterExprIteratorSimple void fixupVariables(java.util.Vector, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.ChildIterator int asNode(org.apache.xpath.XPathContext) 0'>
@@ -50,10 +56,10 @@
     <item name='org.apache.xpath.axes.AxesWalker void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.HasPositionalPredChecker boolean check(org.apache.xpath.axes.LocPathIterator) 0'>
+    <item name='org.apache.xpath.axes.AxesWalker void init(org.apache.xpath.compiler.Compiler, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.FilterExprWalker java.lang.Object clone()'>
+    <item name='org.apache.xpath.axes.HasPositionalPredChecker boolean check(org.apache.xpath.axes.LocPathIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.WalkingIterator void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
@@ -62,31 +68,64 @@
     <item name='org.apache.xpath.axes.FilterExprWalker void setInnerExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.UnionPathIterator org.apache.xpath.axes.LocPathIterator createUnionIterator(org.apache.xpath.compiler.Compiler, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.ReverseAxesWalker int getLastPos(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.LocPathIterator void executeCharsToContentHandler(org.apache.xpath.XPathContext, org.xml.sax.ContentHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.WalkingIteratorSorted void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.DescendantIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.FilterExprIteratorSimple void setInnerExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.LocPathIterator int asNode(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.OneStepIterator void setRoot(int, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.PredicatedNodeTest java.lang.String nodeToString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.AxesWalker java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.MatchPatternIterator short acceptNode(int, org.apache.xpath.XPathContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.UnionChildIterator void addNodeTest(org.apache.xpath.axes.PredicatedNodeTest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.LocPathIterator void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
+    <item name='org.apache.xpath.axes.WalkerFactory org.apache.xml.dtm.DTMIterator newDTMIterator(org.apache.xpath.compiler.Compiler, int, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.UnionChildIterator void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.BasicTestIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.LocPathIterator int getLastPos(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.SelfIteratorNoPredicate int asNode(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.LocPathIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+    <item name='org.apache.xpath.axes.LocPathIterator void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.NodeSequence org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+    <item name='org.apache.xpath.axes.WalkerFactory java.lang.String getAnalysisString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.NodeSequence void fixupVariables(java.util.Vector, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.UnionPathIterator org.apache.xpath.axes.LocPathIterator createDTMIterator(org.apache.xpath.compiler.Compiler, int) 0'>
@@ -95,21 +134,33 @@
     <item name='org.apache.xpath.axes.FilterExprWalker void init(org.apache.xpath.compiler.Compiler, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.UnionPathIterator void loadLocationPaths(org.apache.xpath.compiler.Compiler, int, int) 0'>
+    <item name='org.apache.xpath.axes.ChildTestIterator void setRoot(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.UnionPathIterator org.apache.xpath.axes.LocPathIterator createUnionIterator(org.apache.xpath.compiler.Compiler, int)'>
+    <item name='org.apache.xpath.axes.NodeSequence void setRoot(int, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.UnionPathIterator void loadLocationPaths(org.apache.xpath.compiler.Compiler, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.WalkerFactory org.apache.xml.dtm.DTMIterator newDTMIterator(org.apache.xpath.compiler.Compiler, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.UnionPathIterator org.apache.xpath.axes.LocPathIterator createDTMIterator(org.apache.xpath.compiler.Compiler, int)'>
+    <item name='org.apache.xpath.axes.LocPathIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.FilterExprWalker java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.LocPathIterator boolean bool(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.OneStepIteratorForward void setRoot(int, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.PredicatedNodeTest int getLastPos(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.DescendantIterator int asNode(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -119,22 +170,37 @@
     <item name='org.apache.xpath.axes.BasicTestIterator BasicTestIterator(org.apache.xpath.compiler.Compiler, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.SubContextList int getLastPos(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.FilterExprIteratorSimple org.apache.xpath.objects.XNodeSet executeFilterExpr(int, org.apache.xpath.XPathContext, org.apache.xml.utils.PrefixResolver, boolean, int, org.apache.xpath.Expression) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.FilterExprIterator void setRoot(int, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.UnionPathIterator org.apache.xpath.axes.LocPathIterator createDTMIterator(org.apache.xpath.compiler.Compiler, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.FilterExprIteratorSimple org.apache.xpath.objects.XNodeSet executeFilterExpr(int, org.apache.xpath.XPathContext, org.apache.xml.utils.PrefixResolver, boolean, int, org.apache.xpath.Expression) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.DescendantIterator void setRoot(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.PredicatedNodeTest java.lang.String nodeToString(int)'>
+    <item name='org.apache.xpath.axes.SubContextList int getProximityPosition(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.LocPathIterator org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.UnionPathIterator UnionPathIterator(org.apache.xpath.compiler.Compiler, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.ChildTestIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+    <item name='org.apache.xpath.axes.HasPositionalPredChecker boolean visitPredicate(org.apache.xpath.ExpressionOwner, org.apache.xpath.Expression) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.LocPathIterator org.apache.xml.dtm.DTMIterator asIterator(org.apache.xpath.XPathContext, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.UnionPathIterator org.apache.xpath.axes.LocPathIterator createUnionIterator(org.apache.xpath.compiler.Compiler, int) 0'>
@@ -143,25 +209,40 @@
     <item name='org.apache.xpath.axes.UnionPathIterator void addIterator(org.apache.xml.dtm.DTMIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.BasicTestIterator org.apache.xml.dtm.DTMIterator cloneWithReset()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.axes.FilterExprIterator void setInnerExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.axes.WalkerFactory void diagnoseIterator(java.lang.String, int, org.apache.xpath.compiler.Compiler) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.UnionPathIterator void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.WalkerFactory int getAxisFromStep(org.apache.xpath.compiler.Compiler, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.FilterExprIterator void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.WalkingIterator void setRoot(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.axes.SelfIteratorNoPredicate int getLastPos(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.FilterExprWalker void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.axes.FilterExprIteratorSimple void setRoot(int, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.axes.WalkerFactory org.apache.xml.dtm.DTMIterator newDTMIterator(org.apache.xpath.compiler.Compiler, int, boolean)'>
+    <item name='org.apache.xpath.axes.FilterExprWalker int getLastPos(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.NodeSequence org.apache.xml.dtm.DTMIterator cloneWithReset()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.axes.WalkingIterator void fixupVariables(java.util.Vector, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xpath/compiler/annotations.xml b/android-sdk-annotations/org/apache/xpath/compiler/annotations.xml
index de78a40b8b3..8cf1b00a77e 100644
--- a/android-sdk-annotations/org/apache/xpath/compiler/annotations.xml
+++ b/android-sdk-annotations/org/apache/xpath/compiler/annotations.xml
@@ -1,53 +1,47 @@
 <root>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression gte(int)'>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression minus(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression lte(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.compiler.XPathParser void initXPath(org.apache.xpath.compiler.Compiler, java.lang.String, org.apache.xml.utils.PrefixResolver) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression and(int)'>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression neg(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression or(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.XPathParser void initMatchPattern(org.apache.xpath.compiler.Compiler, java.lang.String, org.apache.xml.utils.PrefixResolver) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression plus(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression minus(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression lt(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression union(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression bool(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.XPathParser void initXPath(org.apache.xpath.compiler.Compiler, java.lang.String, org.apache.xml.utils.PrefixResolver) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression mod(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression locationPath(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression mult(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression div(int)'>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression gte(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression number(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression variable(int)'>
+    <item name='org.apache.xpath.compiler.XPathParser void initMatchPattern(org.apache.xpath.compiler.Compiler, java.lang.String, org.apache.xml.utils.PrefixResolver) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression gt(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression mult(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.XPathParser void initXPath(org.apache.xpath.compiler.Compiler, java.lang.String, org.apache.xml.utils.PrefixResolver) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression equals(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression lt(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression bool(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression locationPath(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression div(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.compiler.XPathParser void initMatchPattern(org.apache.xpath.compiler.Compiler, java.lang.String, org.apache.xml.utils.PrefixResolver) 0'>
@@ -56,25 +50,31 @@
     <item name='org.apache.xpath.compiler.OpMap int getNextOpPos(int[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression string(int)'>
+    <item name='org.apache.xpath.compiler.XPathParser java.lang.String dumpRemainingTokenQueue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression lte(int)'>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression variable(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression plus(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression union(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression string(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression notequals(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression neg(int)'>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression or(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression gt(int)'>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression mod(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.compiler.XPathParser java.lang.String dumpRemainingTokenQueue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression equals(int)'>
+    <item name='org.apache.xpath.compiler.Compiler org.apache.xpath.Expression and(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xpath/functions/annotations.xml b/android-sdk-annotations/org/apache/xpath/functions/annotations.xml
index 1b6f7f5eb99..e6e96948927 100644
--- a/android-sdk-annotations/org/apache/xpath/functions/annotations.xml
+++ b/android-sdk-annotations/org/apache/xpath/functions/annotations.xml
@@ -1,134 +1,272 @@
 <root>
-    <item name='org.apache.xpath.functions.FuncCeiling org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncSum org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+    <item name='org.apache.xpath.functions.FunctionMultiArgs void setArg(org.apache.xpath.Expression, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.functions.FuncExtFunction void setArg(org.apache.xpath.Expression, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncUnparsedEntityURI org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+    <item name='org.apache.xpath.functions.FuncCeiling org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncRound org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.functions.FuncTrue void fixupVariables(java.util.Vector, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncPosition org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncQname org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncConcat org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncSum org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncNamespace org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncPosition void postCompileStep(org.apache.xpath.compiler.Compiler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncBoolean org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FunctionOneArg void setExpression(org.apache.xpath.Expression) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncLast void postCompileStep(org.apache.xpath.compiler.Compiler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncExtFunction org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncTranslate org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncId org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncSubstringBefore org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.functions.FuncPosition void fixupVariables(java.util.Vector, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.functions.FuncExtFunction org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncDoclocation org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.functions.FuncBoolean org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncCount org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncNumber org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncExtFunctionAvailable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncExtElementAvailable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncLang org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncNot org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncContains org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncLocalPart org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.Function void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncTrue org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncSystemProperty org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncFalse org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncUnparsedEntityURI org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncLang org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.functions.FuncLast org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.functions.FuncString org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.functions.FuncStartsWith org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncCount org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+    <item name='org.apache.xpath.functions.FuncSum org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncFloor org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.functions.FuncCount org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncStringLength org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.functions.FuncNormalizeSpace void executeCharsToContentHandler(org.apache.xpath.XPathContext, org.xml.sax.ContentHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncGenerateId org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.functions.Function org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncId org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+    <item name='org.apache.xpath.functions.FuncSubstringBefore org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.functions.FuncSystemProperty void loadPropertyFile(java.lang.String, java.util.Properties) 1'>
+    <item name='org.apache.xpath.functions.FuncBoolean org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FunctionMultiArgs void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.Function void setArg(org.apache.xpath.Expression, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncLast void postCompileStep(org.apache.xpath.compiler.Compiler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncContains org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncRound org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncExtElementAvailable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncSubstringAfter org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncExtElementAvailable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncSubstringBefore org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncQname org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncExtFunction void fixupVariables(java.util.Vector, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.functions.FuncCurrent org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.functions.Function void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncStartsWith org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncFloor org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncFalse org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncSubstring org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncGenerateId org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncCount org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncLocalPart org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncCurrent void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncId org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncStringLength org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncFalse void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncSystemProperty org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncFloor org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncSystemProperty org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.Function2Args void setArg(org.apache.xpath.Expression, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncSum org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncUnparsedEntityURI org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncUnparsedEntityURI org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncNamespace org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FunctionOneArg void setArg(org.apache.xpath.Expression, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncLast org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncNamespace org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncTrue org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncNot org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncId org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncCeiling org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncNormalizeSpace org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncRound org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncExtFunctionAvailable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncExtFunctionAvailable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncNumber org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncConcat org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncPosition org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncPosition void postCompileStep(org.apache.xpath.compiler.Compiler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncDoclocation org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncNumber org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.Function3Args void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FunctionOneArg void setExpression(org.apache.xpath.Expression) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncGenerateId org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncExtFunction org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.Function void postCompileStep(org.apache.xpath.compiler.Compiler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncLast org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncConcat org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncLang org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.Function3Args void setArg(org.apache.xpath.Expression, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncNot org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncLang org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncTrue org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncDoclocation org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncQname org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncTranslate org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncPosition org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FunctionOneArg void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncTranslate org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncSystemProperty void loadPropertyFile(java.lang.String, java.util.Properties) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncLast void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncStringLength org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncContains org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.Function2Args void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.functions.FuncCurrent org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.functions.FuncFalse org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.functions.FuncLocalPart org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xpath/jaxp/annotations.xml b/android-sdk-annotations/org/apache/xpath/jaxp/annotations.xml
index 9730b1cb9d6..645fc991de4 100644
--- a/android-sdk-annotations/org/apache/xpath/jaxp/annotations.xml
+++ b/android-sdk-annotations/org/apache/xpath/jaxp/annotations.xml
@@ -20,13 +20,16 @@
     <item name='org.apache.xpath.jaxp.XPathExpressionImpl java.lang.Object evaluate(org.xml.sax.InputSource, javax.xml.namespace.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.jaxp.JAXPVariableStack org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xpath.XPathContext, org.apache.xml.utils.QName) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.jaxp.XPathImpl void setXPathVariableResolver(javax.xml.xpath.XPathVariableResolver) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.jaxp.XPathImpl java.lang.Object evaluate(java.lang.String, java.lang.Object, javax.xml.namespace.QName) 0'>
+    <item name='org.apache.xpath.jaxp.JAXPVariableStack org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xpath.XPathContext, org.apache.xml.utils.QName)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.jaxp.XPathFactoryImpl javax.xml.xpath.XPath newXPath()'>
+    <item name='org.apache.xpath.jaxp.XPathImpl java.lang.Object evaluate(java.lang.String, java.lang.Object, javax.xml.namespace.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.jaxp.XPathFactoryImpl void setFeature(java.lang.String, boolean) 0'>
@@ -44,10 +47,10 @@
     <item name='org.apache.xpath.jaxp.XPathImpl java.lang.String evaluate(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.jaxp.XPathImpl java.lang.Object evaluate(java.lang.String, java.lang.Object, javax.xml.namespace.QName) 2'>
+    <item name='org.apache.xpath.jaxp.XPathImpl java.lang.String evaluate(java.lang.String, org.xml.sax.InputSource) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.jaxp.XPathImpl java.lang.String evaluate(java.lang.String, org.xml.sax.InputSource) 1'>
+    <item name='org.apache.xpath.jaxp.XPathImpl java.lang.Object evaluate(java.lang.String, java.lang.Object, javax.xml.namespace.QName) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.jaxp.XPathFactoryImpl boolean getFeature(java.lang.String) 0'>
@@ -59,6 +62,12 @@
     <item name='org.apache.xpath.jaxp.XPathImpl java.lang.Object evaluate(java.lang.String, org.xml.sax.InputSource, javax.xml.namespace.QName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.jaxp.JAXPPrefixResolver java.lang.String getNamespaceForPrefix(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.jaxp.XPathFactoryImpl javax.xml.xpath.XPath newXPath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.jaxp.JAXPExtensionsProvider java.lang.Object extFunction(java.lang.String, java.lang.String, java.util.Vector, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -74,16 +83,13 @@
     <item name='org.apache.xpath.jaxp.XPathExpressionImpl java.lang.Object evaluate(java.lang.Object, javax.xml.namespace.QName) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.jaxp.XPathImpl javax.xml.xpath.XPathExpression compile(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.jaxp.JAXPVariableStack org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xpath.XPathContext, org.apache.xml.utils.QName) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.jaxp.XPathImpl java.lang.String evaluate(java.lang.String, org.xml.sax.InputSource) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.jaxp.JAXPVariableStack org.apache.xpath.objects.XObject getVariableOrParam(org.apache.xpath.XPathContext, org.apache.xml.utils.QName)'>
+    <item name='org.apache.xpath.jaxp.XPathImpl javax.xml.xpath.XPathExpression compile(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.jaxp.XPathFactoryImpl void setXPathFunctionResolver(javax.xml.xpath.XPathFunctionResolver) 0'>
diff --git a/android-sdk-annotations/org/apache/xpath/objects/annotations.xml b/android-sdk-annotations/org/apache/xpath/objects/annotations.xml
index 9ec59b20dd9..c93c75a4d44 100644
--- a/android-sdk-annotations/org/apache/xpath/objects/annotations.xml
+++ b/android-sdk-annotations/org/apache/xpath/objects/annotations.xml
@@ -1,29 +1,35 @@
 <root>
-    <item name='org.apache.xpath.objects.XBoolean java.lang.String str()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.objects.XNodeSet org.w3c.dom.traversal.NodeIterator nodeset()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.objects.XStringForFSB int compareToIgnoreCase(org.apache.xml.utils.XMLString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XMLStringFactoryImpl org.apache.xml.utils.XMLString newstr(org.apache.xml.utils.FastStringBuffer, int, int)'>
+    <item name='org.apache.xpath.objects.XMLStringFactoryImpl org.apache.xml.utils.XMLString newstr(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XRTreeFragSelectWrapper org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.objects.XNull java.lang.String str()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObject boolean lessThanOrEqual(org.apache.xpath.objects.XObject) 0'>
+    <item name='org.apache.xpath.objects.XString int compareToIgnoreCase(org.apache.xml.utils.XMLString) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XObject org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XNodeSet org.apache.xml.dtm.DTMIterator iterRaw()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XObject void dispatchCharactersEvents(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString substring(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XObject boolean equals(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toLowerCase(java.util.Locale)'>
+    <item name='org.apache.xpath.objects.XNodeSet void appendToFsb(org.apache.xml.utils.FastStringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XNumber java.lang.String getTypeString()'>
+    <item name='org.apache.xpath.objects.XObject boolean lessThanOrEqual(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XNodeSetForDOM XNodeSetForDOM(org.w3c.dom.Node, org.apache.xml.dtm.DTMManager) 1'>
@@ -32,7 +38,7 @@
     <item name='org.apache.xpath.objects.XNodeSet boolean compare(org.apache.xpath.objects.XObject, org.apache.xpath.objects.Comparator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XNodeSet org.apache.xml.dtm.DTMIterator iterRaw()'>
+    <item name='org.apache.xpath.objects.XObject org.apache.xpath.objects.XObject create(java.lang.Object, org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XObject void appendToFsb(org.apache.xml.utils.FastStringBuffer) 0'>
@@ -47,19 +53,43 @@
     <item name='org.apache.xpath.objects.XNodeSet XNodeSet(org.apache.xpath.objects.XNodeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObjectFactory org.apache.xpath.objects.XObject create(java.lang.Object, org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.objects.XRTreeFrag java.lang.String str()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XNodeSet boolean equals(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XStringForFSB org.apache.xml.utils.XMLString substring(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XString boolean startsWith(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XObject java.lang.String getTypeString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XString boolean equalsIgnoreCase(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XObject org.apache.xpath.objects.XObject getFresh()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toLowerCase(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XNodeSet boolean lessThan(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XMLStringFactoryImpl org.apache.xml.utils.XMLString newstr(java.lang.String)'>
+    <item name='org.apache.xpath.objects.XObject org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XNodeSet org.w3c.dom.NodeList nodelist()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XMLStringFactoryImpl org.apache.xml.utils.XMLString newstr(char[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XBoolean java.lang.String str()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XNodeSet boolean notEquals(org.apache.xpath.objects.XObject) 0'>
@@ -71,34 +101,31 @@
     <item name='org.apache.xpath.objects.XBoolean boolean equals(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString int compareTo(org.apache.xml.utils.XMLString) 0'>
+    <item name='org.apache.xpath.objects.XRTreeFrag void appendToFsb(org.apache.xml.utils.FastStringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObject org.apache.xpath.objects.XObject getFresh()'>
+    <item name='org.apache.xpath.objects.XString int compareTo(org.apache.xml.utils.XMLString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XString boolean equals(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString xstr()'>
+    <item name='org.apache.xpath.objects.XObjectFactory org.apache.xpath.objects.XObject create(java.lang.Object, org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XString void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toUpperCase(java.util.Locale)'>
+    <item name='org.apache.xpath.objects.XObject void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObject org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toLowerCase()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XNodeSet java.lang.String getTypeString()'>
+    <item name='org.apache.xpath.objects.XString java.lang.String getTypeString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XBoolean java.lang.String getTypeString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.objects.XStringForFSB org.apache.xml.utils.XMLString substring(int, int)'>
+    <item name='org.apache.xpath.objects.XObject java.lang.String str()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XStringForFSB boolean startsWith(org.apache.xml.utils.XMLString) 0'>
@@ -116,45 +143,54 @@
     <item name='org.apache.xpath.objects.XString int lastIndexOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString java.lang.String getTypeString()'>
+    <item name='org.apache.xpath.objects.XStringForFSB org.apache.xml.utils.XMLString substring(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObject java.lang.String getTypeString()'>
+    <item name='org.apache.xpath.objects.XRTreeFragSelectWrapper org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XNull boolean equals(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XObject void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XNodeSetForDOM XNodeSetForDOM(org.apache.xpath.objects.XNodeSet) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XStringForFSB org.apache.xml.utils.XMLString concat(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XStringForFSB boolean equals(org.apache.xpath.objects.XObject) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XBooleanStatic boolean equals(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XNodeSetForDOM XNodeSetForDOM(org.w3c.dom.traversal.NodeIterator, org.apache.xpath.XPathContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XRTreeFrag boolean equals(org.apache.xpath.objects.XObject) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.objects.XStringForFSB int compareTo(org.apache.xml.utils.XMLString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObject boolean lessThan(org.apache.xpath.objects.XObject) 0'>
+    <item name='org.apache.xpath.objects.XRTreeFrag boolean equals(org.apache.xpath.objects.XObject) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toUpperCase()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XBoolean XBoolean(java.lang.Boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XObject boolean lessThan(org.apache.xpath.objects.XObject) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toUpperCase(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XNodeSet boolean lessThanOrEqual(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XMLStringFactoryImpl org.apache.xml.utils.XMLString emptystr()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.objects.XRTreeFrag org.apache.xml.dtm.DTMIterator asNodeIterator()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.objects.XObject boolean greaterThan(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -164,10 +200,10 @@
     <item name='org.apache.xpath.objects.XStringForFSB void getChars(int, int, char[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toUpperCase()'>
+    <item name='org.apache.xpath.objects.XMLStringFactoryImpl org.apache.xml.utils.XMLString emptystr()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObject org.apache.xpath.objects.XObject create(java.lang.Object, org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.objects.XNodeSet org.w3c.dom.traversal.NodeIterator nodeset()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XString boolean startsWith(java.lang.String) 0'>
@@ -176,6 +212,9 @@
     <item name='org.apache.xpath.objects.XStringForFSB boolean equalsIgnoreCase(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XStringForChars void getChars(int, int, char[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XNodeSetForDOM XNodeSetForDOM(org.w3c.dom.NodeList, org.apache.xpath.XPathContext) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -185,52 +224,52 @@
     <item name='org.apache.xpath.objects.XString boolean startsWith(org.apache.xml.utils.XMLString, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XNull java.lang.String getTypeString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString concat(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XString int rtf(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XStringForFSB org.apache.xml.utils.XMLString concat(java.lang.String)'>
+    <item name='org.apache.xpath.objects.XNodeSet java.lang.String getTypeString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XRTreeFrag java.lang.String getTypeString()'>
+    <item name='org.apache.xpath.objects.XStringForFSB void dispatchCharactersEvents(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XString boolean equals(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XString boolean startsWith(org.apache.xml.utils.XMLString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString substring(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.objects.XObject org.apache.xpath.objects.XObject create(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.objects.XNumber java.lang.String str()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.objects.XNodeSetForDOM XNodeSetForDOM(org.w3c.dom.NodeList, org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toLowerCase()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.objects.XRTreeFrag java.lang.String str()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.objects.XNodeSet boolean greaterThan(org.apache.xpath.objects.XObject) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.objects.XStringForFSB void appendToFsb(org.apache.xml.utils.FastStringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XNodeSet boolean greaterThan(org.apache.xpath.objects.XObject) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XNumber XNumber(java.lang.Number) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XRTreeFrag org.apache.xml.dtm.DTMIterator asNodeIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XObject java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XString boolean endsWith(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XStringForFSB org.apache.xml.utils.XMLString substring(int)'>
+    <item name='org.apache.xpath.objects.XString boolean equals(org.apache.xml.utils.XMLString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString substring(int, int)'>
+    <item name='org.apache.xpath.objects.XBoolean java.lang.String getTypeString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XString int indexOf(java.lang.String, int) 0'>
@@ -239,10 +278,10 @@
     <item name='org.apache.xpath.objects.XStringForFSB boolean equals(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString concat(java.lang.String)'>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toUpperCase(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toUpperCase(java.util.Locale) 0'>
+    <item name='org.apache.xpath.objects.XObject org.apache.xml.utils.XMLString xstr()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XRTreeFrag XRTreeFrag(int, org.apache.xpath.XPathContext) 1'>
@@ -251,7 +290,7 @@
     <item name='org.apache.xpath.objects.XNodeSet java.lang.String str()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XNodeSet org.w3c.dom.NodeList nodelist()'>
+    <item name='org.apache.xpath.objects.XMLStringFactoryImpl org.apache.xml.utils.XMLString newstr(org.apache.xml.utils.FastStringBuffer, int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XString void dispatchCharactersEvents(org.xml.sax.ContentHandler) 0'>
@@ -260,36 +299,45 @@
     <item name='org.apache.xpath.objects.XObject boolean greaterThanOrEqual(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObject org.w3c.dom.DocumentFragment rtree(org.apache.xpath.XPathContext) 0'>
+    <item name='org.apache.xpath.objects.XNodeSet void dispatchCharactersEvents(org.xml.sax.ContentHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObjectFactory org.apache.xpath.objects.XObject create(java.lang.Object)'>
+    <item name='org.apache.xpath.objects.XObject org.w3c.dom.DocumentFragment rtree(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XString void getChars(int, int, char[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XRTreeFragSelectWrapper org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XString int lastIndexOf(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XStringForFSB boolean equals(org.apache.xml.utils.XMLString) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString toLowerCase(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XNull java.lang.String getTypeString()'>
+    <item name='org.apache.xpath.objects.XNumber java.lang.String getTypeString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObject java.lang.String str()'>
+    <item name='org.apache.xpath.objects.XNull int rtf(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XMLStringFactoryImpl org.apache.xml.utils.XMLString newstr(char[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.objects.XString int indexOf(java.lang.String) 0'>
+    <item name='org.apache.xpath.objects.XRTreeFrag java.lang.String getTypeString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XStringForChars void appendToFsb(org.apache.xml.utils.FastStringBuffer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString trim()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XString int indexOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XNodeSet boolean greaterThanOrEqual(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -299,21 +347,33 @@
     <item name='org.apache.xpath.objects.XStringForFSB org.apache.xml.utils.XMLString concat(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XObject java.lang.String toString()'>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString substring(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XObjectFactory org.apache.xpath.objects.XObject create(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XStringForChars void dispatchCharactersEvents(org.xml.sax.ContentHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString trim()'>
+    <item name='org.apache.xpath.objects.XNumber java.lang.String str()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.objects.XNull java.lang.String str()'>
+    <item name='org.apache.xpath.objects.XString org.apache.xml.utils.XMLString xstr()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XObject int rtf(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.objects.XStringForFSB void dispatchAsComment(org.xml.sax.ext.LexicalHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.objects.XRTreeFragSelectWrapper void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.objects.XObject org.apache.xpath.objects.XObject create(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.objects.XObject boolean notEquals(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/apache/xpath/operations/annotations.xml b/android-sdk-annotations/org/apache/xpath/operations/annotations.xml
index cb25da0056b..f74213c1f47 100644
--- a/android-sdk-annotations/org/apache/xpath/operations/annotations.xml
+++ b/android-sdk-annotations/org/apache/xpath/operations/annotations.xml
@@ -1,14 +1,17 @@
 <root>
-    <item name='org.apache.xpath.operations.Variable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, boolean)'>
+    <item name='org.apache.xpath.operations.And org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.Number org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Mult org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Operation void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
+    <item name='org.apache.xpath.operations.Div org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Lt org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Operation void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Quo org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
@@ -17,16 +20,13 @@
     <item name='org.apache.xpath.operations.Operation void setLeftRight(org.apache.xpath.Expression, org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Div org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.UnaryOperation org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.NotEquals org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Operation org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Or org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.operations.Bool org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Or org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Div org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
@@ -38,19 +38,22 @@
     <item name='org.apache.xpath.operations.Plus org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.operations.Minus org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.operations.UnaryOperation void setRight(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Equals org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Or org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Gt org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Variable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.VariableSafeAbsRef org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Plus org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Operation org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Variable void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
@@ -59,21 +62,33 @@
     <item name='org.apache.xpath.operations.Variable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.operations.UnaryOperation org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.Quo org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.operations.Gte org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Mod org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Quo org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
+    <item name='org.apache.xpath.operations.Neg org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Gte org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Mult org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Div org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.operations.Bool org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.Gte org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.operations.Operation void setExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -83,6 +98,9 @@
     <item name='org.apache.xpath.operations.Plus org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.operations.Bool boolean bool(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.operations.String org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -92,7 +110,7 @@
     <item name='org.apache.xpath.operations.Equals org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Mult org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Operation org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Lte org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
@@ -104,18 +122,6 @@
     <item name='org.apache.xpath.operations.Variable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Neg org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.operations.Number org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.operations.Variable org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.operations.Mod org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.operations.Neg org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -125,46 +131,79 @@
     <item name='org.apache.xpath.operations.Minus org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.operations.UnaryOperation void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.And boolean bool(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.Equals org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.operations.Mod org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Gt org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Lte org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Quo org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Lt org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Minus org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Equals boolean bool(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.NotEquals org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.operations.And org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.Or boolean bool(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.operations.Mult org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.operations.Gt org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.operations.Equals org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.UnaryOperation void setExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Quo org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+    <item name='org.apache.xpath.operations.Lt org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.NotEquals org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.Lte org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Minus org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.operations.Mod org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.Operation void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.operations.Plus org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.operations.Operation void setLeftRight(org.apache.xpath.Expression, org.apache.xpath.Expression) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.And org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+    <item name='org.apache.xpath.operations.Gt org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.operations.Gt org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject, org.apache.xpath.objects.XObject) 0'>
+    <item name='org.apache.xpath.operations.UnaryOperation org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.operations.Bool org.apache.xpath.objects.XObject operate(org.apache.xpath.objects.XObject) 0'>
diff --git a/android-sdk-annotations/org/apache/xpath/patterns/annotations.xml b/android-sdk-annotations/org/apache/xpath/patterns/annotations.xml
index 9aa6ff66e74..34afa68e4fd 100644
--- a/android-sdk-annotations/org/apache/xpath/patterns/annotations.xml
+++ b/android-sdk-annotations/org/apache/xpath/patterns/annotations.xml
@@ -2,28 +2,61 @@
     <item name='org.apache.xpath.patterns.StepPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.patterns.NodeTest org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.UnionPattern void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.FunctionPattern void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.UnionPattern void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.FunctionPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int, org.apache.xml.dtm.DTM, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.FunctionPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.NodeTest org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.NodeTest void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.StepPattern void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.StepPattern double getMatchScore(org.apache.xpath.XPathContext, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.UnionPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.NodeTest void fixupVariables(java.util.Vector, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.xpath.patterns.NodeTest org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.xpath.patterns.StepPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.patterns.StepPattern int getLastPos(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.patterns.UnionPattern void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
+    <item name='org.apache.xpath.patterns.FunctionPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.patterns.FunctionPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+    <item name='org.apache.xpath.patterns.StepPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int, org.apache.xml.dtm.DTM, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.patterns.StepPattern boolean executePredicates(org.apache.xpath.XPathContext, org.apache.xml.dtm.DTM, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.patterns.FunctionPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.patterns.FunctionPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int, org.apache.xml.dtm.DTM, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.patterns.NodeTest org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
+    <item name='org.apache.xpath.patterns.NodeTest org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int, org.apache.xml.dtm.DTM, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.patterns.StepPattern int getProximityPosition(org.apache.xpath.XPathContext) 0'>
@@ -32,13 +65,10 @@
     <item name='org.apache.xpath.patterns.StepPattern org.apache.xpath.objects.XObject executeRelativePathPattern(org.apache.xpath.XPathContext, org.apache.xml.dtm.DTM, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.patterns.StepPattern void setExpression(org.apache.xpath.Expression) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.patterns.ContextMatchStepPattern org.apache.xpath.objects.XObject executeRelativePathPattern(org.apache.xpath.XPathContext, org.apache.xpath.patterns.StepPattern) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.patterns.StepPattern void callVisitors(org.apache.xpath.ExpressionOwner, org.apache.xpath.XPathVisitor) 1'>
+    <item name='org.apache.xpath.patterns.StepPattern void setExpression(org.apache.xpath.Expression) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.xpath.patterns.ContextMatchStepPattern org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext) 0'>
@@ -47,10 +77,7 @@
     <item name='org.apache.xpath.patterns.StepPattern void setRelativePathPattern(org.apache.xpath.patterns.StepPattern) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.xpath.patterns.StepPattern double getMatchScore(org.apache.xpath.XPathContext, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.xpath.patterns.NodeTest org.apache.xpath.objects.XObject execute(org.apache.xpath.XPathContext, int) 0'>
+    <item name='org.apache.xpath.patterns.StepPattern void fixupVariables(java.util.Vector, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/apache/xpath/res/annotations.xml b/android-sdk-annotations/org/apache/xpath/res/annotations.xml
index 91636100241..431afe0e84c 100644
--- a/android-sdk-annotations/org/apache/xpath/res/annotations.xml
+++ b/android-sdk-annotations/org/apache/xpath/res/annotations.xml
@@ -1,8 +1,8 @@
 <root>
-    <item name='org.apache.xpath.res.XPATHErrorResources java.lang.Object[][] getContents()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.xpath.res.XPATHErrorResources org.apache.xpath.res.XPATHErrorResources loadResourceBundle(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.xpath.res.XPATHErrorResources java.lang.Object[][] getContents()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/annotations.xml
index 5aa6522eddf..6bb6505d7fb 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/annotations.xml
@@ -1,8 +1,14 @@
 <root>
+    <item name='org.bouncycastle.asn1.DERGeneralizedTime java.lang.String getTime()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERInteger DERInteger(java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERGeneralizedTime java.lang.String getTime()'>
+    <item name='org.bouncycastle.asn1.DEREnumerated java.math.BigInteger getValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERUTF8String java.lang.String getString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1Sequence ASN1Sequence(org.bouncycastle.asn1.ASN1Encodable[]) 0'>
@@ -11,7 +17,7 @@
     <item name='org.bouncycastle.asn1.DERBitString org.bouncycastle.asn1.DERBitString getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERPrintableString java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.DERPrintableString java.lang.String getString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1Set ASN1Set(org.bouncycastle.asn1.ASN1Encodable[], boolean) 0'>
@@ -20,13 +26,16 @@
     <item name='org.bouncycastle.asn1.DERNumericString DERNumericString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERBitString byte[] getBytes(int)'>
+    <item name='org.bouncycastle.asn1.ASN1Encodable org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERBitString java.lang.String getString()'>
+    <item name='org.bouncycastle.asn1.DERExternalParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.ASN1Primitive org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.ASN1Sequence org.bouncycastle.asn1.ASN1SequenceParser parser()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERUniversalString java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1Set ASN1Set(org.bouncycastle.asn1.ASN1EncodableVector, boolean) 0'>
@@ -38,30 +47,27 @@
     <item name='org.bouncycastle.asn1.BERConstructedOctetString BERConstructedOctetString(java.util.Vector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERBMPString java.lang.String getString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DEROctetStringParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.DERUTF8String java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1StreamParser ASN1StreamParser(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BEROctetStringParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.DERUTCTime java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1Object byte[] getEncoded(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.BERSequenceParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERSet DERSet(org.bouncycastle.asn1.ASN1Encodable[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1EncodableVector void addAll(org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BERApplicationSpecificParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.DERBoolean org.bouncycastle.asn1.DERBoolean getInstance(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -71,19 +77,16 @@
     <item name='org.bouncycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.ASN1Sequence java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERBoolean java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.BERApplicationSpecificParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERPrintableString DERPrintableString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BERApplicationSpecificParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
+    <item name='org.bouncycastle.asn1.BERConstructedOctetString org.bouncycastle.asn1.BEROctetString fromSequence(org.bouncycastle.asn1.ASN1Sequence)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BERTaggedObjectParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.DERIA5String java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERPrintableString boolean isPrintableString(java.lang.String) 0'>
@@ -92,9 +95,15 @@
     <item name='org.bouncycastle.asn1.DERExternal DERExternal(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.ASN1Primitive, org.bouncycastle.asn1.DERTaggedObject) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.ASN1TaggedObject java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERGeneralizedTime org.bouncycastle.asn1.ASN1GeneralizedTime getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.ASN1Set java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.BERConstructedOctetString BERConstructedOctetString(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -104,15 +113,12 @@
     <item name='org.bouncycastle.asn1.DERIA5String org.bouncycastle.asn1.DERIA5String getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERUniversalString java.lang.String getString()'>
+    <item name='org.bouncycastle.asn1.BERConstructedOctetString java.util.Enumeration getObjects()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERPrintableString org.bouncycastle.asn1.DERPrintableString getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.ASN1Sequence org.bouncycastle.asn1.ASN1Encodable[] toArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.ASN1OctetString ASN1OctetString(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -122,16 +128,25 @@
     <item name='org.bouncycastle.asn1.BEROctetString BEROctetString(org.bouncycastle.asn1.ASN1OctetString[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.InMemoryRepresentable org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.ASN1UTCTime ASN1UTCTime(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.BERTaggedObjectParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERNumericString boolean isNumericString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1Enumerated ASN1Enumerated(java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERBMPString java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.DEROctetStringParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERNumericString java.lang.String getString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERIA5String DERIA5String(java.lang.String, boolean) 0'>
@@ -143,34 +158,31 @@
     <item name='org.bouncycastle.asn1.BERSet BERSet(org.bouncycastle.asn1.ASN1Encodable[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.DERBoolean org.bouncycastle.asn1.DERBoolean getInstance(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.ASN1Primitive org.bouncycastle.asn1.ASN1Primitive fromByteArray(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1Integer ASN1Integer(java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERSetParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.DERSequenceParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1ObjectIdentifier boolean on(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERVisibleString java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.DERBMPString java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.ASN1TaggedObject java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.DERInteger java.math.BigInteger getPositiveValue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERExternalParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
+    <item name='org.bouncycastle.asn1.BERTaggedObjectParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.ASN1Sequence org.bouncycastle.asn1.ASN1SequenceParser parser()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERInteger java.math.BigInteger getValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.ASN1Set org.bouncycastle.asn1.ASN1SetParser parser()'>
+    <item name='org.bouncycastle.asn1.BEROctetStringParser java.io.InputStream getOctetStream()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.BERConstructedOctetString BERConstructedOctetString(org.bouncycastle.asn1.ASN1Primitive) 0'>
@@ -188,45 +200,48 @@
     <item name='org.bouncycastle.asn1.DERGeneralString org.bouncycastle.asn1.DERGeneralString getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.DERSetParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERNumericString DERNumericString(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BERApplicationSpecific BERApplicationSpecific(int, org.bouncycastle.asn1.ASN1EncodableVector) 1'>
+    <item name='org.bouncycastle.asn1.DERGeneralString java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERBitString java.lang.String getString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1InputStream ASN1InputStream(java.io.InputStream, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERGeneralizedTime java.lang.String getTimeString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERExternalParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DEROctetStringParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DEREnumerated java.math.BigInteger getValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERGeneralizedTime DERGeneralizedTime(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.BERTaggedObjectParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERUTF8String java.lang.String getString()'>
+    <item name='org.bouncycastle.asn1.BERApplicationSpecific BERApplicationSpecific(int, org.bouncycastle.asn1.ASN1EncodableVector) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1Object byte[] getEncoded(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.DERGeneralizedTime DERGeneralizedTime(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1OctetString org.bouncycastle.asn1.ASN1OctetStringParser parser()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1ObjectIdentifier org.bouncycastle.asn1.ASN1ObjectIdentifier branch(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERIA5String boolean isIA5String(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.BERSequenceParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERVisibleString org.bouncycastle.asn1.DERVisibleString getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.DERBoolean org.bouncycastle.asn1.ASN1Boolean getInstance(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DLSet DLSet(org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -242,18 +257,21 @@
     <item name='org.bouncycastle.asn1.DERUTF8String DERUTF8String(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.BEROctetString java.util.Enumeration getObjects()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.BERSequence BERSequence(org.bouncycastle.asn1.ASN1Encodable[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.DERBitString java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERSetParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DLSequence DLSequence(org.bouncycastle.asn1.ASN1Encodable[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERNumericString java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.BEROctetStringGenerator java.io.OutputStream getOctetOutputStream(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.DERBoolean DERBoolean(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -269,27 +287,36 @@
     <item name='org.bouncycastle.asn1.ASN1OutputStream void writeObject(org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERGeneralString java.lang.String getString()'>
+    <item name='org.bouncycastle.asn1.BEROctetStringGenerator java.io.OutputStream getOctetOutputStream(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BEROctetStringParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
+    <item name='org.bouncycastle.asn1.BERApplicationSpecificParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERSequence DERSequence(org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BERConstructedOctetString org.bouncycastle.asn1.BEROctetString fromSequence(org.bouncycastle.asn1.ASN1Sequence)'>
+    <item name='org.bouncycastle.asn1.DERInteger java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERApplicationSpecific DERApplicationSpecific(int, org.bouncycastle.asn1.ASN1Encodable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.DERBoolean org.bouncycastle.asn1.ASN1Boolean getInstance(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERIA5String DERIA5String(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERGeneralString DERGeneralString(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.ASN1Primitive org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1Sequence org.bouncycastle.asn1.ASN1Encodable[] toArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.BERSet BERSet(org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -299,67 +326,52 @@
     <item name='org.bouncycastle.asn1.DERExternal DERExternal(org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.ASN1Sequence java.util.Enumeration getObjects()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.ASN1InputStream ASN1InputStream(java.io.InputStream, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.ASN1Object byte[] getEncoded()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERExternal DERExternal(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.ASN1Primitive, int, org.bouncycastle.asn1.ASN1Primitive) 4'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERBoolean org.bouncycastle.asn1.ASN1Boolean getInstance(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.ASN1Set org.bouncycastle.asn1.ASN1Encodable[] toArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERBoolean org.bouncycastle.asn1.DERBoolean getInstance(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERInteger org.bouncycastle.asn1.ASN1Integer getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.BERSetParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERSequenceParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.DERExternal DERExternal(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.ASN1Primitive, int, org.bouncycastle.asn1.ASN1Primitive) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERInteger org.bouncycastle.asn1.ASN1Integer getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERT61String java.lang.String getString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DLOutputStream void writeObject(org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERUTF8String java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.DERObjectIdentifier org.bouncycastle.asn1.ASN1ObjectIdentifier getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.ASN1Set java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.ASN1OctetStringParser java.io.InputStream getOctetStream()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.ASN1Set java.util.Enumeration getObjects()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERInteger java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.BERSequenceParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.BEROctetStringGenerator java.io.OutputStream getOctetOutputStream()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERPrintableString DERPrintableString(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.ASN1OctetString java.io.InputStream getOctetStream()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERBoolean org.bouncycastle.asn1.ASN1Boolean getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERNumericString java.lang.String getString()'>
+    <item name='org.bouncycastle.asn1.DERUniversalString java.lang.String getString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.BERGenerator void writeBERBody(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERUTCTime java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.BEROctetStringParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1TaggedObject org.bouncycastle.asn1.ASN1TaggedObject getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
@@ -374,6 +386,12 @@
     <item name='org.bouncycastle.asn1.BERConstructedOctetString org.bouncycastle.asn1.BEROctetString fromSequence(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.DERNumericString java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERInteger java.math.BigInteger getValue()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.BERConstructedOctetString BERConstructedOctetString(org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -383,36 +401,36 @@
     <item name='org.bouncycastle.asn1.DERT61String DERT61String(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERUniversalString java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.ASN1ObjectIdentifier org.bouncycastle.asn1.ASN1ObjectIdentifier branch(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.DERUTCTime org.bouncycastle.asn1.ASN1UTCTime getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.ASN1String java.lang.String getString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DEROctetStringParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DLSet DLSet(org.bouncycastle.asn1.ASN1Encodable[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERIA5String java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.DERUTF8String org.bouncycastle.asn1.DERUTF8String getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERGeneralString java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.ASN1OctetString java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERT61String java.lang.String getString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.ASN1InputStream void readFully(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.DERVisibleString java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1Set org.bouncycastle.asn1.ASN1Encodable[] toArray()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1Set java.util.Enumeration getObjects()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1Null java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERObjectIdentifier DERObjectIdentifier(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -422,55 +440,52 @@
     <item name='org.bouncycastle.asn1.ASN1Sequence ASN1Sequence(org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.DERUTCTime java.lang.String getTime()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERUTCTime java.lang.String getAdjustedTime()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DEROctetString DEROctetString(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERApplicationSpecific DERApplicationSpecific(int, org.bouncycastle.asn1.ASN1EncodableVector) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BERSetParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.DERPrintableString java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERPrintableString java.lang.String getString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.ASN1Set org.bouncycastle.asn1.ASN1Set getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.BERSequenceParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.ASN1Sequence java.util.Enumeration getObjects()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERT61String java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.BEROctetString java.util.Enumeration getObjects()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.BEROctetString void encode(org.bouncycastle.asn1.ASN1OutputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERInteger java.math.BigInteger getPositiveValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERNumericString org.bouncycastle.asn1.DERNumericString getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERBitString java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.ASN1OctetString java.io.InputStream getOctetStream()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.BERConstructedOctetString java.util.Enumeration getObjects()'>
+    <item name='org.bouncycastle.asn1.DERBitString byte[] getBytes(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERIA5String java.lang.String getString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERSetParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
+    <item name='org.bouncycastle.asn1.ASN1Set org.bouncycastle.asn1.ASN1Set getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERGeneralString java.lang.String getString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERGeneralizedTime java.lang.String getTimeString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.BEROctetString void encode(org.bouncycastle.asn1.ASN1OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERT61String java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.BEROctetStringParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.DERNumericString org.bouncycastle.asn1.DERNumericString getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1Object org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1Sequence java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.ASN1InputStream ASN1InputStream(byte[]) 0'>
@@ -482,40 +497,40 @@
     <item name='org.bouncycastle.asn1.DERSequence DERSequence(org.bouncycastle.asn1.ASN1Encodable[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BEROctetStringGenerator java.io.OutputStream getOctetOutputStream()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.ASN1OctetString org.bouncycastle.asn1.ASN1OctetStringParser parser()'>
+    <item name='org.bouncycastle.asn1.DERExternalParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DERSet DERSet(org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERSequenceParser org.bouncycastle.asn1.ASN1Primitive getLoadedObject()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.ASN1ObjectIdentifier org.bouncycastle.asn1.ASN1ObjectIdentifier branch(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERUTCTime java.lang.String getAdjustedTime()'>
+    <item name='org.bouncycastle.asn1.DERBoolean java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.DERBoolean org.bouncycastle.asn1.ASN1Boolean getInstance(boolean)'>
+    <item name='org.bouncycastle.asn1.BERSetParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.BEROctetStringParser java.io.InputStream getOctetStream()'>
+    <item name='org.bouncycastle.asn1.DERBMPString java.lang.String getString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1Set org.bouncycastle.asn1.ASN1SetParser parser()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.ASN1OctetString java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.DLSequence DLSequence(org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.ASN1Object byte[] getEncoded()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.DERT61String org.bouncycastle.asn1.DERT61String getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.ASN1Null java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.DERUTCTime java.lang.String getTime()'>
+    <item name='org.bouncycastle.asn1.DERSequenceParser org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/cms/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/cms/annotations.xml
index 40712a7a032..8ee24dd734d 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/cms/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/cms/annotations.xml
@@ -5,10 +5,10 @@
     <item name='org.bouncycastle.asn1.cms.SignerInfo SignerInfo(org.bouncycastle.asn1.cms.SignerIdentifier, org.bouncycastle.asn1.x509.AlgorithmIdentifier, org.bouncycastle.asn1.ASN1Set, org.bouncycastle.asn1.x509.AlgorithmIdentifier, org.bouncycastle.asn1.ASN1OctetString, org.bouncycastle.asn1.ASN1Set) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.cms.Attributes toASN1Structure()'>
+    <item name='org.bouncycastle.asn1.cms.Attributes org.bouncycastle.asn1.cms.Attribute[] getAttributes()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.Attribute org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.cms.ContentInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.cms.AttributeTable AttributeTable(org.bouncycastle.asn1.ASN1Set) 0'>
@@ -20,22 +20,19 @@
     <item name='org.bouncycastle.asn1.cms.IssuerAndSerialNumber IssuerAndSerialNumber(org.bouncycastle.asn1.x509.X509CertificateStructure) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.Attribute org.bouncycastle.asn1.ASN1Encodable[] getAttributeValues()'>
+    <item name='org.bouncycastle.asn1.cms.Attribute org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.SignerInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.cms.AttributeTable java.util.Hashtable toHashtable()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.ContentInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.ASN1EncodableVector getAll(org.bouncycastle.asn1.DERObjectIdentifier)'>
+    <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.cms.AttributeTable add(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.cms.AttributeTable remove(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.AttributeTable java.util.Hashtable toHashtable()'>
+    <item name='org.bouncycastle.asn1.cms.IssuerAndSerialNumber org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.ASN1EncodableVector getAll(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
@@ -47,6 +44,9 @@
     <item name='org.bouncycastle.asn1.cms.Time org.bouncycastle.asn1.cms.Time getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.cms.SignerInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.cms.ContentInfo ContentInfo(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -56,18 +56,15 @@
     <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.ASN1EncodableVector getAll(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.SignedData org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.cms.Time java.lang.String getTime()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.cms.SignerInfo SignerInfo(org.bouncycastle.asn1.cms.SignerIdentifier, org.bouncycastle.asn1.x509.AlgorithmIdentifier, org.bouncycastle.asn1.cms.Attributes, org.bouncycastle.asn1.x509.AlgorithmIdentifier, org.bouncycastle.asn1.ASN1OctetString, org.bouncycastle.asn1.cms.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.cms.AttributeTable AttributeTable(org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.cms.Attributes toASN1Structure()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.cms.Time Time(org.bouncycastle.asn1.ASN1Primitive) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -80,13 +77,10 @@
     <item name='org.bouncycastle.asn1.cms.IssuerAndSerialNumber IssuerAndSerialNumber(org.bouncycastle.asn1.x500.X500Name, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.cms.AttributeTable add(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.cms.AttributeTable AttributeTable(java.util.Hashtable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.Attributes org.bouncycastle.asn1.cms.Attribute[] getAttributes()'>
+    <item name='org.bouncycastle.asn1.cms.Attribute org.bouncycastle.asn1.ASN1Encodable[] getAttributeValues()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.cms.Attribute get(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
@@ -95,6 +89,9 @@
     <item name='org.bouncycastle.asn1.cms.ContentInfo org.bouncycastle.asn1.cms.ContentInfo getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.cms.SignedData org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.cms.IssuerAndSerialNumber IssuerAndSerialNumber(org.bouncycastle.asn1.x509.X509Name, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -107,13 +104,16 @@
     <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.cms.AttributeTable remove(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.cms.Time java.lang.String getTime()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.cms.AttributeTable AttributeTable(org.bouncycastle.asn1.cms.Attribute) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.IssuerAndSerialNumber org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.cms.AttributeTable add(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.cms.AttributeTable add(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
+    <item name='org.bouncycastle.asn1.cms.AttributeTable org.bouncycastle.asn1.ASN1EncodableVector getAll(org.bouncycastle.asn1.DERObjectIdentifier)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.cms.SignerInfo SignerInfo(org.bouncycastle.asn1.ASN1Sequence) 0'>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/misc/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/misc/annotations.xml
index 1712b9f92fc..728b8090930 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/misc/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/misc/annotations.xml
@@ -1,20 +1,20 @@
 <root>
-    <item name='org.bouncycastle.asn1.misc.NetscapeCertType NetscapeCertType(org.bouncycastle.asn1.DERBitString) 0'>
+    <item name='org.bouncycastle.asn1.misc.NetscapeRevocationURL java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.misc.VerisignCzagExtension java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.misc.NetscapeCertType NetscapeCertType(org.bouncycastle.asn1.DERBitString) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.misc.NetscapeRevocationURL NetscapeRevocationURL(org.bouncycastle.asn1.DERIA5String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.misc.NetscapeRevocationURL java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.misc.NetscapeCertType java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.misc.VerisignCzagExtension VerisignCzagExtension(org.bouncycastle.asn1.DERIA5String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.misc.NetscapeCertType java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.misc.VerisignCzagExtension java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/pkcs/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/pkcs/annotations.xml
index 0a275efba9e..1eeb354aab4 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/pkcs/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/pkcs/annotations.xml
@@ -2,22 +2,28 @@
     <item name='org.bouncycastle.asn1.pkcs.IssuerAndSerialNumber IssuerAndSerialNumber(org.bouncycastle.asn1.x500.X500Name, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.RSAESOAEPparams org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.ContentInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.Pfx org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.PBKDF2Params org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.PrivateKeyInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure getInstance(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.DHParameter DHParameter(java.math.BigInteger, java.math.BigInteger, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.CertificationRequestInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.EncryptedData org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.EncryptionScheme org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.MacData org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.RSAESOAEPparams org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
@@ -26,16 +32,7 @@
     <item name='org.bouncycastle.asn1.pkcs.PKCS12PBEParams PKCS12PBEParams(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.RSASSAPSSparams org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.CertificationRequest org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.EncryptedData org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.PBES2Algorithms org.bouncycastle.asn1.ASN1Primitive getASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.RSAPublicKey org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.PBEParameter PBEParameter(byte[], int) 0'>
@@ -47,97 +44,88 @@
     <item name='org.bouncycastle.asn1.pkcs.PBKDF2Params PBKDF2Params(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.pkcs.PrivateKeyInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.pkcs.IssuerAndSerialNumber IssuerAndSerialNumber(org.bouncycastle.asn1.x509.X509Name, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.CRLBag org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo EncryptedPrivateKeyInfo(org.bouncycastle.asn1.x509.AlgorithmIdentifier, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure getInstance(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.pkcs.PrivateKeyInfo PrivateKeyInfo(org.bouncycastle.asn1.x509.AlgorithmIdentifier, org.bouncycastle.asn1.ASN1Encodable, org.bouncycastle.asn1.ASN1Set) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.CertificationRequestInfo CertificationRequestInfo(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x509.SubjectPublicKeyInfo, org.bouncycastle.asn1.ASN1Set) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.MacData org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.pkcs.PBKDF2Params PBKDF2Params(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.AuthenticatedSafe org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.KeyDerivationFunc org.bouncycastle.asn1.ASN1ObjectIdentifier getAlgorithm()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.IssuerAndSerialNumber IssuerAndSerialNumber(org.bouncycastle.asn1.x509.X509Name, java.math.BigInteger) 0'>
+    <item name='org.bouncycastle.asn1.pkcs.PBES2Parameters org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.EncryptionScheme org.bouncycastle.asn1.ASN1ObjectIdentifier getAlgorithm()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.KeyDerivationFunc org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.ContentInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.IssuerAndSerialNumber IssuerAndSerialNumber(org.bouncycastle.asn1.x509.X509Name, java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.EncryptedData EncryptedData(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.x509.AlgorithmIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.pkcs.SignedData org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.pkcs.SafeBag org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.pkcs.KeyDerivationFunc org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.AuthenticatedSafe org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKey org.bouncycastle.asn1.pkcs.RSAPrivateKey getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.CertificationRequest CertificationRequest(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.PBEParameter org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.CertificationRequestInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.EncryptionScheme org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.CertificationRequestInfo CertificationRequestInfo(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKey org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.RSAPublicKey org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.IssuerAndSerialNumber org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.PKCS12PBEParams org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.pkcs.RSAESOAEPparams RSAESOAEPparams(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.PBKDF2Params org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure getInstance(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.CertificationRequestInfo CertificationRequestInfo(org.bouncycastle.asn1.x509.X509Name, org.bouncycastle.asn1.x509.SubjectPublicKeyInfo, org.bouncycastle.asn1.ASN1Set) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.SignedData org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.CertBag org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.PBEParameter org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.Pfx org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKey org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.DHParameter DHParameter(java.math.BigInteger, java.math.BigInteger, int) 1'>
@@ -146,16 +134,25 @@
     <item name='org.bouncycastle.asn1.pkcs.PBES2Algorithms PBES2Algorithms(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.pkcs.RSASSAPSSparams org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.CRLBag org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.CertificationRequest org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.pkcs.PrivateKeyInfo org.bouncycastle.asn1.pkcs.PrivateKeyInfo getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure RSAPrivateKeyStructure(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.DHParameter org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.PBES2Algorithms org.bouncycastle.asn1.ASN1Primitive getASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.PBES2Parameters org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.pkcs.PKCS12PBEParams org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.PrivateKeyInfo PrivateKeyInfo(org.bouncycastle.asn1.x509.AlgorithmIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
@@ -164,15 +161,18 @@
     <item name='org.bouncycastle.asn1.pkcs.RSAPublicKey org.bouncycastle.asn1.pkcs.RSAPublicKey getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.pkcs.CertBag org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.pkcs.KeyDerivationFunc org.bouncycastle.asn1.ASN1ObjectIdentifier getAlgorithm()'>
+    <item name='org.bouncycastle.asn1.pkcs.IssuerAndSerialNumber org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.pkcs.PrivateKeyInfo PrivateKeyInfo(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.pkcs.DHParameter org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.pkcs.SignedData SignedData(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/sec/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/sec/annotations.xml
index faec41ce697..0459daaad85 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/sec/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/sec/annotations.xml
@@ -2,19 +2,19 @@
     <item name='org.bouncycastle.asn1.sec.SECNamedCurves org.bouncycastle.asn1.x9.X9ECParameters getByName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.sec.ECPrivateKeyStructure java.math.BigInteger getKey()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.sec.ECPrivateKeyStructure ECPrivateKeyStructure(java.math.BigInteger, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.sec.ECPrivateKeyStructure ECPrivateKeyStructure(java.math.BigInteger, org.bouncycastle.asn1.DERBitString, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.sec.ECPrivateKeyStructure java.math.BigInteger getKey()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.sec.SECNamedCurves org.bouncycastle.asn1.x9.X9ECParameters getByOID(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.sec.ECPrivateKey java.math.BigInteger getKey()'>
+    <item name='org.bouncycastle.asn1.sec.SECNamedCurves java.util.Enumeration getNames()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.sec.ECPrivateKey ECPrivateKey(java.math.BigInteger, org.bouncycastle.asn1.DERBitString, org.bouncycastle.asn1.ASN1Object) 0'>
@@ -29,13 +29,13 @@
     <item name='org.bouncycastle.asn1.sec.ECPrivateKey ECPrivateKey(java.math.BigInteger, org.bouncycastle.asn1.ASN1Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.sec.SECNamedCurves java.util.Enumeration getNames()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.sec.SECNamedCurves org.bouncycastle.asn1.ASN1ObjectIdentifier getOID(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.sec.ECPrivateKeyStructure ECPrivateKeyStructure(java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.sec.ECPrivateKey java.math.BigInteger getKey()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/util/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/util/annotations.xml
index 8813b0331d8..508276a1c77 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/util/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/util/annotations.xml
@@ -2,10 +2,10 @@
     <item name='org.bouncycastle.asn1.util.ASN1Dump java.lang.String dumpAsString(java.lang.Object, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.util.ASN1Dump java.lang.String dumpAsString(java.lang.Object)'>
+    <item name='org.bouncycastle.asn1.util.ASN1Dump java.lang.String dumpAsString(java.lang.Object, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.util.ASN1Dump java.lang.String dumpAsString(java.lang.Object, boolean) 0'>
+    <item name='org.bouncycastle.asn1.util.ASN1Dump java.lang.String dumpAsString(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.util.ASN1Dump java.lang.String dumpAsString(java.lang.Object) 0'>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/x500/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/x500/annotations.xml
index 7bcdec2f661..01237744740 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/x500/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/x500/annotations.xml
@@ -8,57 +8,63 @@
     <item name='org.bouncycastle.asn1.x500.X500Name X500Name(org.bouncycastle.asn1.x500.X500NameStyle, org.bouncycastle.asn1.x500.X500Name) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addRDN(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addMultiValuedRDN(org.bouncycastle.asn1.x500.AttributeTypeAndValue[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addMultiValuedRDN(org.bouncycastle.asn1.x500.AttributeTypeAndValue[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.RDN RDN(org.bouncycastle.asn1.x500.AttributeTypeAndValue[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.RDN org.bouncycastle.asn1.x500.AttributeTypeAndValue[] getTypesAndValues()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.DirectoryString org.bouncycastle.asn1.x500.DirectoryString getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle java.lang.String toString(org.bouncycastle.asn1.x500.X500Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.X500Name org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addMultiValuedRDN(org.bouncycastle.asn1.ASN1ObjectIdentifier[], org.bouncycastle.asn1.ASN1Encodable[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addMultiValuedRDN(org.bouncycastle.asn1.ASN1ObjectIdentifier[], java.lang.String[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.X500Name org.bouncycastle.asn1.x500.RDN[] getRDNs(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addRDN(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.DirectoryString DirectoryString(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addRDN(org.bouncycastle.asn1.x500.AttributeTypeAndValue)'>
+    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addMultiValuedRDN(org.bouncycastle.asn1.x500.AttributeTypeAndValue[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.X500Name org.bouncycastle.asn1.x500.RDN[] getRDNs()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.X500Name org.bouncycastle.asn1.ASN1ObjectIdentifier[] getAttributeTypes()'>
+    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addRDN(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.RDN RDN(org.bouncycastle.asn1.x500.AttributeTypeAndValue[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addMultiValuedRDN(org.bouncycastle.asn1.ASN1ObjectIdentifier[], java.lang.String[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.DirectoryString org.bouncycastle.asn1.x500.DirectoryString getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle java.lang.String toString(org.bouncycastle.asn1.x500.X500Name)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addRDN(org.bouncycastle.asn1.x500.AttributeTypeAndValue)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.DirectoryString DirectoryString(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addMultiValuedRDN(org.bouncycastle.asn1.ASN1ObjectIdentifier[], org.bouncycastle.asn1.ASN1Encodable[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle org.bouncycastle.asn1.ASN1ObjectIdentifier attrNameToOID(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle org.bouncycastle.asn1.ASN1ObjectIdentifier attrNameToOID(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.AttributeTypeAndValue org.bouncycastle.asn1.x500.AttributeTypeAndValue getInstance(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle int calculateHashCode(org.bouncycastle.asn1.x500.X500Name) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle java.lang.String[] oidToAttrNames(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.X500Name X500Name(org.bouncycastle.asn1.x500.X500NameStyle, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.AttributeTypeAndValue org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x500.X500Name void setDefaultStyle(org.bouncycastle.asn1.x500.X500NameStyle) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -74,7 +80,34 @@
     <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500Name build()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.AttributeTypeAndValue org.bouncycastle.asn1.x500.AttributeTypeAndValue getInstance(java.lang.Object)'>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle org.bouncycastle.asn1.x500.RDN[] fromString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.RDN org.bouncycastle.asn1.x500.AttributeTypeAndValue[] getTypesAndValues()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.AttributeTypeAndValue org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500Name org.bouncycastle.asn1.x500.RDN[] getRDNs(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle org.bouncycastle.asn1.ASN1Encodable stringToValue(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addMultiValuedRDN(org.bouncycastle.asn1.x500.AttributeTypeAndValue[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500Name org.bouncycastle.asn1.ASN1ObjectIdentifier[] getAttributeTypes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameBuilder org.bouncycastle.asn1.x500.X500NameBuilder addRDN(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.X500NameStyle java.lang.String oidToDisplayName(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/x500/style/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/x500/style/annotations.xml
index 2a00fd37bc8..739d8a986fd 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/x500/style/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/x500/style/annotations.xml
@@ -2,10 +2,10 @@
     <item name='org.bouncycastle.asn1.x500.style.BCStyle org.bouncycastle.asn1.ASN1ObjectIdentifier attrNameToOID(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.IETFUtils org.bouncycastle.asn1.ASN1ObjectIdentifier decodeAttrName(java.lang.String, java.util.Hashtable)'>
+    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 1'>
+    <item name='org.bouncycastle.asn1.x500.style.IETFUtils org.bouncycastle.asn1.ASN1ObjectIdentifier decodeAttrName(java.lang.String, java.util.Hashtable)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.style.BCStyle int calculateHashCode(org.bouncycastle.asn1.x500.X500Name) 0'>
@@ -14,16 +14,13 @@
     <item name='org.bouncycastle.asn1.x500.style.BCStrictStyle boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style java.lang.String[] oidToAttrNames(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x500.style.BCStyle boolean rdnAreEqual(org.bouncycastle.asn1.x500.RDN, org.bouncycastle.asn1.x500.RDN) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.BCStyle java.lang.String[] oidToAttrNames(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
+    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style java.lang.String toString(org.bouncycastle.asn1.x500.X500Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style java.lang.String toString(org.bouncycastle.asn1.x500.X500Name) 0'>
+    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style org.bouncycastle.asn1.x500.RDN[] fromString(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.style.BCStyle org.bouncycastle.asn1.ASN1Encodable stringToValue(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.lang.String) 1'>
@@ -32,9 +29,6 @@
     <item name='org.bouncycastle.asn1.x500.style.RFC4519Style boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String stripInternalSpaces(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x500.style.RFC4519Style java.lang.String oidToDisplayName(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -50,10 +44,13 @@
     <item name='org.bouncycastle.asn1.x500.style.RFC4519Style boolean rdnAreEqual(org.bouncycastle.asn1.x500.RDN, org.bouncycastle.asn1.x500.RDN) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String stripInternalSpaces(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String[] findAttrNamesForOID(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.util.Hashtable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String[] findAttrNamesForOID(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.util.Hashtable)'>
+    <item name='org.bouncycastle.asn1.x500.style.BCStyle org.bouncycastle.asn1.ASN1ObjectIdentifier attrNameToOID(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.style.IETFUtils void appendTypeAndValue(java.lang.StringBuffer, org.bouncycastle.asn1.x500.AttributeTypeAndValue, java.util.Hashtable) 1'>
@@ -62,34 +59,31 @@
     <item name='org.bouncycastle.asn1.x500.style.BCStyle boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String valueToString(org.bouncycastle.asn1.ASN1Encodable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String canonicalize(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String stripInternalSpaces(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.BCStyle org.bouncycastle.asn1.x500.RDN[] fromString(java.lang.String)'>
+    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style java.lang.String[] oidToAttrNames(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.style.IETFUtils org.bouncycastle.asn1.x500.RDN[] rDNsFromString(java.lang.String, org.bouncycastle.asn1.x500.X500NameStyle)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.style.IETFUtils void appendRDN(java.lang.StringBuffer, org.bouncycastle.asn1.x500.RDN, java.util.Hashtable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.BCStyle org.bouncycastle.asn1.ASN1ObjectIdentifier attrNameToOID(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x500.style.IETFUtils org.bouncycastle.asn1.ASN1ObjectIdentifier decodeAttrName(java.lang.String, java.util.Hashtable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.style.IETFUtils org.bouncycastle.asn1.ASN1Encodable valueFromHexString(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.BCStrictStyle boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 1'>
+    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style java.lang.String toString(org.bouncycastle.asn1.x500.X500Name)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String canonicalize(java.lang.String)'>
+    <item name='org.bouncycastle.asn1.x500.style.BCStrictStyle boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.style.RFC4519Style org.bouncycastle.asn1.ASN1Encodable stringToValue(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.lang.String) 1'>
@@ -98,19 +92,19 @@
     <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String valueToString(org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.IETFUtils org.bouncycastle.asn1.x500.RDN[] rDNsFromString(java.lang.String, org.bouncycastle.asn1.x500.X500NameStyle)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x500.style.BCStyle boolean rdnAreEqual(org.bouncycastle.asn1.x500.RDN, org.bouncycastle.asn1.x500.RDN) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.BCStyle java.lang.String toString(org.bouncycastle.asn1.x500.X500Name)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x500.style.RFC4519Style org.bouncycastle.asn1.ASN1ObjectIdentifier attrNameToOID(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style org.bouncycastle.asn1.x500.RDN[] fromString(java.lang.String)'>
+    <item name='org.bouncycastle.asn1.x500.style.BCStyle org.bouncycastle.asn1.x500.RDN[] fromString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String valueToString(org.bouncycastle.asn1.ASN1Encodable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.style.BCStyle java.lang.String[] oidToAttrNames(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.style.BCStyle boolean areEqual(org.bouncycastle.asn1.x500.X500Name, org.bouncycastle.asn1.x500.X500Name) 0'>
@@ -125,10 +119,10 @@
     <item name='org.bouncycastle.asn1.x500.style.RFC4519Style boolean rdnAreEqual(org.bouncycastle.asn1.x500.RDN, org.bouncycastle.asn1.x500.RDN) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style org.bouncycastle.asn1.ASN1ObjectIdentifier attrNameToOID(java.lang.String)'>
+    <item name='org.bouncycastle.asn1.x500.style.BCStyle java.lang.String toString(org.bouncycastle.asn1.x500.X500Name)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style java.lang.String toString(org.bouncycastle.asn1.x500.X500Name)'>
+    <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String canonicalize(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x500.style.RFC4519Style int calculateHashCode(org.bouncycastle.asn1.x500.X500Name) 0'>
@@ -137,4 +131,10 @@
     <item name='org.bouncycastle.asn1.x500.style.IETFUtils void appendTypeAndValue(java.lang.StringBuffer, org.bouncycastle.asn1.x500.AttributeTypeAndValue, java.util.Hashtable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x500.style.IETFUtils java.lang.String[] findAttrNamesForOID(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.util.Hashtable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x500.style.RFC4519Style org.bouncycastle.asn1.ASN1ObjectIdentifier attrNameToOID(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/x509/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/x509/annotations.xml
index 5f26127ee46..ba625e3a281 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/x509/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/x509/annotations.xml
@@ -1,16 +1,4 @@
 <root>
-    <item name='org.bouncycastle.asn1.x509.AttributeCertificate org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.DigestInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.Time java.lang.String getTime()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.ExtensionsGenerator void addExtension(org.bouncycastle.asn1.ASN1ObjectIdentifier, boolean, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -20,24 +8,18 @@
     <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator void addExtension(org.bouncycastle.asn1.ASN1ObjectIdentifier, boolean, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.ExtendedKeyUsage org.bouncycastle.asn1.x509.KeyPurposeId[] getUsages()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.x509.SubjectKeyIdentifier createTruncatedSHA1KeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.x509.SubjectKeyIdentifier createTruncatedSHA1KeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.DistributionPointName java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.CRLDistPoint org.bouncycastle.asn1.x509.DistributionPoint[] getDistributionPoints()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.AlgorithmIdentifier org.bouncycastle.asn1.x509.AlgorithmIdentifier getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.RSAPublicKeyStructure org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.GeneralSubtree org.bouncycastle.asn1.x509.GeneralSubtree getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.AttributeCertificate AttributeCertificate(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -53,7 +35,10 @@
     <item name='org.bouncycastle.asn1.x509.ExtendedKeyUsage org.bouncycastle.asn1.x509.ExtendedKeyUsage getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.GeneralName org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.SubjectPublicKeyInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.KeyUsage java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.x509.SubjectKeyIdentifier getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
@@ -62,7 +47,10 @@
     <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.x509.SubjectKeyIdentifier createSHA1KeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.CertificateList org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.V2Form org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.AlgorithmIdentifier org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo, org.bouncycastle.asn1.x509.GeneralNames, java.math.BigInteger) 0'>
@@ -71,27 +59,27 @@
     <item name='org.bouncycastle.asn1.x509.Extension Extension(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Boolean, org.bouncycastle.asn1.ASN1OctetString) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator org.bouncycastle.asn1.x509.X509Extensions generate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator void addExtension(org.bouncycastle.asn1.ASN1ObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.GeneralNames java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.TBSCertList java.util.Enumeration getRevokedCertificateEnumeration()'>
+    <item name='org.bouncycastle.asn1.x509.Time java.lang.String getTime()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.x509.SubjectKeyIdentifier fromExtensions(org.bouncycastle.asn1.x509.Extensions) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.AlgorithmIdentifier org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.GeneralName org.bouncycastle.asn1.x509.GeneralName getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.TBSCertList org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.SubjectPublicKeyInfo SubjectPublicKeyInfo(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -101,46 +89,46 @@
     <item name='org.bouncycastle.asn1.x509.TBSCertificateStructure org.bouncycastle.asn1.x509.TBSCertificateStructure getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.DistributionPoint java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.Certificate org.bouncycastle.asn1.x509.Certificate getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509Extensions X509Extensions(java.util.Vector, java.util.Vector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Holder org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.ExtendedKeyUsage org.bouncycastle.asn1.x509.KeyPurposeId[] getUsages()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.IssuerSerial org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier SubjectKeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.DigestInfo DigestInfo(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.ObjectDigestInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.x509.SubjectKeyIdentifier createSHA1KeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
+    <item name='org.bouncycastle.asn1.x509.RSAPublicKeyStructure org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509Name X509Name(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.GeneralNames org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.AttCertValidityPeriod org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.X509Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getCriticalExtensionOIDs()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.BasicConstraints org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509Name X509Name(java.util.Vector, java.util.Vector, org.bouncycastle.asn1.x509.X509NameEntryConverter) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Extension org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.X509Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getNonCriticalExtensionOIDs()'>
+    <item name='org.bouncycastle.asn1.x509.X509Name java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.ExtendedKeyUsage boolean hasKeyPurposeId(org.bouncycastle.asn1.x509.KeyPurposeId) 0'>
@@ -152,34 +140,43 @@
     <item name='org.bouncycastle.asn1.x509.GeneralNames org.bouncycastle.asn1.x509.GeneralNames getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.DSAParameter org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(byte[], org.bouncycastle.asn1.x509.GeneralNames, java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.AlgorithmIdentifier AlgorithmIdentifier(org.bouncycastle.asn1.DERObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.GeneralName org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.Extensions Extensions(org.bouncycastle.asn1.x509.Extension[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.CertificateList org.bouncycastle.asn1.x509.TBSCertList.CRLEntry[] getRevokedCertificates()'>
+    <item name='org.bouncycastle.asn1.x509.Holder org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.DistributionPoint java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.x509.AttributeCertificate org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.GeneralNames org.bouncycastle.asn1.x509.GeneralName[] getNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.CRLNumber org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.Extension org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509CertificateStructure X509CertificateStructure(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getNonCriticalExtensionOIDs()'>
+    <item name='org.bouncycastle.asn1.x509.X509NameEntryConverter org.bouncycastle.asn1.ASN1Primitive getConvertedValue(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509Name java.util.Vector getValues(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
+    <item name='org.bouncycastle.asn1.x509.Time java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.AttCertValidityPeriod org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.GeneralSubtree org.bouncycastle.asn1.x509.GeneralSubtree getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.CRLDistPoint CRLDistPoint(org.bouncycastle.asn1.x509.DistributionPoint[]) 0'>
@@ -191,19 +188,13 @@
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Time java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.AttributeCertificateInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.ExtendedKeyUsage ExtendedKeyUsage(org.bouncycastle.asn1.x509.KeyPurposeId[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.CRLNumber java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.x509.Attribute org.bouncycastle.asn1.ASN1ObjectIdentifier getAttrType()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Attribute org.bouncycastle.asn1.ASN1Encodable[] getAttributeValues()'>
+    <item name='org.bouncycastle.asn1.x509.Extensions java.util.Enumeration oids()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.x509.Extensions getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
@@ -212,13 +203,19 @@
     <item name='org.bouncycastle.asn1.x509.Time org.bouncycastle.asn1.x509.Time getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.X509Name java.util.Vector getOIDs()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.Time Time(org.bouncycastle.asn1.ASN1Primitive) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Attribute org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.TBSCertList org.bouncycastle.asn1.x509.TBSCertList.CRLEntry[] getRevokedCertificates()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator org.bouncycastle.asn1.x509.X509Extensions generate()'>
+    <item name='org.bouncycastle.asn1.x509.CertificateList org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getCriticalExtensionOIDs()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509Extension X509Extension(org.bouncycastle.asn1.DERBoolean, org.bouncycastle.asn1.ASN1OctetString) 0'>
@@ -227,10 +224,10 @@
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo, org.bouncycastle.asn1.x509.GeneralNames, java.math.BigInteger) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator void addExtension(org.bouncycastle.asn1.ASN1ObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 2'>
+    <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.x509.SubjectKeyIdentifier createSHA1KeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.GeneralNames org.bouncycastle.asn1.x509.GeneralName[] getNames()'>
+    <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator void addExtension(org.bouncycastle.asn1.ASN1ObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.CertificateList org.bouncycastle.asn1.x509.CertificateList getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
@@ -239,10 +236,10 @@
     <item name='org.bouncycastle.asn1.x509.Extensions boolean equivalent(org.bouncycastle.asn1.x509.Extensions) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.DistributionPointName java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.x509.AlgorithmIdentifier AlgorithmIdentifier(org.bouncycastle.asn1.DERObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.AlgorithmIdentifier AlgorithmIdentifier(org.bouncycastle.asn1.DERObjectIdentifier) 0'>
+    <item name='org.bouncycastle.asn1.x509.GeneralNames org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509Extension org.bouncycastle.asn1.ASN1Primitive convertValueToObject(org.bouncycastle.asn1.x509.X509Extension) 0'>
@@ -260,6 +257,12 @@
     <item name='org.bouncycastle.asn1.x509.V3TBSCertificateGenerator void setStartDate(org.bouncycastle.asn1.DERUTCTime) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.IssuingDistributionPoint java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.X509Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getNonCriticalExtensionOIDs()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.ExtensionsGenerator void addExtension(org.bouncycastle.asn1.ASN1ObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -275,13 +278,25 @@
     <item name='org.bouncycastle.asn1.x509.X509Extensions org.bouncycastle.asn1.x509.X509Extension getExtension(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.PolicyInformation org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.x509.Extension getExtension(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.KeyPurposeId KeyPurposeId(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.PolicyInformation org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.AttributeCertificateInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.Attribute org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.Attribute org.bouncycastle.asn1.ASN1Encodable[] getAttributeValues()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.DistributionPoint org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.GeneralSubtree org.bouncycastle.asn1.x509.GeneralSubtree getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
@@ -293,46 +308,31 @@
     <item name='org.bouncycastle.asn1.x509.X509Extensions boolean equivalent(org.bouncycastle.asn1.x509.X509Extensions) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.SubjectPublicKeyInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.X509Name java.lang.String toString(boolean, java.util.Hashtable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.GeneralNames java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.SubjectPublicKeyInfo org.bouncycastle.asn1.x509.SubjectPublicKeyInfo getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getCriticalExtensionOIDs()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.GeneralNames org.bouncycastle.asn1.x509.GeneralNames fromExtensions(org.bouncycastle.asn1.x509.Extensions, org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509Name org.bouncycastle.asn1.x509.X509Name getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.IssuingDistributionPoint java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.AttCertIssuer org.bouncycastle.asn1.x509.AttCertIssuer getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.V2Form org.bouncycastle.asn1.x509.V2Form getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509Name java.lang.String toString(boolean, java.util.Hashtable)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.X509Extensions org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.V3TBSCertificateGenerator void setEndDate(org.bouncycastle.asn1.DERUTCTime) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.CRLReason java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.CRLNumber org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.DistributionPointName org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.X509Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getExtensionOIDs()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.TBSCertificateStructure TBSCertificateStructure(org.bouncycastle.asn1.ASN1Sequence) 0'>
@@ -344,7 +344,10 @@
     <item name='org.bouncycastle.asn1.x509.DistributionPoint DistributionPoint(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.ExtensionsGenerator org.bouncycastle.asn1.x509.Extensions generate()'>
+    <item name='org.bouncycastle.asn1.x509.X509Name java.util.Vector getValues()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.IssuerSerial org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.BasicConstraints org.bouncycastle.asn1.x509.BasicConstraints getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
@@ -356,36 +359,42 @@
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(org.bouncycastle.asn1.x509.GeneralNames, java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.DistributionPointName org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.NameConstraints org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.X509Name X509Name(java.util.Vector, java.util.Vector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.V1TBSCertificateGenerator void setSubject(org.bouncycastle.asn1.x509.X509Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.DSAParameter org.bouncycastle.asn1.x509.DSAParameter getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.TBSCertList org.bouncycastle.asn1.x509.TBSCertList.CRLEntry[] getRevokedCertificates()'>
+    <item name='org.bouncycastle.asn1.x509.GeneralName java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.ObjectDigestInfo org.bouncycastle.asn1.x509.ObjectDigestInfo getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509Name java.util.Vector getOIDs()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.V1TBSCertificateGenerator void setIssuer(org.bouncycastle.asn1.x509.X509Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.CRLDistPoint java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.GeneralNames org.bouncycastle.asn1.x509.GeneralNames fromExtensions(org.bouncycastle.asn1.x509.Extensions, org.bouncycastle.asn1.ASN1ObjectIdentifier) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.X509Extensions org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.V3TBSCertificateGenerator void setSubject(org.bouncycastle.asn1.x509.X509Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -398,33 +407,30 @@
     <item name='org.bouncycastle.asn1.x509.KeyUsage org.bouncycastle.asn1.x509.KeyUsage fromExtensions(org.bouncycastle.asn1.x509.Extensions) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.GeneralSubtree org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.CRLDistPoint java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.DSAParameter DSAParameter(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier org.bouncycastle.asn1.x509.AuthorityKeyIdentifier fromExtensions(org.bouncycastle.asn1.x509.Extensions) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getCriticalExtensionOIDs()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.TBSCertList org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.GeneralSubtree org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.CRLNumber java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.KeyUsage java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.x509.X509Extensions java.util.Enumeration oids()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509Name X509Name(java.util.Vector, java.util.Vector) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Extensions java.util.Enumeration oids()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.DigestInfo org.bouncycastle.asn1.x509.DigestInfo getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -443,7 +449,7 @@
     <item name='org.bouncycastle.asn1.x509.DistributionPointName DistributionPointName(org.bouncycastle.asn1.ASN1TaggedObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.NameConstraints org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.BasicConstraints java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509NameEntryConverter boolean canBePrintable(java.lang.String) 0'>
@@ -452,46 +458,28 @@
     <item name='org.bouncycastle.asn1.x509.X509Extensions X509Extensions(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getExtensionOIDs()'>
+    <item name='org.bouncycastle.asn1.x509.CRLReason java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.V2Form org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.ExtensionsGenerator org.bouncycastle.asn1.x509.Extensions generate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509Extensions java.util.Enumeration oids()'>
+    <item name='org.bouncycastle.asn1.x509.X509Name java.util.Vector getValues(org.bouncycastle.asn1.ASN1ObjectIdentifier)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator void addExtension(org.bouncycastle.asn1.ASN1ObjectIdentifier, boolean, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.BasicConstraints org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.BasicConstraints java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.Attribute org.bouncycastle.asn1.ASN1ObjectIdentifier getAttrType()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.X509CertificateStructure org.bouncycastle.asn1.x509.X509CertificateStructure getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.DSAParameter DSAParameter(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509Name java.util.Vector getValues()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.CertificateList java.util.Enumeration getRevokedCertificateEnumeration()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.CRLDistPoint org.bouncycastle.asn1.x509.DistributionPoint[] getDistributionPoints()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(byte[], org.bouncycastle.asn1.x509.GeneralNames, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.GeneralName java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.ReasonFlags ReasonFlags(org.bouncycastle.asn1.DERBitString) 0'>
@@ -500,12 +488,6 @@
     <item name='org.bouncycastle.asn1.x509.TBSCertificate org.bouncycastle.asn1.x509.TBSCertificate getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x509.AlgorithmIdentifier org.bouncycastle.asn1.ASN1ObjectIdentifier getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.CertificateList CertificateList(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -515,13 +497,19 @@
     <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.DigestInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.V1TBSCertificateGenerator void setEndDate(org.bouncycastle.asn1.ASN1UTCTime) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x509.X509Name X509Name(java.util.Vector, java.util.Vector, org.bouncycastle.asn1.x509.X509NameEntryConverter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509Name X509Name(java.util.Vector, java.util.Vector, org.bouncycastle.asn1.x509.X509NameEntryConverter) 0'>
+    <item name='org.bouncycastle.asn1.x509.CertificateList org.bouncycastle.asn1.x509.TBSCertList.CRLEntry[] getRevokedCertificates()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.RSAPublicKeyStructure org.bouncycastle.asn1.x509.RSAPublicKeyStructure getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
@@ -530,45 +518,60 @@
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(byte[], org.bouncycastle.asn1.x509.GeneralNames, java.math.BigInteger) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getNonCriticalExtensionOIDs()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.X509ExtensionsGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.DSAParameter DSAParameter(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.X509Name java.lang.String toString()'>
+    <item name='org.bouncycastle.asn1.x509.DSAParameter org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.RSAPublicKeyStructure RSAPublicKeyStructure(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getExtensionOIDs()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.ExtendedKeyUsage ExtendedKeyUsage(java.util.Vector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.ExtendedKeyUsage org.bouncycastle.asn1.x509.ExtendedKeyUsage fromExtensions(org.bouncycastle.asn1.x509.Extensions) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.Extensions org.bouncycastle.asn1.ASN1ObjectIdentifier[] getExtensionOIDs()'>
+    <item name='org.bouncycastle.asn1.x509.CertificateList java.util.Enumeration getRevokedCertificateEnumeration()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.AlgorithmIdentifier org.bouncycastle.asn1.ASN1ObjectIdentifier getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x509.SubjectKeyIdentifier org.bouncycastle.asn1.x509.SubjectKeyIdentifier createTruncatedSHA1KeyIdentifier(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.AuthorityKeyIdentifier AuthorityKeyIdentifier(org.bouncycastle.asn1.x509.GeneralNames, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x509.DistributionPoint org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x509.X509DefaultEntryConverter org.bouncycastle.asn1.ASN1Primitive getConvertedValue(org.bouncycastle.asn1.ASN1ObjectIdentifier, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.DistributionPoint org.bouncycastle.asn1.x509.DistributionPoint getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.TBSCertList java.util.Enumeration getRevokedCertificateEnumeration()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.IssuingDistributionPoint org.bouncycastle.asn1.x509.IssuingDistributionPoint getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x509.AttributeCertificateInfo org.bouncycastle.asn1.x509.AttributeCertificateInfo getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x509.ObjectDigestInfo org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x509.TBSCertList TBSCertList(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/asn1/x9/annotations.xml b/android-sdk-annotations/org/bouncycastle/asn1/x9/annotations.xml
index a0661188a76..9541719d6b3 100644
--- a/android-sdk-annotations/org/bouncycastle/asn1/x9/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/asn1/x9/annotations.xml
@@ -2,9 +2,15 @@
     <item name='org.bouncycastle.asn1.x9.X9FieldID X9FieldID(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x9.X962NamedCurves java.util.Enumeration getNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x9.X9Curve X9Curve(org.bouncycastle.asn1.x9.X9FieldID, org.bouncycastle.asn1.ASN1Sequence) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x9.X9IntegerConverter byte[] integerToBytes(java.math.BigInteger, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x9.X9IntegerConverter int getByteLength(org.bouncycastle.math.ec.ECFieldElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -17,7 +23,7 @@
     <item name='org.bouncycastle.asn1.x9.X962Parameters X962Parameters(org.bouncycastle.asn1.x9.X9ECParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x9.X962NamedCurves java.util.Enumeration getNames()'>
+    <item name='org.bouncycastle.asn1.x9.X9Curve org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x9.DHValidationParms org.bouncycastle.asn1.x9.DHValidationParms getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
@@ -26,15 +32,15 @@
     <item name='org.bouncycastle.asn1.x9.X962NamedCurves org.bouncycastle.asn1.x9.X9ECParameters getByName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x9.DHValidationParms org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x9.X9ECPoint X9ECPoint(org.bouncycastle.math.ec.ECCurve, org.bouncycastle.asn1.ASN1OctetString) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x9.DHDomainParameters org.bouncycastle.asn1.x9.DHDomainParameters getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x9.X9ECPoint org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x9.X962NamedCurves org.bouncycastle.asn1.x9.X9ECParameters getByOID(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -44,15 +50,12 @@
     <item name='org.bouncycastle.asn1.x9.X9FieldElement org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x9.X9ECParameters org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x9.X9FieldID org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x9.X9FieldElement X9FieldElement(int, int, int, int, org.bouncycastle.asn1.ASN1OctetString) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x9.X9FieldID org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x9.DHDomainParameters DHDomainParameters(org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.x9.DHValidationParms) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -77,18 +80,18 @@
     <item name='org.bouncycastle.asn1.x9.X962Parameters org.bouncycastle.asn1.x9.X962Parameters getInstance(org.bouncycastle.asn1.ASN1TaggedObject, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.asn1.x9.DHValidationParms org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.asn1.x9.X9ECParameters org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.asn1.x9.X9IntegerConverter int getByteLength(org.bouncycastle.math.ec.ECCurve) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.asn1.x9.DHDomainParameters org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x9.X9ECPoint org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.asn1.x9.X9IntegerConverter byte[] integerToBytes(java.math.BigInteger, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.asn1.x9.X9IntegerConverter byte[] integerToBytes(java.math.BigInteger, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -101,7 +104,7 @@
     <item name='org.bouncycastle.asn1.x9.DHDomainParameters DHDomainParameters(org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.ASN1Integer, org.bouncycastle.asn1.x9.DHValidationParms) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.asn1.x9.X9Curve org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+    <item name='org.bouncycastle.asn1.x9.X9ECParametersHolder org.bouncycastle.asn1.x9.X9ECParameters createParameters()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/agreement/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/agreement/annotations.xml
index 2f3e0410a57..fa0a374fb87 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/agreement/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/agreement/annotations.xml
@@ -1,8 +1,11 @@
 <root>
-    <item name='org.bouncycastle.crypto.agreement.DHBasicAgreement java.math.BigInteger calculateAgreement(org.bouncycastle.crypto.CipherParameters)'>
+    <item name='org.bouncycastle.crypto.agreement.DHBasicAgreement void init(org.bouncycastle.crypto.CipherParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.agreement.DHBasicAgreement void init(org.bouncycastle.crypto.CipherParameters) 0'>
+    <item name='org.bouncycastle.crypto.agreement.ECDHBasicAgreement void init(org.bouncycastle.crypto.CipherParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.agreement.DHBasicAgreement java.math.BigInteger calculateAgreement(org.bouncycastle.crypto.CipherParameters)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.agreement.DHBasicAgreement java.math.BigInteger calculateAgreement(org.bouncycastle.crypto.CipherParameters) 0'>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/annotations.xml
index 99aef19c51b..2b2b6b377ba 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/annotations.xml
@@ -1,29 +1,155 @@
 <root>
-    <item name='org.bouncycastle.crypto.PBEParametersGenerator byte[] PKCS5PasswordToUTF8Bytes(char[])'>
+    <item name='org.bouncycastle.crypto.DSA boolean verifySignature(byte[], java.math.BigInteger, java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.CipherKeyGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
+    <item name='org.bouncycastle.crypto.BasicAgreement java.math.BigInteger calculateAgreement(org.bouncycastle.crypto.CipherParameters)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.StreamBlockCipher StreamBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.CipherKeyGenerator byte[] generateKey()'>
+    <item name='org.bouncycastle.crypto.Mac java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.PBEParametersGenerator byte[] PKCS12PasswordToBytes(char[])'>
+    <item name='org.bouncycastle.crypto.StreamCipher java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.BufferedBlockCipher BufferedBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
+    <item name='org.bouncycastle.crypto.AsymmetricBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.StreamBlockCipher void processBytes(byte[], int, int, byte[], int) 3'>
+    <item name='org.bouncycastle.crypto.Digest void update(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.PBEParametersGenerator byte[] PKCS5PasswordToBytes(char[])'>
+    <item name='org.bouncycastle.crypto.StreamBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BufferedBlockCipher int processBytes(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BasicAgreement void init(org.bouncycastle.crypto.CipherParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.BufferedBlockCipher int doFinal(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.Signer void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.PBEParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.StreamCipher void processBytes(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.DSA void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BufferedBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Wrapper byte[] unwrap(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.AsymmetricBlockCipher byte[] processBlock(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.StreamBlockCipher void processBytes(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Digest java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.DSA java.math.BigInteger[] generateSignature(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.CipherKeyGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BlockCipher int processBlock(byte[], int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.CipherKeyGenerator byte[] generateKey()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Mac void update(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BlockCipher java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Digest int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Mac int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Mac void init(org.bouncycastle.crypto.CipherParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.PBEParametersGenerator byte[] PKCS5PasswordToUTF8Bytes(char[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.PBEParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedMacParameters(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator org.bouncycastle.crypto.AsymmetricCipherKeyPair generateKeyPair()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BufferedBlockCipher BufferedBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.PBEParametersGenerator byte[] PKCS12PasswordToBytes(char[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Wrapper void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.StreamCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BufferedBlockCipher int processBytes(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.PBEParametersGenerator byte[] PKCS5PasswordToBytes(char[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Wrapper java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.DSA java.math.BigInteger[] generateSignature(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Wrapper byte[] unwrap(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Signer void update(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.DSA boolean verifySignature(byte[], java.math.BigInteger, java.math.BigInteger) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.PBEParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.Wrapper byte[] wrap(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.StreamBlockCipher void processBytes(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BasicAgreement java.math.BigInteger calculateAgreement(org.bouncycastle.crypto.CipherParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.BlockCipher int processBlock(byte[], int, byte[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.StreamCipher void processBytes(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/digests/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/digests/annotations.xml
index e983b970197..237e6e885bf 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/digests/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/digests/annotations.xml
@@ -1,35 +1,14 @@
 <root>
-    <item name='org.bouncycastle.crypto.digests.SHA512Digest java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.digests.SHA512Digest void reset(org.bouncycastle.util.Memoable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.digests.NullDigest void update(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.SHA512Digest int doFinal(byte[], int) 0'>
+    <item name='org.bouncycastle.crypto.digests.SHA256Digest java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getSHA256()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA1Digest org.bouncycastle.util.Memoable copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA384Digest int doFinal(byte[], int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA384Digest SHA384Digest(org.bouncycastle.crypto.digests.SHA384Digest) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA1Digest SHA1Digest(org.bouncycastle.crypto.digests.SHA1Digest) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.MD5Digest MD5Digest(org.bouncycastle.crypto.digests.MD5Digest) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.GeneralDigest GeneralDigest(org.bouncycastle.crypto.digests.GeneralDigest) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA1Digest int doFinal(byte[], int) 0'>
+    <item name='org.bouncycastle.crypto.digests.SHA384Digest org.bouncycastle.util.Memoable copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.digests.SHA256Digest org.bouncycastle.util.Memoable copy()'>
@@ -38,97 +17,70 @@
     <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getSHA224()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getMD5()'>
+    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getSHA256()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.SHA384Digest void reset(org.bouncycastle.util.Memoable) 0'>
+    <item name='org.bouncycastle.crypto.digests.SHA224Digest java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.MD5Digest void reset(org.bouncycastle.util.Memoable) 0'>
+    <item name='org.bouncycastle.crypto.digests.SHA384Digest SHA384Digest(org.bouncycastle.crypto.digests.SHA384Digest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.LongDigest void copyIn(org.bouncycastle.crypto.digests.LongDigest) 0'>
+    <item name='org.bouncycastle.crypto.digests.GeneralDigest GeneralDigest(org.bouncycastle.crypto.digests.GeneralDigest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.MD5Digest org.bouncycastle.util.Memoable copy()'>
+    <item name='org.bouncycastle.crypto.digests.SHA1Digest int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.NullDigest int doFinal(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.digests.SHA224Digest org.bouncycastle.util.Memoable copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.MD5Digest int doFinal(byte[], int) 0'>
+    <item name='org.bouncycastle.crypto.digests.MD5Digest void reset(org.bouncycastle.util.Memoable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getSHA384()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.digests.SHA384Digest java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.SHA256Digest SHA256Digest(org.bouncycastle.crypto.digests.SHA256Digest) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.digests.GeneralDigest void copyIn(org.bouncycastle.crypto.digests.GeneralDigest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.SHA512Digest org.bouncycastle.util.Memoable copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.MD5Digest java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.digests.OpenSSLDigest void update(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.digests.SHA512Digest SHA512Digest(org.bouncycastle.crypto.digests.SHA512Digest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.SHA224Digest int doFinal(byte[], int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.digests.SHA256Digest void processWord(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.digests.LongDigest LongDigest(org.bouncycastle.crypto.digests.LongDigest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.NullDigest java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.digests.SHA512Digest java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.SHA1Digest java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.digests.SHA512Digest org.bouncycastle.util.Memoable copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.digests.LongDigest void processWord(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getSHA1()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA384Digest org.bouncycastle.util.Memoable copy()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA224Digest java.lang.String getAlgorithmName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA256Digest java.lang.String getAlgorithmName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getSHA384()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getSHA512()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA256Digest void reset(org.bouncycastle.util.Memoable) 0'>
+    <item name='org.bouncycastle.crypto.digests.MD5Digest org.bouncycastle.util.Memoable copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.digests.SHA224Digest void processWord(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.SHA1Digest void reset(org.bouncycastle.util.Memoable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.digests.SHA224Digest void reset(org.bouncycastle.util.Memoable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.digests.SHA224Digest SHA224Digest(org.bouncycastle.crypto.digests.SHA224Digest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.digests.MD5Digest void processWord(byte[], int) 0'>
+    <item name='org.bouncycastle.crypto.digests.GeneralDigest void processWord(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.digests.SHA1Digest void processWord(byte[], int) 0'>
@@ -137,4 +89,73 @@
     <item name='org.bouncycastle.crypto.digests.SHA256Digest int doFinal(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.digests.SHA512Digest int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA384Digest int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA1Digest SHA1Digest(org.bouncycastle.crypto.digests.SHA1Digest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.MD5Digest MD5Digest(org.bouncycastle.crypto.digests.MD5Digest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getMD5()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getSHA512()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA384Digest void reset(org.bouncycastle.util.Memoable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.LongDigest void copyIn(org.bouncycastle.crypto.digests.LongDigest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.MD5Digest int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA256Digest SHA256Digest(org.bouncycastle.crypto.digests.SHA256Digest) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA224Digest int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA1Digest java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.MD5Digest java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.NullDigest java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.OpenSSLDigest int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL org.bouncycastle.crypto.Digest getSHA1()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA256Digest void reset(org.bouncycastle.util.Memoable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.LongDigest void update(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA1Digest void reset(org.bouncycastle.util.Memoable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA224Digest void reset(org.bouncycastle.util.Memoable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.SHA1Digest org.bouncycastle.util.Memoable copy()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.GeneralDigest void update(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.digests.MD5Digest void processWord(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/encodings/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/encodings/annotations.xml
index cd0cc8955f8..329bbecc735 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/encodings/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/encodings/annotations.xml
@@ -5,13 +5,16 @@
     <item name='org.bouncycastle.crypto.encodings.PKCS1Encoding void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.encodings.OAEPEncoding void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.encodings.OAEPEncoding byte[] decodeBlock(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.encodings.OAEPEncoding OAEPEncoding(org.bouncycastle.crypto.AsymmetricBlockCipher, org.bouncycastle.crypto.Digest) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.encodings.OAEPEncoding OAEPEncoding(org.bouncycastle.crypto.AsymmetricBlockCipher, org.bouncycastle.crypto.Digest, org.bouncycastle.crypto.Digest, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.encodings.OAEPEncoding byte[] decodeBlock(byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/engines/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/engines/annotations.xml
index ff73f207436..da9c22de4fe 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/engines/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/engines/annotations.xml
@@ -11,12 +11,15 @@
     <item name='org.bouncycastle.crypto.engines.DESedeEngine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.AESFastEngine java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.engines.DESedeWrapEngine byte[] wrap(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.engines.AESEngine int processBlock(byte[], int, byte[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.engines.AESEngine java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.engines.DESEngine int processBlock(byte[], int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,13 +29,19 @@
     <item name='org.bouncycastle.crypto.engines.BlowfishEngine int processBlock(byte[], int, byte[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.AESEngine java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.engines.DESedeEngine java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.engines.RFC3394WrapEngine byte[] unwrap(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.engines.DESEngine void desFunc(int[], byte[], int, byte[], int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.DESedeEngine java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.engines.RFC3394WrapEngine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.engines.AESFastEngine java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.engines.TwofishEngine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
@@ -41,13 +50,19 @@
     <item name='org.bouncycastle.crypto.engines.DESEngine void desFunc(int[], byte[], int, byte[], int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.engines.DESedeWrapEngine java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.engines.RC2Engine java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.engines.AESFastEngine int processBlock(byte[], int, byte[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.engines.BlowfishEngine int processBlock(byte[], int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.DESEngine int[] generateWorkingKey(boolean, byte[])'>
+    <item name='org.bouncycastle.crypto.engines.DESedeWrapEngine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.engines.RC2Engine int processBlock(byte[], int, byte[], int) 0'>
@@ -56,15 +71,9 @@
     <item name='org.bouncycastle.crypto.engines.DESedeWrapEngine byte[] unwrap(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.TwofishEngine java.lang.String getAlgorithmName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.engines.RC4Engine void processBytes(byte[], int, int, byte[], int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.DESedeWrapEngine byte[] wrap(byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.engines.DESEngine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -74,7 +83,10 @@
     <item name='org.bouncycastle.crypto.engines.BlowfishEngine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.RFC3394WrapEngine byte[] wrap(byte[], int, int)'>
+    <item name='org.bouncycastle.crypto.engines.DESEngine java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.engines.RSABlindedEngine byte[] processBlock(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.engines.RC2Engine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
@@ -89,40 +101,40 @@
     <item name='org.bouncycastle.crypto.engines.TwofishEngine int processBlock(byte[], int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.RC4Engine java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.engines.RSABlindedEngine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.RFC3394WrapEngine byte[] unwrap(byte[], int, int)'>
+    <item name='org.bouncycastle.crypto.engines.RFC3394WrapEngine byte[] wrap(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.engines.RC4Engine void processBytes(byte[], int, int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.DESedeWrapEngine java.lang.String getAlgorithmName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.engines.RSABlindedEngine byte[] processBlock(byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.engines.RC4Engine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.RC2Engine java.lang.String getAlgorithmName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.engines.DESEngine java.lang.String getAlgorithmName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.engines.DESedeWrapEngine byte[] unwrap(byte[], int, int)'>
+    <item name='org.bouncycastle.crypto.engines.TwofishEngine java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.engines.TwofishEngine int processBlock(byte[], int, byte[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.engines.BlowfishEngine java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.engines.RFC3394WrapEngine byte[] unwrap(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.engines.AESFastEngine void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.engines.BlowfishEngine java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.engines.DESedeWrapEngine byte[] unwrap(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.engines.RC4Engine java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.engines.DESEngine int[] generateWorkingKey(boolean, byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/generators/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/generators/annotations.xml
index 3d4ed530d2c..f3cafded2ab 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/generators/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/generators/annotations.xml
@@ -1,80 +1,89 @@
 <root>
-    <item name='org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int, int)'>
+    <item name='org.bouncycastle.crypto.generators.DSAKeyPairGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int)'>
+    <item name='org.bouncycastle.crypto.generators.PKCS12ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedMacParameters(int)'>
+    <item name='org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedMacParameters(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.DESedeKeyGenerator byte[] generateKey()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.generators.DESedeKeyGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
+    <item name='org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.generators.DHBasicKeyPairGenerator org.bouncycastle.crypto.AsymmetricCipherKeyPair generateKeyPair()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.generators.DESedeKeyGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.generators.DESKeyGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.generators.DSAParametersGenerator void init(org.bouncycastle.crypto.params.DSAParameterGenerationParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.DSAParametersGenerator org.bouncycastle.crypto.params.DSAParameters generateParameters()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedMacParameters(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.generators.PKCS12ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int, int)'>
+    <item name='org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.generators.ECKeyPairGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int, int)'>
+    <item name='org.bouncycastle.crypto.generators.DESedeKeyGenerator byte[] generateKey()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedMacParameters(int)'>
+    <item name='org.bouncycastle.crypto.generators.PKCS12ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.generators.DESKeyGenerator byte[] generateKey()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.generators.ECKeyPairGenerator org.bouncycastle.crypto.AsymmetricCipherKeyPair generateKeyPair()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.DHParametersGenerator org.bouncycastle.crypto.params.DHParameters generateParameters()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int, int)'>
+    <item name='org.bouncycastle.crypto.generators.DSAKeyPairGenerator org.bouncycastle.crypto.AsymmetricCipherKeyPair generateKeyPair()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.generators.PKCS12ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedMacParameters(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator PKCS5S2ParametersGenerator(org.bouncycastle.crypto.Digest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.generators.RSAKeyPairGenerator org.bouncycastle.crypto.AsymmetricCipherKeyPair generateKeyPair()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.DESKeyGenerator byte[] generateKey()'>
+    <item name='org.bouncycastle.crypto.generators.DSAParametersGenerator org.bouncycastle.crypto.params.DSAParameters generateParameters()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.DSAKeyPairGenerator org.bouncycastle.crypto.AsymmetricCipherKeyPair generateKeyPair()'>
+    <item name='org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedMacParameters(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.generators.RSAKeyPairGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.generators.PKCS12ParametersGenerator PKCS12ParametersGenerator(org.bouncycastle.crypto.Digest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int)'>
+    <item name='org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedMacParameters(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.PKCS12ParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int)'>
+    <item name='org.bouncycastle.crypto.generators.DHParametersGenerator org.bouncycastle.crypto.params.DHParameters generateParameters()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator org.bouncycastle.crypto.CipherParameters generateDerivedParameters(int)'>
+    <item name='org.bouncycastle.crypto.generators.DHBasicKeyPairGenerator void init(org.bouncycastle.crypto.KeyGenerationParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/io/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/io/annotations.xml
index 3e5636d2120..9a9ef4afe22 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/io/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/io/annotations.xml
@@ -5,9 +5,18 @@
     <item name='org.bouncycastle.crypto.io.DigestInputStream DigestInputStream(java.io.InputStream, org.bouncycastle.crypto.Digest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.io.CipherOutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.io.CipherInputStream CipherInputStream(java.io.InputStream, org.bouncycastle.crypto.StreamCipher) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.io.DigestOutputStream byte[] getDigest()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.io.DigestOutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.io.CipherInputStream CipherInputStream(java.io.InputStream, org.bouncycastle.crypto.BufferedBlockCipher) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,6 +35,9 @@
     <item name='org.bouncycastle.crypto.io.CipherInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.io.MacOutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.io.MacOutputStream byte[] getMac()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -35,10 +47,10 @@
     <item name='org.bouncycastle.crypto.io.CipherOutputStream void write(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.io.CipherInputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.io.DigestInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.io.DigestOutputStream byte[] getDigest()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/macs/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/macs/annotations.xml
index 308a3aa86ed..ef18bb556d9 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/macs/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/macs/annotations.xml
@@ -1,4 +1,10 @@
 <root>
+    <item name='org.bouncycastle.crypto.macs.HMac int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.macs.CBCBlockCipherMac void update(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.macs.CBCBlockCipherMac CBCBlockCipherMac(org.bouncycastle.crypto.BlockCipher, org.bouncycastle.crypto.paddings.BlockCipherPadding) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,13 +17,22 @@
     <item name='org.bouncycastle.crypto.macs.CBCBlockCipherMac CBCBlockCipherMac(org.bouncycastle.crypto.BlockCipher, int, org.bouncycastle.crypto.paddings.BlockCipherPadding) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.macs.CBCBlockCipherMac int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.macs.HMac java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.macs.HMac void update(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.macs.CBCBlockCipherMac CBCBlockCipherMac(org.bouncycastle.crypto.BlockCipher, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.macs.HMac void init(org.bouncycastle.crypto.CipherParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.macs.CBCBlockCipherMac void init(org.bouncycastle.crypto.CipherParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/modes/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/modes/annotations.xml
index d5777e59bb7..30e9674640e 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/modes/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/modes/annotations.xml
@@ -1,14 +1,92 @@
 <root>
+    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int decryptBlock(byte[], int, byte[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.AEADBlockCipher int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.AEADBlockCipher int processBytes(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int processBlock(byte[], int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.GCMBlockCipher int processBytes(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.SICBlockCipher java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher int processBytes(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CBCBlockCipher int processBlock(byte[], int, byte[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.modes.OFBBlockCipher org.bouncycastle.crypto.BlockCipher getUnderlyingCipher()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int decryptBlock(byte[], int, byte[], int) 0'>
+    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher void processAADBytes(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CTSBlockCipher int processBytes(byte[], int, int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.modes.GCMBlockCipher java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher byte[] getMac()'>
+    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.GCMBlockCipher int processBytes(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int processBlock(byte[], int, byte[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.SICBlockCipher int processBlock(byte[], int, byte[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int encryptBlock(byte[], int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.AEADBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CTSBlockCipher int processBytes(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.GCMBlockCipher int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.OFBBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.SICBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CBCBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.OFBBlockCipher int processBlock(byte[], int, byte[], int) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int decryptBlock(byte[], int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.OFBBlockCipher java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.modes.CBCBlockCipher CBCBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
@@ -17,49 +95,34 @@
     <item name='org.bouncycastle.crypto.modes.GCMBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int decryptBlock(byte[], int, byte[], int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int processBlock(byte[], int, byte[], int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher byte[] processPacket(byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher java.lang.String getAlgorithmName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher void processAADBytes(byte[], int, int) 0'>
+    <item name='org.bouncycastle.crypto.modes.GCMBlockCipher void processAADBytes(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.modes.CCMBlockCipher CCMBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.OFBBlockCipher OFBBlockCipher(org.bouncycastle.crypto.BlockCipher, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.modes.CBCBlockCipher int processBlock(byte[], int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.modes.CTSBlockCipher int doFinal(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.modes.OFBBlockCipher OFBBlockCipher(org.bouncycastle.crypto.BlockCipher, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher byte[] processPacket(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int processBlock(byte[], int, byte[], int) 2'>
+    <item name='org.bouncycastle.crypto.modes.CCMBlockCipher byte[] getMac()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.modes.GCMBlockCipher GCMBlockCipher(org.bouncycastle.crypto.BlockCipher, org.bouncycastle.crypto.modes.gcm.GCMMultiplier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.GCMBlockCipher GCMBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
+    <item name='org.bouncycastle.crypto.modes.AEADBlockCipher java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int encryptBlock(byte[], int, byte[], int) 0'>
+    <item name='org.bouncycastle.crypto.modes.GCMBlockCipher GCMBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.modes.CFBBlockCipher CFBBlockCipher(org.bouncycastle.crypto.BlockCipher, int) 0'>
@@ -71,25 +134,22 @@
     <item name='org.bouncycastle.crypto.modes.CFBBlockCipher int encryptBlock(byte[], int, byte[], int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.modes.CBCBlockCipher java.lang.String getAlgorithmName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.modes.OFBBlockCipher int processBlock(byte[], int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.OFBBlockCipher java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.modes.SICBlockCipher int processBlock(byte[], int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.modes.AEADBlockCipher int processBytes(byte[], int, int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.modes.CCMBlockCipher int processBytes(byte[], int, int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.modes.CBCBlockCipher java.lang.String getAlgorithmName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.modes.SICBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.modes.OFBBlockCipher int processBlock(byte[], int, byte[], int) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.modes.SICBlockCipher java.lang.String getAlgorithmName()'>
+    <item name='org.bouncycastle.crypto.modes.AEADBlockCipher void processAADBytes(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/paddings/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/paddings/annotations.xml
index b7836812432..189c23040eb 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/paddings/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/paddings/annotations.xml
@@ -2,60 +2,81 @@
     <item name='org.bouncycastle.crypto.paddings.ZeroBytePadding int padCount(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.paddings.BlockCipherPadding int padCount(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.paddings.ISO7816d4Padding int addPadding(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.paddings.X923Padding int padCount(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.paddings.BlockCipherPadding java.lang.String getPaddingName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.paddings.ISO7816d4Padding int padCount(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.paddings.X923Padding int addPadding(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.paddings.PKCS7Padding java.lang.String getPaddingName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.paddings.TBCPadding int addPadding(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.paddings.ISO10126d2Padding java.lang.String getPaddingName()'>
+    <item name='org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher PaddedBufferedBlockCipher(org.bouncycastle.crypto.BlockCipher, org.bouncycastle.crypto.paddings.BlockCipherPadding) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.paddings.TBCPadding java.lang.String getPaddingName()'>
+    <item name='org.bouncycastle.crypto.paddings.BlockCipherPadding int addPadding(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.paddings.ISO10126d2Padding int padCount(byte[]) 0'>
+    <item name='org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher int processBytes(byte[], int, int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.paddings.ISO7816d4Padding java.lang.String getPaddingName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.paddings.ISO10126d2Padding int padCount(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.paddings.ZeroBytePadding java.lang.String getPaddingName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.paddings.PKCS7Padding int padCount(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.paddings.ISO10126d2Padding int addPadding(byte[], int) 0'>
+    <item name='org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher int processBytes(byte[], int, int, byte[], int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.paddings.X923Padding java.lang.String getPaddingName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.paddings.ISO10126d2Padding int addPadding(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.paddings.TBCPadding int padCount(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher int doFinal(byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.paddings.ISO10126d2Padding java.lang.String getPaddingName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.paddings.ZeroBytePadding int addPadding(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher PaddedBufferedBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.paddings.TBCPadding java.lang.String getPaddingName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.paddings.PKCS7Padding java.lang.String getPaddingName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.paddings.PKCS7Padding int addPadding(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/signers/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/signers/annotations.xml
index b6a7f1f186b..17650292485 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/signers/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/signers/annotations.xml
@@ -2,27 +2,39 @@
     <item name='org.bouncycastle.crypto.signers.DSASigner boolean verifySignature(byte[], java.math.BigInteger, java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.signers.DSASigner java.math.BigInteger[] generateSignature(byte[])'>
+    <item name='org.bouncycastle.crypto.signers.DSASigner java.math.BigInteger[] generateSignature(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.signers.RSADigestSigner java.lang.String getAlgorithmName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.signers.DSASigner java.math.BigInteger[] generateSignature(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.signers.ECDSASigner java.math.BigInteger[] generateSignature(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.signers.RSADigestSigner RSADigestSigner(org.bouncycastle.crypto.Digest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.signers.DSASigner java.math.BigInteger[] generateSignature(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.signers.DSASigner boolean verifySignature(byte[], java.math.BigInteger, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.signers.RSADigestSigner void update(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.signers.DSASigner void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.signers.ECDSASigner boolean verifySignature(byte[], java.math.BigInteger, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.signers.RSADigestSigner void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.signers.ECDSASigner void init(boolean, org.bouncycastle.crypto.CipherParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.signers.ECDSASigner boolean verifySignature(byte[], java.math.BigInteger, java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/crypto/util/annotations.xml b/android-sdk-annotations/org/bouncycastle/crypto/util/annotations.xml
index 4f45314143e..637141bb87c 100644
--- a/android-sdk-annotations/org/bouncycastle/crypto/util/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/crypto/util/annotations.xml
@@ -1,17 +1,17 @@
 <root>
-    <item name='org.bouncycastle.crypto.util.Pack byte[] longToLittleEndian(long[])'>
+    <item name='org.bouncycastle.crypto.util.Pack byte[] intToLittleEndian(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.util.Pack void littleEndianToInt(byte[], int, int[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.PublicKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
+    <item name='org.bouncycastle.crypto.util.Pack byte[] longToBigEndian(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.util.Pack void intToBigEndian(int[], byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.Pack byte[] longToLittleEndian(long)'>
+    <item name='org.bouncycastle.crypto.util.PublicKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.util.Pack byte[] intToLittleEndian(int[]) 0'>
@@ -20,15 +20,12 @@
     <item name='org.bouncycastle.crypto.util.Pack void bigEndianToInt(byte[], int, int[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.PublicKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(java.io.InputStream)'>
+    <item name='org.bouncycastle.crypto.util.Pack byte[] intToBigEndian(int[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.util.Pack long bigEndianToLong(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.PrivateKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.util.Pack void longToBigEndian(long, byte[], int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -38,18 +35,15 @@
     <item name='org.bouncycastle.crypto.util.Pack void littleEndianToLong(byte[], int, long[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.PrivateKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.util.Pack byte[] intToLittleEndian(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.util.Pack byte[] longToBigEndian(long)'>
+    <item name='org.bouncycastle.crypto.util.PublicKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.util.Pack int bigEndianToInt(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.crypto.util.Pack byte[] intToLittleEndian(int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.crypto.util.Pack void intToLittleEndian(int, byte[], int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -59,12 +53,6 @@
     <item name='org.bouncycastle.crypto.util.Pack byte[] longToLittleEndian(long[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.Pack byte[] intToBigEndian(int[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.crypto.util.PrivateKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.crypto.util.Pack void intToBigEndian(int, byte[], int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -74,10 +62,16 @@
     <item name='org.bouncycastle.crypto.util.PrivateKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.PublicKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(byte[])'>
+    <item name='org.bouncycastle.crypto.util.Pack byte[] longToBigEndian(long[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.Pack byte[] intToLittleEndian(int[])'>
+    <item name='org.bouncycastle.crypto.util.Pack byte[] longToLittleEndian(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.util.PrivateKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.util.PublicKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.util.PrivateKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
@@ -104,13 +98,19 @@
     <item name='org.bouncycastle.crypto.util.PrivateKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.Pack byte[] intToBigEndian(int)'>
+    <item name='org.bouncycastle.crypto.util.Pack byte[] longToLittleEndian(long[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.util.PrivateKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.crypto.util.PrivateKeyFactory org.bouncycastle.crypto.params.AsymmetricKeyParameter createKey(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.util.Pack void intToLittleEndian(int[], byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.crypto.util.Pack byte[] longToBigEndian(long[])'>
+    <item name='org.bouncycastle.crypto.util.Pack byte[] intToBigEndian(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.crypto.util.Pack long littleEndianToLong(byte[], int) 0'>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/annotations.xml
index bbacde3abe6..bd409132f19 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/annotations.xml
@@ -1,41 +1,59 @@
 <root>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.Mac createMac(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.MessageDigest createDigest(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.Cipher createCipher(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.Signature createSignature(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.Signature createSignature(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.Mac createMac(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.MessageDigest createDigest(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.Mac createMac(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.MessageDigest createDigest(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.Signature createSignature(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.Mac createMac(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.Cipher createCipher(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.Cipher createCipher(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.Signature createSignature(java.lang.String) 0'>
@@ -47,16 +65,10 @@
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.Signature createSignature(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.MessageDigest createDigest(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.MessageDigest createDigest(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String) 0'>
@@ -71,88 +83,139 @@
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.MessageDigest createDigest(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.Mac createMac(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.Mac createMac(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.Mac createMac(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.Mac createMac(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.MessageDigest createDigest(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.Signature createSignature(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.Mac createMac(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.MessageDigest createDigest(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.Mac createMac(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.Cipher createCipher(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.cert.CertificateFactory createCertificateFactory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.Cipher createCipher(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.Cipher createCipher(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.Mac createMac(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.MessageDigest createDigest(java.lang.String) 0'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.Signature createSignature(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.MessageDigest createDigest(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.Cipher createCipher(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.AlgorithmParameters createAlgorithmParameters(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.Cipher createCipher(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.Mac createMac(java.lang.String) 0'>
@@ -161,33 +224,36 @@
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.Cipher createCipher(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.Signature createSignature(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.MessageDigest createDigest(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.Cipher createCipher(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.Cipher createCipher(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.NamedJcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.SecretKeyFactory createSecretKeyFactory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.NamedJcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -197,22 +263,28 @@
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.KeyFactory createKeyFactory(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.Signature createSignature(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.DefaultJcaJceHelper javax.crypto.KeyAgreement createKeyAgreement(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper javax.crypto.KeyGenerator createKeyGenerator(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.KeyPairGenerator createKeyPairGenerator(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.JcaJceHelper java.security.AlgorithmParameterGenerator createAlgorithmParameterGenerator(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.ProviderJcaJceHelper java.security.Signature createSignature(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/io/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/io/annotations.xml
new file mode 100644
index 00000000000..500e9e60b2d
--- /dev/null
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/io/annotations.xml
@@ -0,0 +1,5 @@
+<root>
+    <item name='org.bouncycastle.jcajce.io.MacOutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/dh/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/dh/annotations.xml
index dce3c3e91da..4fa56cf097a 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/dh/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/dh/annotations.xml
@@ -1,8 +1,11 @@
 <root>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPublicKey java.lang.String getAlgorithm()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyAgreementSpi java.security.Key engineDoPhase(java.security.Key, boolean) 0'>
@@ -11,21 +14,27 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParametersSpi void engineInit(byte[], java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParametersSpi void engineInit(java.security.spec.AlgorithmParameterSpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParametersSpi byte[] engineGetEncoded(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey java.lang.String getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -35,43 +44,40 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParameterGeneratorSpi void engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyPairGeneratorSpi java.security.KeyPair generateKeyPair()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParameterGeneratorSpi java.security.AlgorithmParameters engineGenerateParameters()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyAgreementSpi javax.crypto.SecretKey engineGenerateSecret(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyAgreementSpi javax.crypto.SecretKey engineGenerateSecret(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParametersSpi java.lang.String engineToString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParameterGeneratorSpi java.security.AlgorithmParameters engineGenerateParameters()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyAgreementSpi void engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyAgreementSpi javax.crypto.SecretKey engineGenerateSecret(java.lang.String)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParametersSpi void engineInit(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyAgreementSpi int engineGenerateSecret(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParametersSpi java.security.spec.AlgorithmParameterSpec engineGetParameterSpec(java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyAgreementSpi byte[] engineGenerateSecret()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyAgreementSpi void engineInit(java.security.Key, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyAgreementSpi byte[] engineGenerateSecret()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyPairGeneratorSpi void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
@@ -83,25 +89,31 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPublicKey java.lang.String getAlgorithm()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey java.lang.String getAlgorithm()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParametersSpi java.lang.String engineToString()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.AlgorithmParametersSpi void engineInit(byte[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey java.lang.String getFormat()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyPairGeneratorSpi java.security.KeyPair generateKeyPair()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey BCDHPrivateKey(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPublicKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey BCDHPrivateKey(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dh.BCDHPrivateKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/dsa/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/dsa/annotations.xml
index 01b1d615eff..ace716b8f9a 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/dsa/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/dsa/annotations.xml
@@ -1,5 +1,11 @@
 <root>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParameterGeneratorSpi java.security.AlgorithmParameters engineGenerateParameters()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyPairGeneratorSpi java.security.KeyPair generateKeyPair()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSAUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPrivateKey BCDSAPrivateKey(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
@@ -8,13 +14,10 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSASigner boolean engineVerify(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPrivateKey java.lang.String getAlgorithm()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyPairGeneratorSpi void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
@@ -23,18 +26,12 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyPairGeneratorSpi java.security.KeyPair generateKeyPair()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPublicKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParametersSpi void engineInit(byte[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPublicKey java.lang.String getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSAUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -47,18 +44,21 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPrivateKey java.lang.String getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParametersSpi void engineInit(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParameterGeneratorSpi void engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParametersSpi byte[] engineGetEncoded(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPublicKey BCDSAPublicKey(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSASigner void engineInitSign(java.security.PrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -68,30 +68,39 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPrivateKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPublicKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSASigner void engineInitSign(java.security.PrivateKey, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParametersSpi java.lang.String engineToString()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParametersSpi void engineInit(byte[], java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSASigner void engineInitVerify(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPublicKey java.lang.String getFormat()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.BCDSAPublicKey java.lang.String getAlgorithm()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParametersSpi java.lang.String engineToString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSAUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePublicKeyParameter(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSASigner void engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -101,6 +110,12 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParametersSpi void engineInit(java.security.spec.AlgorithmParameterSpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSASigner java.lang.Object engineGetParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.AlgorithmParameterGeneratorSpi java.security.AlgorithmParameters engineGenerateParameters()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -110,7 +125,7 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.DSAUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePublicKeyParameter(java.security.PublicKey)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/ec/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/ec/annotations.xml
index 89b7733370f..9c371e7fd48 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/ec/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/ec/annotations.xml
@@ -1,5 +1,8 @@
 <root>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyPairGeneratorSpi.EC void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
@@ -17,33 +20,24 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey BCECPrivateKey(java.lang.String, org.bouncycastle.crypto.params.ECPrivateKeyParameters, org.bouncycastle.jcajce.provider.config.ProviderConfiguration) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyPairGeneratorSpi.EC java.security.KeyPair generateKeyPair()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey BCECPublicKey(java.lang.String, org.bouncycastle.crypto.params.ECPublicKeyParameters, org.bouncycastle.jcajce.provider.config.ProviderConfiguration) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey BCECPublicKey(java.lang.String, org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey BCECPublicKey(java.lang.String, org.bouncycastle.jce.spec.ECPublicKeySpec, org.bouncycastle.jcajce.provider.config.ProviderConfiguration) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyAgreementSpi void engineInit(java.security.Key, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -53,27 +47,15 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey BCECPrivateKey(java.lang.String, java.security.spec.ECPrivateKeySpec, org.bouncycastle.jcajce.provider.config.ProviderConfiguration) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.SignatureSpi void engineInitVerify(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.SignatureSpi void engineInitSign(java.security.PrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey java.security.spec.ECPoint getW()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyAgreementSpi java.security.Key engineDoPhase(java.security.Key, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -83,30 +65,42 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey BCECPrivateKey(java.security.interfaces.ECPrivateKey, org.bouncycastle.jcajce.provider.config.ProviderConfiguration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyAgreementSpi byte[] engineGenerateSecret()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyAgreementSpi javax.crypto.SecretKey engineGenerateSecret(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyAgreementSpi byte[] engineGenerateSecret()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyPairGeneratorSpi.EC java.security.KeyPair generateKeyPair()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyAgreementSpi int engineGenerateSecret(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey BCECPrivateKey(java.lang.String, org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyAgreementSpi javax.crypto.SecretKey engineGenerateSecret(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -119,6 +113,9 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey BCECPrivateKey(java.lang.String, org.bouncycastle.jce.spec.ECPrivateKeySpec, org.bouncycastle.jcajce.provider.config.ProviderConfiguration) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyAgreementSpi javax.crypto.SecretKey engineGenerateSecret(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey BCECPublicKey(java.security.interfaces.ECPublicKey, org.bouncycastle.jcajce.provider.config.ProviderConfiguration) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -128,6 +125,12 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey BCECPublicKey(java.lang.String, org.bouncycastle.crypto.params.ECPublicKeyParameters, org.bouncycastle.jce.spec.ECParameterSpec, org.bouncycastle.jcajce.provider.config.ProviderConfiguration) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey java.security.spec.ECPoint getW()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.ec.KeyAgreementSpi void engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/rsa/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/rsa/annotations.xml
index 40202e611a8..e6e01270d29 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/rsa/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/rsa/annotations.xml
@@ -1,5 +1,5 @@
 <root>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyPairGeneratorSpi java.security.KeyPair generateKeyPair()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey java.lang.String getAlgorithm()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi void engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 1'>
@@ -8,58 +8,37 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi byte[] engineUpdate(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPublicKey java.lang.String getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi int engineDoFinal(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey java.lang.String getAlgorithm()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.OAEP byte[] engineGetEncoded(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateCrtKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.OAEP void engineInit(byte[], java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.PSS void engineInit(java.security.spec.AlgorithmParameterSpec) 0'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.OAEP void engineInit(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.PSS void engineInit(java.security.spec.AlgorithmParameterSpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.PSS byte[] engineGetEncoded(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 0'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPublicKey java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.OAEP void engineInit(java.security.spec.AlgorithmParameterSpec) 0'>
@@ -68,30 +47,102 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi void engineSetPadding(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey java.util.Enumeration getBagAttributeKeys()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateCrtKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi java.security.spec.AlgorithmParameterSpec engineGetParameterSpec(java.lang.Class) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.OAEP java.lang.String engineToString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi void engineSetMode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.PSS java.lang.String engineToString()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateCrtKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.PSS void engineInit(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.OAEP void engineInit(byte[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.PSS void engineInit(byte[], java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyPairGeneratorSpi void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPublicKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyPairGeneratorSpi java.security.KeyPair generateKeyPair()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi int engineUpdate(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.OAEP java.lang.String engineToString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.PSS void engineInit(byte[], java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPublicKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.OAEP void engineInit(byte[], java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi int engineUpdate(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.PSS byte[] engineGetEncoded(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.DigestSignatureSpi boolean engineVerify(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.DigestSignatureSpi java.lang.Object engineGetParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.DigestSignatureSpi void engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi java.security.spec.AlgorithmParameterSpec engineGetParameterSpec(java.lang.Class) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi.PSS java.lang.String engineToString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.DigestSignatureSpi void engineInitVerify(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -104,28 +155,13 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi int engineGetKeySize(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateCrtKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyPairGeneratorSpi void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi int engineUpdate(byte[], int, int, byte[], int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.Key engineTranslateKey(java.security.Key)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 1'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/util/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/util/annotations.xml
index 93b87a51467..8e85c251f02 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/util/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/util/annotations.xml
@@ -2,28 +2,46 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl void writeObject(java.io.ObjectOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.jce.spec.ECParameterSpec convertSpec(java.security.spec.ECParameterSpec, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi void engineSetMode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DSABase boolean engineVerify(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util java.security.spec.EllipticCurve convertCurve(org.bouncycastle.math.ec.ECCurve, byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi java.security.Key engineUnwrap(byte[], java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi byte[] engineWrap(java.security.Key) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.math.ec.ECCurve convertCurve(java.security.spec.EllipticCurve) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi byte[] engineWrap(java.security.Key) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePublicKeyParameter(java.security.PublicKey)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi int engineGetKeySize(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.math.ec.ECPoint convertPoint(java.security.spec.ECParameterSpec, java.security.spec.ECPoint, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.math.ec.ECPoint convertPoint(java.security.spec.ECParameterSpec, java.security.spec.ECPoint, boolean) 0'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil org.bouncycastle.asn1.ASN1ObjectIdentifier getNamedCurveOid(java.lang.String) 0'>
@@ -32,22 +50,37 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DSAEncoder java.math.BigInteger[] decode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DSAEncoder java.math.BigInteger[] decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.math.ec.ECPoint convertPoint(org.bouncycastle.math.ec.ECCurve, java.security.spec.ECPoint, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util java.security.spec.ECParameterSpec convertSpec(java.security.spec.EllipticCurve, org.bouncycastle.jce.spec.ECParameterSpec) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util java.security.spec.ECParameterSpec convertSpec(java.security.spec.EllipticCurve, org.bouncycastle.jce.spec.ECParameterSpec) 1'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DSAEncoder byte[] encode(java.math.BigInteger, java.math.BigInteger) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DSAEncoder byte[] encode(java.math.BigInteger, java.math.BigInteger)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePublicKeyParameter(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.math.ec.ECCurve convertCurve(java.security.spec.EllipticCurve)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util java.security.spec.ECParameterSpec convertSpec(java.security.spec.EllipticCurve, org.bouncycastle.jce.spec.ECParameterSpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePublicKeyParameter(java.security.PublicKey) 0'>
@@ -56,19 +89,19 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.jce.spec.ECParameterSpec convertSpec(java.security.spec.ECParameterSpec, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi java.security.Key engineUnwrap(byte[], java.lang.String, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi void engineSetPadding(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil java.lang.String getCurveName(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util java.security.spec.EllipticCurve convertCurve(org.bouncycastle.math.ec.ECCurve, byte[])'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl java.util.Enumeration getBagAttributeKeys()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil org.bouncycastle.asn1.x9.X9ECParameters getNamedCurveByOid(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
@@ -80,31 +113,31 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util java.security.spec.ECParameterSpec convertSpec(java.security.spec.EllipticCurve, org.bouncycastle.jce.spec.ECParameterSpec)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DSAEncoder byte[] encode(java.math.BigInteger, java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl void readObject(java.io.ObjectInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePublicKeyParameter(java.security.PublicKey)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.jce.spec.ECParameterSpec convertSpec(java.security.spec.ECParameterSpec, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.math.ec.ECPoint convertPoint(org.bouncycastle.math.ec.ECCurve, java.security.spec.ECPoint, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl java.util.Enumeration getBagAttributeKeys()'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DSABase java.lang.Object engineGetParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util java.security.spec.EllipticCurve convertCurve(org.bouncycastle.math.ec.ECCurve, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util org.bouncycastle.math.ec.ECCurve convertCurve(java.security.spec.EllipticCurve)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.util.DSABase void engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/x509/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/x509/annotations.xml
index c1a868241a5..f9358edd9d7 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/x509/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/asymmetric/x509/annotations.xml
@@ -2,51 +2,66 @@
     <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.util.Collection engineGenerateCertificates(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.PKIXCertPath byte[] getEncoded(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.util.List)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.util.Collection engineGenerateCRLs(java.io.InputStream)'>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.Certificate engineGenerateCertificate(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CRL engineGenerateCRL(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.util.List)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.PKIXCertPath byte[] getEncoded(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.util.Collection engineGenerateCertificates(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.Key engineTranslateKey(java.security.Key) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory java.security.spec.KeySpec engineGetKeySpec(java.security.Key, java.lang.Class)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CRL createCRL(org.bouncycastle.asn1.x509.CertificateList)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.PKIXCertPath java.util.List getCertificates()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CRL createCRL(org.bouncycastle.asn1.x509.CertificateList) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.util.Collection engineGenerateCRLs(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.util.List) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.util.Collection engineGenerateCertificates(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.util.Collection engineGenerateCRLs(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.PKIXCertPath java.util.List getCertificates()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/config/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/config/annotations.xml
index b9e7f334a07..7f0d41acbe4 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/config/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/config/annotations.xml
@@ -5,4 +5,10 @@
     <item name='org.bouncycastle.jcajce.provider.config.ProviderConfigurationPermission ProviderConfigurationPermission(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.config.ConfigurableProvider void setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.config.ConfigurableProvider void setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/digest/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/digest/annotations.xml
index 7219c64597c..30adfaf3d30 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/digest/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/digest/annotations.xml
@@ -8,22 +8,28 @@
     <item name='org.bouncycastle.jcajce.provider.digest.SHA384.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.digest.SHA384.Digest java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.digest.MD5.Digest java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.digest.SHA512.Digest java.lang.Object clone()'>
+    <item name='org.bouncycastle.jcajce.provider.digest.SHA1.BasePBKDF2WithHmacSHA1 javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.digest.SHA224.Digest java.lang.Object clone()'>
+    <item name='org.bouncycastle.jcajce.provider.digest.BCMessageDigest byte[] engineDigest()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.digest.BCMessageDigest void engineUpdate(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.digest.SHA512.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.digest.MD5.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
+    <item name='org.bouncycastle.jcajce.provider.digest.SHA512.Digest java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.digest.BCMessageDigest byte[] engineDigest()'>
+    <item name='org.bouncycastle.jcajce.provider.digest.MD5.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.digest.SHA1.BasePBKDF2WithHmacSHA1 javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) 0'>
@@ -32,7 +38,7 @@
     <item name='org.bouncycastle.jcajce.provider.digest.BCMessageDigest BCMessageDigest(org.bouncycastle.crypto.Digest) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.digest.SHA1.BasePBKDF2WithHmacSHA1 javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
+    <item name='org.bouncycastle.jcajce.provider.digest.SHA224.Digest java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.digest.SHA224.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
@@ -41,9 +47,6 @@
     <item name='org.bouncycastle.jcajce.provider.digest.SHA256.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.digest.SHA384.Digest java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.digest.SHA1.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/keystore/bc/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/keystore/bc/annotations.xml
index c6ab1577d8c..66f42254ee7 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/keystore/bc/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/keystore/bc/annotations.xml
@@ -2,15 +2,15 @@
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi java.security.cert.Certificate[] engineGetCertificateChain(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi javax.crypto.Cipher makePBECipher(java.lang.String, int, char[], byte[], int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi javax.crypto.Cipher makePBECipher(java.lang.String, int, char[], byte[], int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi java.security.cert.Certificate engineGetCertificate(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi javax.crypto.Cipher makePBECipher(java.lang.String, int, char[], byte[], int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi boolean engineIsCertificateEntry(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,13 +23,16 @@
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi boolean engineIsKeyEntry(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi boolean engineContainsAlias(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi void engineDeleteEntry(java.lang.String) 0'>
+    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi java.util.Enumeration engineAliases()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi java.util.Enumeration engineAliases()'>
+    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi void engineDeleteEntry(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi java.util.Date engineGetCreationDate(java.lang.String) 0'>
@@ -50,13 +53,22 @@
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi void engineStore(java.io.OutputStream, char[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi void engineSetCertificateEntry(java.lang.String, java.security.cert.Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi void engineSetCertificateEntry(java.lang.String, java.security.cert.Certificate) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi java.security.Key engineGetKey(java.lang.String, char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi.BouncyCastleStore void engineStore(java.io.OutputStream, char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi.BouncyCastleStore void engineStore(java.io.OutputStream, char[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/keystore/pkcs12/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/keystore/pkcs12/annotations.xml
index 80f7c096b3e..a470fc4c9a5 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/keystore/pkcs12/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/keystore/pkcs12/annotations.xml
@@ -5,15 +5,24 @@
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi java.security.Key engineGetKey(java.lang.String, char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi java.util.Enumeration engineAliases()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi boolean engineContainsAlias(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi boolean engineIsKeyEntry(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineSetKeyEntry(java.lang.String, byte[], java.security.cert.Certificate[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineSetCertificateEntry(java.lang.String, java.security.cert.Certificate) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineStore(java.security.KeyStore.LoadStoreParameter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi java.util.Enumeration engineAliases()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi java.util.Date engineGetCreationDate(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -23,16 +32,25 @@
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi java.security.PrivateKey unwrapKey(org.bouncycastle.asn1.x509.AlgorithmIdentifier, byte[], char[], boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi boolean engineIsCertificateEntry(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineDeleteEntry(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi byte[] wrapKey(java.lang.String, java.security.Key, org.bouncycastle.asn1.pkcs.PKCS12PBEParams, char[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 0'>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineStore(java.io.OutputStream, char[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineStore(java.io.OutputStream, char[]) 1'>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineStore(java.io.OutputStream, char[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi byte[] wrapKey(java.lang.String, java.security.Key, org.bouncycastle.asn1.pkcs.PKCS12PBEParams, char[]) 0'>
@@ -44,6 +62,9 @@
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi byte[] cryptData(boolean, org.bouncycastle.asn1.x509.AlgorithmIdentifier, char[], boolean, byte[]) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.keystore.pkcs12.PKCS12KeyStoreSpi java.security.cert.Certificate engineGetCertificate(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/symmetric/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/symmetric/annotations.xml
index 46d73ca02f5..863deea6830 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/symmetric/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/symmetric/annotations.xml
@@ -2,39 +2,51 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.DESPBEKeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.AES.AlgParams java.lang.String engineToString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyGenerator javax.crypto.SecretKey engineGenerateKey()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.AlgParams void engineInit(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.DES.DESPBEKeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.DESPBEKeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyGenerator javax.crypto.SecretKey engineGenerateKey()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.Blowfish.AlgParams java.lang.String engineToString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.AlgParams void engineInit(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.AES.AlgParams java.lang.String engineToString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.AlgParams void engineInit(byte[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.AlgParams java.security.spec.AlgorithmParameterSpec localEngineGetParameterSpec(java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -44,7 +56,7 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.Twofish.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.AlgParamGen java.security.AlgorithmParameters engineGenerateParameters()'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.AlgParams byte[] engineGetEncoded(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.AlgParams void engineInit(java.security.spec.AlgorithmParameterSpec) 0'>
@@ -59,7 +71,10 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.KeyGenerator javax.crypto.SecretKey engineGenerateKey()'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.AlgParamGen void engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyGenerator javax.crypto.SecretKey engineGenerateKey()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
@@ -68,25 +83,19 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.RC2.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.Blowfish.AlgParams java.lang.String engineToString()'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DES.AlgParamGen java.security.AlgorithmParameters engineGenerateParameters()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.AlgParams java.security.spec.AlgorithmParameterSpec localEngineGetParameterSpec(java.lang.Class)'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.AlgParams void engineInit(byte[], java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.Mappings void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12.AlgParams java.lang.String engineToString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.DESede.KeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/symmetric/util/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/symmetric/util/annotations.xml
index cb8059bf4e0..56e2d247107 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/symmetric/util/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/symmetric/util/annotations.xml
@@ -8,21 +8,36 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher byte[] engineWrap(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory javax.crypto.SecretKey engineTranslateKey(javax.crypto.SecretKey)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.PBE.Util org.bouncycastle.crypto.CipherParameters makePBEMacParameters(org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey, java.security.spec.AlgorithmParameterSpec) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters java.security.spec.AlgorithmParameterSpec localEngineGetParameterSpec(java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher byte[] engineDoFinal(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher int engineUpdate(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher byte[] engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher int engineDoFinal(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator void engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher byte[] engineUpdate(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory javax.crypto.SecretKey engineTranslateKey(javax.crypto.SecretKey)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher int engineDoFinal(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher int engineUpdate(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher void engineSetMode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,9 +47,24 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.PBE.Util org.bouncycastle.crypto.CipherParameters makePBEMacParameters(javax.crypto.spec.PBEKeySpec, int, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher void engineSetPadding(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher int engineGetKeySize(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher int engineUpdate(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher byte[] engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher BaseBlockCipher(org.bouncycastle.crypto.BufferedBlockCipher, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -47,9 +77,21 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters void engineInit(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters java.security.spec.AlgorithmParameterSpec localEngineGetParameterSpec(java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher int engineUpdate(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters byte[] engineGetEncoded(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -59,28 +101,34 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters java.lang.String engineToString()'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters java.security.spec.AlgorithmParameterSpec localEngineGetParameterSpec(java.lang.Class)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher void engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory javax.crypto.SecretKey engineTranslateKey(javax.crypto.SecretKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher void engineSetPadding(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher byte[] engineUpdate(byte[], int, int)'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory javax.crypto.SecretKey engineTranslateKey(javax.crypto.SecretKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher byte[] engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher int engineUpdate(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher byte[] engineDoFinal(byte[], int, int)'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider org.bouncycastle.crypto.BlockCipher get()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) 0'>
@@ -92,12 +140,21 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters void engineInit(byte[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator javax.crypto.SecretKey engineGenerateKey()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseMac void engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher int engineUpdate(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher byte[] engineDoFinal(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -107,18 +164,18 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher void engineSetPadding(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher BaseBlockCipher(org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.PBE.Util org.bouncycastle.crypto.CipherParameters makePBEMacParameters(org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey, java.security.spec.AlgorithmParameterSpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher BaseStreamCipher(org.bouncycastle.crypto.BlockCipher, int) 0'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher BaseBlockCipher(org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey char[] getPassword()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher BaseStreamCipher(org.bouncycastle.crypto.BlockCipher, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -128,16 +185,16 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher void engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher BaseBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher BaseBlockCipher(org.bouncycastle.crypto.BlockCipher) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseMac byte[] engineDoFinal()'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters void engineInit(byte[], java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
@@ -146,16 +203,31 @@
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec)'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher void engineSetMode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseMac void engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher int engineDoFinal(byte[], int, int, byte[], int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters void engineInit(java.security.spec.AlgorithmParameterSpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters java.lang.String engineToString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher void engineSetMode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator javax.crypto.SecretKey engineGenerateKey()'>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseMac byte[] engineDoFinal()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jcajce/provider/util/annotations.xml b/android-sdk-annotations/org/bouncycastle/jcajce/provider/util/annotations.xml
index 8b5f29a0b57..00f000b8fda 100644
--- a/android-sdk-annotations/org/bouncycastle/jcajce/provider/util/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jcajce/provider/util/annotations.xml
@@ -1,10 +1,25 @@
 <root>
+    <item name='org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter java.security.PublicKey generatePublic(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider void registerOid(org.bouncycastle.jcajce.provider.config.ConfigurableProvider, org.bouncycastle.asn1.ASN1ObjectIdentifier, java.lang.String, org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider void addSignatureAlgorithm(org.bouncycastle.jcajce.provider.config.ConfigurableProvider, java.lang.String, java.lang.String, java.lang.String, org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.util.AlgorithmProvider void configure(org.bouncycastle.jcajce.provider.config.ConfigurableProvider) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter java.security.PrivateKey generatePrivate(org.bouncycastle.asn1.pkcs.PrivateKeyInfo)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider void registerOidAlgorithmParameters(org.bouncycastle.jcajce.provider.config.ConfigurableProvider, org.bouncycastle.asn1.ASN1ObjectIdentifier, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/jce/annotations.xml b/android-sdk-annotations/org/bouncycastle/jce/annotations.xml
index eaf7da5e6bf..c283e8fb551 100644
--- a/android-sdk-annotations/org/bouncycastle/jce/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jce/annotations.xml
@@ -17,6 +17,9 @@
     <item name='org.bouncycastle.jce.PKCS10CertificationRequest PKCS10CertificationRequest(java.lang.String, javax.security.auth.x500.X500Principal, java.security.PublicKey, org.bouncycastle.asn1.ASN1Set, java.security.PrivateKey, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jce.PrincipalUtil org.bouncycastle.jce.X509Principal getSubjectX509Principal(java.security.cert.X509Certificate)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jce.PKCS10CertificationRequest PKCS10CertificationRequest(java.lang.String, javax.security.auth.x500.X500Principal, java.security.PublicKey, org.bouncycastle.asn1.ASN1Set, java.security.PrivateKey) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,9 +35,6 @@
     <item name='org.bouncycastle.jce.PKCS10CertificationRequest PKCS10CertificationRequest(java.lang.String, org.bouncycastle.asn1.x509.X509Name, java.security.PublicKey, org.bouncycastle.asn1.ASN1Set, java.security.PrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.PrincipalUtil org.bouncycastle.jce.X509Principal getSubjectX509Principal(java.security.cert.X509Certificate)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.PrincipalUtil org.bouncycastle.jce.X509Principal getSubjectX509Principal(java.security.cert.X509Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -47,7 +47,7 @@
     <item name='org.bouncycastle.jce.PKCS10CertificationRequest PKCS10CertificationRequest(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.PrincipalUtil org.bouncycastle.jce.X509Principal getIssuerX509Principal(java.security.cert.X509CRL)'>
+    <item name='org.bouncycastle.jce.PrincipalUtil org.bouncycastle.jce.X509Principal getIssuerX509Principal(java.security.cert.X509Certificate)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.PKCS10CertificationRequest PKCS10CertificationRequest(java.lang.String, org.bouncycastle.asn1.x509.X509Name, java.security.PublicKey, org.bouncycastle.asn1.ASN1Set, java.security.PrivateKey, java.lang.String) 0'>
@@ -59,7 +59,7 @@
     <item name='org.bouncycastle.jce.PKCS10CertificationRequest PKCS10CertificationRequest(java.lang.String, javax.security.auth.x500.X500Principal, java.security.PublicKey, org.bouncycastle.asn1.ASN1Set, java.security.PrivateKey, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.PrincipalUtil org.bouncycastle.jce.X509Principal getIssuerX509Principal(java.security.cert.X509Certificate)'>
+    <item name='org.bouncycastle.jce.PrincipalUtil org.bouncycastle.jce.X509Principal getIssuerX509Principal(java.security.cert.X509CRL)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.X509Principal X509Principal(java.util.Vector, java.util.Vector) 1'>
diff --git a/android-sdk-annotations/org/bouncycastle/jce/interfaces/annotations.xml b/android-sdk-annotations/org/bouncycastle/jce/interfaces/annotations.xml
new file mode 100644
index 00000000000..511a4f5a7ed
--- /dev/null
+++ b/android-sdk-annotations/org/bouncycastle/jce/interfaces/annotations.xml
@@ -0,0 +1,14 @@
+<root>
+    <item name='org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier java.util.Enumeration getBagAttributeKeys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/android-sdk-annotations/org/bouncycastle/jce/netscape/annotations.xml b/android-sdk-annotations/org/bouncycastle/jce/netscape/annotations.xml
index 0497543cb93..18567275000 100644
--- a/android-sdk-annotations/org/bouncycastle/jce/netscape/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jce/netscape/annotations.xml
@@ -2,6 +2,9 @@
     <item name='org.bouncycastle.jce.netscape.NetscapeCertRequest NetscapeCertRequest(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jce.netscape.NetscapeCertRequest org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jce.netscape.NetscapeCertRequest NetscapeCertRequest(java.lang.String, org.bouncycastle.asn1.x509.AlgorithmIdentifier, java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,7 +14,4 @@
     <item name='org.bouncycastle.jce.netscape.NetscapeCertRequest NetscapeCertRequest(org.bouncycastle.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.netscape.NetscapeCertRequest org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/jce/provider/annotations.xml b/android-sdk-annotations/org/bouncycastle/jce/provider/annotations.xml
index 999c434d945..a1bfb8fa366 100644
--- a/android-sdk-annotations/org/bouncycastle/jce/provider/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/jce/provider/annotations.xml
@@ -1,38 +1,32 @@
 <root>
+    <item name='org.bouncycastle.jce.provider.JCERSAPublicKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getCompleteCRLs(org.bouncycastle.asn1.x509.DistributionPoint, java.lang.Object, java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertI1(java.security.cert.CertPath, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities boolean isSelfIssued(java.security.cert.X509Certificate) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.X509CertificateObject javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertN(java.security.cert.CertPath, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCertA(java.security.cert.CertPath, org.bouncycastle.x509.ExtendedPKIXParameters, int, java.security.PublicKey, boolean, javax.security.auth.x500.X500Principal, java.security.cert.X509Certificate) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.PKIXPolicyNode prepareCertB(java.security.cert.CertPath, int, java.util.List[], org.bouncycastle.jce.provider.PKIXPolicyNode, int) 0'>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher int engineUpdate(byte[], int, int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCRLB1(org.bouncycastle.asn1.x509.DistributionPoint, java.lang.Object, java.security.cert.X509CRL) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertStoreCollectionSpi CertStoreCollectionSpi(java.security.cert.CertStoreParameters) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities org.bouncycastle.jce.provider.PKIXPolicyNode removePolicyNode(org.bouncycastle.jce.provider.PKIXPolicyNode, java.util.List[], org.bouncycastle.jce.provider.PKIXPolicyNode) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.X509CRLObject java.security.Principal getIssuerDN()'>
+    <item name='org.bouncycastle.jce.provider.PKIXPolicyNode java.lang.String toString(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi java.security.cert.CertPathValidatorResult engineValidate(java.security.cert.CertPath, java.security.cert.CertPathParameters)'>
+    <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertH1(java.security.cert.CertPath, int, int) 0'>
@@ -41,199 +35,130 @@
     <item name='org.bouncycastle.jce.provider.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePublicKeyParameter(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Date getValidCertDateFromValidityModel(org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.CertPath, int) 0'>
+    <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getCompleteCRLs(org.bouncycastle.asn1.x509.DistributionPoint, java.lang.Object, java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.X509CertificateObject void verify(java.security.PublicKey, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator java.util.Set unionDNS(java.util.Set, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey java.lang.String getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEDHPrivateKey java.lang.String getAlgorithm()'>
+    <item name='org.bouncycastle.jce.provider.X509CertificateObject javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JCEStreamCipher int engineGetKeySize(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertStoreCollectionSpi java.util.Collection engineGetCertificates(java.security.cert.CertSelector)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.security.PublicKey processCRLG(java.security.cert.X509CRL, java.util.Set) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set processCRLF(java.security.cert.X509CRL, java.lang.Object, java.security.cert.X509Certificate, java.security.PublicKey, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.List) 4'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.lang.String, org.bouncycastle.jce.provider.JCEECPublicKey) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set processCRLA1i(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.security.cert.X509CRL) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.X509CRLEntryObject java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set processCRLF(java.security.cert.X509CRL, java.lang.Object, java.security.cert.X509Certificate, java.security.PublicKey, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.List)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertJ(java.security.cert.CertPath, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Collection findIssuerCerts(java.security.cert.X509Certificate, org.bouncycastle.x509.ExtendedPKIXBuilderParameters)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCertA(java.security.cert.CertPath, org.bouncycastle.x509.ExtendedPKIXParameters, int, java.security.PublicKey, boolean, javax.security.auth.x500.X500Principal, java.security.cert.X509Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertA(java.security.cert.CertPath, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePublicKeyParameter(java.security.PublicKey)'>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher byte[] engineWrap(java.security.Key)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JCEStreamCipher void engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set[] processCRLA1ii(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.security.cert.X509CRL)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JDKDSAPublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities org.bouncycastle.asn1.ASN1Primitive getExtensionValue(java.security.cert.X509Extension, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int wrapupCertB(java.security.cert.CertPath, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Collection findCertificates(org.bouncycastle.x509.X509CertStoreSelector, java.util.List) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int wrapupCertB(java.security.cert.CertPath, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Collection findIssuerCerts(java.security.cert.X509Certificate, org.bouncycastle.x509.ExtendedPKIXBuilderParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.lang.String, org.bouncycastle.crypto.params.ECPublicKeyParameters) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertL(java.security.cert.CertPath, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertK(java.security.cert.CertPath, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JDKDSAPublicKey java.lang.String getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void prepareNextCertB1(int, java.util.List[], java.lang.String, java.util.Map, java.security.cert.X509Certificate) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.security.cert.X509CRL processCRLH(java.util.Set, java.security.PublicKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JDKDSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
+    <item name='org.bouncycastle.jce.provider.CertStoreCollectionSpi java.util.Collection engineGetCertificates(java.security.cert.CertSelector)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JDKDSAPublicKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey) 0'>
+    <item name='org.bouncycastle.jce.provider.JDKDSAPublicKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertL(java.security.cert.CertPath, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void prepareNextCertB1(int, java.util.List[], java.lang.String, java.util.Map, java.security.cert.X509Certificate) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JDKDSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JCEECPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPublicKey java.security.spec.ECPoint getW()'>
+    <item name='org.bouncycastle.jce.provider.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getCompleteCRLs(org.bouncycastle.asn1.x509.DistributionPoint, java.lang.Object, java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getQualifierSet(org.bouncycastle.asn1.ASN1Sequence)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.PKIXPolicyNode processCertD(java.security.cert.CertPath, int, java.util.Set, org.bouncycastle.jce.provider.PKIXPolicyNode, java.util.List[], int) 0'>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertH2(java.security.cert.CertPath, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCRLB1(org.bouncycastle.asn1.x509.DistributionPoint, java.lang.Object, java.security.cert.X509CRL) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertH2(java.security.cert.CertPath, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.ReasonsMask processCRLD(java.security.cert.X509CRL, org.bouncycastle.asn1.x509.DistributionPoint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCERSAPublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.PKIXPolicyNode wrapupCertG(java.security.cert.CertPath, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.Set, int, java.util.List[], org.bouncycastle.jce.provider.PKIXPolicyNode, java.util.Set) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCRLB2(org.bouncycastle.asn1.x509.DistributionPoint, java.lang.Object, java.security.cert.X509CRL) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCERSAPrivateCrtKey java.lang.String getFormat()'>
+    <item name='org.bouncycastle.jce.provider.JCEDHPublicKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JCEStreamCipher void engineSetPadding(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void processCertD1ii(int, java.util.List[], org.bouncycastle.asn1.DERObjectIdentifier, java.util.Set) 1'>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.PKIXPolicyNode wrapupCertG(java.security.cert.CertPath, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.Set, int, java.util.List[], org.bouncycastle.jce.provider.PKIXPolicyNode, java.util.Set) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.X509CRLObject byte[] getExtensionValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.ReasonsMask processCRLD(java.security.cert.X509CRL, org.bouncycastle.asn1.x509.DistributionPoint)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void wrapupCertF(java.security.cert.CertPath, int, java.util.List, java.util.Set) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCEStreamCipher byte[] engineUpdate(byte[], int, int)'>
+    <item name='org.bouncycastle.jce.provider.X509CertificateObject byte[] getExtensionValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set processCRLA1i(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.security.cert.X509CRL)'>
+    <item name='org.bouncycastle.jce.provider.BouncyCastleProvider void setParameter(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.PKIXCRLUtil java.util.Set findCRLs(org.bouncycastle.x509.X509CRLStoreSelector, java.security.cert.PKIXParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCEStreamCipher JCEStreamCipher(org.bouncycastle.crypto.BlockCipher, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set processCRLF(java.security.cert.X509CRL, java.lang.Object, java.security.cert.X509Certificate, java.security.PublicKey, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.List) 0'>
+    <item name='org.bouncycastle.jce.provider.X509CRLEntryObject java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertO(java.security.cert.CertPath, int, java.util.Set, java.util.List) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.X509CertificateObject javax.security.auth.x500.X500Principal getSubjectX500Principal()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertM(java.security.cert.CertPath, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getDeltaCRLs(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509CRL) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.JCEStreamCipher void engineSetMode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void verifyX509Certificate(java.security.cert.X509Certificate, java.security.PublicKey, java.lang.String) 0'>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher byte[] engineUpdate(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int wrapupCertA(int, java.security.cert.X509Certificate) 1'>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void verifyX509Certificate(java.security.cert.X509Certificate, java.security.PublicKey, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JCEECPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
@@ -242,27 +167,15 @@
     <item name='org.bouncycastle.jce.provider.JDKDSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set[] processCRLA1ii(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.security.cert.X509CRL) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, org.bouncycastle.jce.provider.JCEECPrivateKey) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void addAdditionalStoreFromLocation(java.lang.String, org.bouncycastle.x509.ExtendedPKIXParameters) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey java.lang.String getFormat()'>
+    <item name='org.bouncycastle.jce.provider.X509CRLObject java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.ReasonsMask processCRLD(java.security.cert.X509CRL, org.bouncycastle.asn1.x509.DistributionPoint) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.PKIXCRLUtil java.util.Set findCRLs(org.bouncycastle.x509.X509CRLStoreSelector, java.security.cert.PKIXParameters)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEDHPublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -272,73 +185,52 @@
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities javax.security.auth.x500.X500Principal getSubjectPrincipal(java.security.cert.X509Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getDeltaCRLs(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509CRL) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.PKIXCRLUtil java.util.Set findCRLs(org.bouncycastle.x509.X509CRLStoreSelector, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.Date) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.lang.String, java.security.spec.ECPublicKeySpec) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities boolean processCertD1i(int, java.util.List[], org.bouncycastle.asn1.DERObjectIdentifier, java.util.Set) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.security.interfaces.ECPrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator void checkExcluded(org.bouncycastle.asn1.x509.GeneralName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertBlacklist boolean isPublicKeyBlackListed(java.security.PublicKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void getCRLIssuersFromDistributionPoint(org.bouncycastle.asn1.x509.DistributionPoint, java.util.Collection, java.security.cert.X509CRLSelector, org.bouncycastle.x509.ExtendedPKIXParameters) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.X509CRLObject java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.PKIXPolicyNode org.bouncycastle.jce.provider.PKIXPolicyNode copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCERSAPublicKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPublicKey java.security.spec.ECPoint getW()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jce.provider.JCEStreamCipher void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCEStreamCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.X509CertificateObject void checkValidity(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.X509CRLObject X509CRLObject(org.bouncycastle.asn1.x509.CertificateList) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.X509CertificateObject java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void getCertStatus(java.util.Date, java.security.cert.X509CRL, java.lang.Object, org.bouncycastle.jce.provider.CertStatus) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.BouncyCastleProvider void setParameter(java.lang.String, java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.security.cert.TrustAnchor findTrustAnchor(java.security.cert.X509Certificate, java.util.Set, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertO(java.security.cert.CertPath, int, java.util.Set, java.util.List) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void checkCRLs(org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.util.Date, java.security.cert.X509Certificate, java.security.PublicKey, java.util.List) 1'>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Collection findIssuerCerts(java.security.cert.X509Certificate, org.bouncycastle.x509.ExtendedPKIXBuilderParameters)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.BouncyCastleProvider java.security.PublicKey getPublicKey(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.X509CRLObject javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void checkCRLs(org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.util.Date, java.security.cert.X509Certificate, java.security.PublicKey, java.util.List) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.security.cert.TrustAnchor findTrustAnchor(java.security.cert.X509Certificate, java.util.Set, java.lang.String) 1'>
@@ -347,64 +239,28 @@
     <item name='org.bouncycastle.jce.provider.X509CRLEntryObject byte[] getExtensionValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.security.interfaces.ECPublicKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi java.security.cert.CertPathValidatorResult engineValidate(java.security.cert.CertPath, java.security.cert.CertPathParameters) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getCompleteCRLs(org.bouncycastle.asn1.x509.DistributionPoint, java.lang.Object, java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCertBC(java.security.cert.CertPath, int, org.bouncycastle.jce.provider.PKIXNameConstraintValidator) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCRLI(java.util.Date, java.security.cert.X509CRL, java.lang.Object, org.bouncycastle.jce.provider.CertStatus, org.bouncycastle.x509.ExtendedPKIXParameters) 4'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertI2(java.security.cert.CertPath, int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, org.bouncycastle.crypto.params.ECPrivateKeyParameters) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set[] processCRLA1ii(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.security.cert.X509CRL) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JDKDSAPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
+    <item name='org.bouncycastle.jce.provider.X509CRLObject java.security.Principal getIssuerDN()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JDKDSAPrivateKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCERSAPublicKey java.lang.String getAlgorithm()'>
+    <item name='org.bouncycastle.jce.provider.JCERSAPublicKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set[] processCRLA1ii(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.security.cert.X509CRL) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JDKDSAPrivateKey java.lang.String getAlgorithm()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCEStreamCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEDHPrivateKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEDHPublicKey java.lang.String getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getCompleteCRLs(org.bouncycastle.asn1.x509.DistributionPoint, java.lang.Object, java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator void intersectPermittedSubtree(org.bouncycastle.asn1.x509.GeneralSubtree[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator void addExcludedSubtree(org.bouncycastle.asn1.x509.GeneralSubtree) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void wrapupCertF(java.security.cert.CertPath, int, java.util.List, java.util.Set) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.PKIXPolicyNode java.lang.Object clone()'>
+    <item name='org.bouncycastle.jce.provider.X509CertificateObject javax.security.auth.x500.X500Principal getSubjectX500Principal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void getCertStatus(java.util.Date, java.security.cert.X509CRL, java.lang.Object, org.bouncycastle.jce.provider.CertStatus) 2'>
@@ -416,25 +272,22 @@
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities javax.security.auth.x500.X500Principal getEncodedIssuerPrincipal(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.ReasonsMask processCRLD(java.security.cert.X509CRL, org.bouncycastle.asn1.x509.DistributionPoint)'>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set processCRLA1i(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.security.cert.X509CRL)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.PKIXCRLUtil java.util.Set findCRLs(org.bouncycastle.x509.X509CRLStoreSelector, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.Date)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, java.security.spec.ECPrivateKeySpec) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.security.PublicKey getNextWorkingKey(java.util.List, int) 0'>
+    <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator java.util.Set unionDNS(java.util.Set, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void addAdditionalStoresFromAltNames(java.security.cert.X509Certificate, org.bouncycastle.x509.ExtendedPKIXParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator java.util.Set unionDNS(java.util.Set, java.lang.String) 0'>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.security.PublicKey getNextWorkingKey(java.util.List, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Date getValidDate(java.security.cert.PKIXParameters) 0'>
+    <item name='org.bouncycastle.jce.provider.PKIXCRLUtil java.util.Set findCRLs(org.bouncycastle.x509.X509CRLStoreSelector, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.Date)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPublicKey java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, org.bouncycastle.crypto.params.ECPrivateKeyParameters, org.bouncycastle.jce.provider.JCEECPublicKey, org.bouncycastle.jce.spec.ECParameterSpec) 1'>
@@ -443,16 +296,10 @@
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertH3(java.security.cert.CertPath, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCEStreamCipher byte[] engineWrap(java.security.Key)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.lang.String, org.bouncycastle.crypto.params.ECPublicKeyParameters, org.bouncycastle.jce.spec.ECParameterSpec) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertG(java.security.cert.CertPath, int, org.bouncycastle.jce.provider.PKIXNameConstraintValidator) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.PKIXPolicyNode java.lang.String toString(java.lang.String)'>
+    <item name='org.bouncycastle.jce.provider.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePrivateKeyParameter(java.security.PrivateKey)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities javax.security.auth.x500.X500Principal getIssuerPrincipal(java.security.cert.X509CRL) 0'>
@@ -461,25 +308,16 @@
     <item name='org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi java.security.cert.CertPathBuilderResult build(java.security.cert.X509Certificate, org.bouncycastle.x509.ExtendedPKIXBuilderParameters, java.util.List) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCERSAPublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Date getValidDate(java.security.cert.PKIXParameters)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities org.bouncycastle.asn1.x509.AlgorithmIdentifier getAlgorithmIdentifier(java.security.PublicKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator void checkPermitted(org.bouncycastle.asn1.x509.GeneralName) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi java.security.cert.CertPathBuilderResult engineBuild(java.security.cert.CertPathParameters) 0'>
+    <item name='org.bouncycastle.jce.provider.JCERSAPrivateCrtKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.BouncyCastleProvider java.security.PrivateKey getPrivateKey(org.bouncycastle.asn1.pkcs.PrivateKeyInfo) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.PKIXPolicyNode java.lang.String toString()'>
+    <item name='org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi java.security.cert.CertPathBuilderResult engineBuild(java.security.cert.CertPathParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCRLJ(java.util.Date, java.security.cert.X509CRL, java.lang.Object, org.bouncycastle.jce.provider.CertStatus) 3'>
@@ -491,73 +329,28 @@
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.security.PublicKey processCRLG(java.security.cert.X509CRL, java.util.Set) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.security.cert.TrustAnchor findTrustAnchor(java.security.cert.X509Certificate, java.util.Set) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Collection findIssuerCerts(java.security.cert.X509Certificate, org.bouncycastle.x509.ExtendedPKIXBuilderParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.PKIXPolicyNode void addChild(org.bouncycastle.jce.provider.PKIXPolicyNode) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, org.bouncycastle.jce.spec.ECPrivateKeySpec) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JDKDSAPrivateKey java.util.Enumeration getBagAttributeKeys()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, org.bouncycastle.crypto.params.ECPrivateKeyParameters, org.bouncycastle.jce.provider.JCEECPublicKey, java.security.spec.ECParameterSpec) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.lang.String, org.bouncycastle.jce.spec.ECPublicKeySpec) 1'>
+    <item name='org.bouncycastle.jce.provider.JCEDHPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JCEStreamCipher void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertStoreCollectionSpi java.util.Collection engineGetCRLs(java.security.cert.CRLSelector)'>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher int engineUpdate(byte[], int, int, byte[], int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getDeltaCRLs(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509CRL)'>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher byte[] engineUpdate(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertO(java.security.cert.CertPath, int, java.util.Set, java.util.List) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void wrapupCertF(java.security.cert.CertPath, int, java.util.List, java.util.Set) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Collection findCertificates(org.bouncycastle.x509.X509CertStoreSelector, java.util.List)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.X509CertificateObject java.security.Principal getSubjectDN()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.PKIXPolicyNode processCertE(java.security.cert.CertPath, int, org.bouncycastle.jce.provider.PKIXPolicyNode) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey java.util.Enumeration getBagAttributeKeys()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEStreamCipher byte[] engineDoFinal(byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey java.util.Enumeration getBagAttributeKeys()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCEECPublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.security.cert.TrustAnchor findTrustAnchor(java.security.cert.X509Certificate, java.util.Set) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.jce.provider.JCERSAPrivateCrtKey java.lang.String toString()'>
+    <item name='org.bouncycastle.jce.provider.X509CertificateObject java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
@@ -566,6 +359,261 @@
     <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.lang.String, org.bouncycastle.crypto.params.ECPublicKeyParameters, java.security.spec.ECParameterSpec) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities boolean isSelfIssued(java.security.cert.X509Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.PKIXPolicyNode prepareCertB(java.security.cert.CertPath, int, java.util.List[], org.bouncycastle.jce.provider.PKIXPolicyNode, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertStoreCollectionSpi CertStoreCollectionSpi(java.security.cert.CertStoreParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Date getValidCertDateFromValidityModel(org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.CertPath, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEDHPrivateKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.security.PublicKey processCRLG(java.security.cert.X509CRL, java.util.Set) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set processCRLF(java.security.cert.X509CRL, java.lang.Object, java.security.cert.X509Certificate, java.security.PublicKey, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.List) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Date getValidDate(java.security.cert.PKIXParameters)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertA(java.security.cert.CertPath, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.lang.String, org.bouncycastle.crypto.params.ECPublicKeyParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertK(java.security.cert.CertPath, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEDHPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.security.cert.X509CRL processCRLH(java.util.Set, java.security.PublicKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities org.bouncycastle.jce.provider.PKIXPolicyNode processCertD(java.security.cert.CertPath, int, java.util.Set, org.bouncycastle.jce.provider.PKIXPolicyNode, java.util.List[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JDKDSAPublicKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCRLB2(org.bouncycastle.asn1.x509.DistributionPoint, java.lang.Object, java.security.cert.X509CRL) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void processCertD1ii(int, java.util.List[], org.bouncycastle.asn1.DERObjectIdentifier, java.util.Set) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set processCRLF(java.security.cert.X509CRL, java.lang.Object, java.security.cert.X509Certificate, java.security.PublicKey, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.List)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher JCEStreamCipher(org.bouncycastle.crypto.BlockCipher, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEDHPublicKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set processCRLF(java.security.cert.X509CRL, java.lang.Object, java.security.cert.X509Certificate, java.security.PublicKey, org.bouncycastle.x509.ExtendedPKIXParameters, java.util.List) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.X509CertificateObject void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getDeltaCRLs(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509CRL) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEDHPrivateKey void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int wrapupCertA(int, java.security.cert.X509Certificate) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set[] processCRLA1ii(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.security.cert.X509CRL) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void addAdditionalStoreFromLocation(java.lang.String, org.bouncycastle.x509.ExtendedPKIXParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getDeltaCRLs(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509CRL) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.X509CertificateObject java.security.Principal getSubjectDN()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPublicKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.lang.String, java.security.spec.ECPublicKeySpec) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities boolean processCertD1i(int, java.util.List[], org.bouncycastle.asn1.DERObjectIdentifier, java.util.Set) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.X509CertificateObject void setBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier, org.bouncycastle.asn1.ASN1Encodable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertBlacklist boolean isPublicKeyBlackListed(java.security.PublicKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities void getCRLIssuersFromDistributionPoint(org.bouncycastle.asn1.x509.DistributionPoint, java.util.Collection, java.security.cert.X509CRLSelector, org.bouncycastle.x509.ExtendedPKIXParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.X509CRLObject X509CRLObject(org.bouncycastle.asn1.x509.CertificateList) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi java.security.cert.CertPathValidatorResult engineValidate(java.security.cert.CertPath, java.security.cert.CertPathParameters)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.BouncyCastleProvider void setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.X509CRLObject void verify(java.security.PublicKey, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities java.util.Set[] processCRLA1ii(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509Certificate, java.security.cert.X509CRL)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher byte[] engineDoFinal(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.security.interfaces.ECPublicKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi java.security.cert.CertPathValidatorResult engineValidate(java.security.cert.CertPath, java.security.cert.CertPathParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCRLI(java.util.Date, java.security.cert.X509CRL, java.lang.Object, org.bouncycastle.jce.provider.CertStatus, org.bouncycastle.x509.ExtendedPKIXParameters) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void processCertBC(java.security.cert.CertPath, int, org.bouncycastle.jce.provider.PKIXNameConstraintValidator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, org.bouncycastle.crypto.params.ECPrivateKeyParameters) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Collection findCertificates(org.bouncycastle.x509.X509CertStoreSelector, java.util.List)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities int prepareNextCertI2(java.security.cert.CertPath, int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JDKDSAPrivateKey org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JDKDSAPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.PKIXPolicyNode java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator void addExcludedSubtree(org.bouncycastle.asn1.x509.GeneralSubtree) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void wrapupCertF(java.security.cert.CertPath, int, java.util.List, java.util.Set) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertStoreCollectionSpi java.util.Collection engineGetCRLs(java.security.cert.CRLSelector)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCERSAPrivateCrtKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, java.security.spec.ECPrivateKeySpec) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getDeltaCRLs(java.util.Date, org.bouncycastle.x509.ExtendedPKIXParameters, java.security.cert.X509CRL)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.PKIXNameConstraintValidator java.util.Set unionDNS(java.util.Set, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.DHUtil org.bouncycastle.crypto.params.AsymmetricKeyParameter generatePublicKeyParameter(java.security.PublicKey)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Date getValidDate(java.security.cert.PKIXParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void prepareNextCertG(java.security.cert.CertPath, int, org.bouncycastle.jce.provider.PKIXNameConstraintValidator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities org.bouncycastle.asn1.x509.AlgorithmIdentifier getAlgorithmIdentifier(java.security.PublicKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEDHPrivateKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.PKIXCRLUtil java.util.Set findCRLs(org.bouncycastle.x509.X509CRLStoreSelector, java.security.cert.PKIXParameters)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.security.cert.TrustAnchor findTrustAnchor(java.security.cert.X509Certificate, java.util.Set) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, org.bouncycastle.jce.spec.ECPrivateKeySpec) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.PKIXPolicyNode void addChild(org.bouncycastle.jce.provider.PKIXPolicyNode) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.util.Set getQualifierSet(org.bouncycastle.asn1.ASN1Sequence)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPublicKey JCEECPublicKey(java.lang.String, org.bouncycastle.jce.spec.ECPublicKeySpec) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEECPrivateKey JCEECPrivateKey(java.lang.String, org.bouncycastle.crypto.params.ECPrivateKeyParameters, org.bouncycastle.jce.provider.JCEECPublicKey, java.security.spec.ECParameterSpec) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.X509CRLObject javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.X509CertificateObject org.bouncycastle.asn1.ASN1Encodable getBagAttribute(org.bouncycastle.asn1.ASN1ObjectIdentifier) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.RFC3280CertPathUtilities void wrapupCertF(java.security.cert.CertPath, int, java.util.List, java.util.Set) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.X509CRLObject java.security.cert.X509CRLEntry getRevokedCertificate(java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.CertPathValidatorUtilities java.security.cert.TrustAnchor findTrustAnchor(java.security.cert.X509Certificate, java.util.Set) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCEStreamCipher int engineDoFinal(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.JCERSAPrivateKey java.util.Enumeration getBagAttributeKeys()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.jce.provider.PKIXPolicyNode java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi java.security.cert.CertPathValidatorResult engineValidate(java.security.cert.CertPath, java.security.cert.CertPathParameters) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/math/ec/annotations.xml b/android-sdk-annotations/org/bouncycastle/math/ec/annotations.xml
index 84e556e013a..83df209bc3f 100644
--- a/android-sdk-annotations/org/bouncycastle/math/ec/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/math/ec/annotations.xml
@@ -1,47 +1,26 @@
 <root>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement multiply(org.bouncycastle.math.ec.ECFieldElement)'>
+    <item name='org.bouncycastle.math.ec.ECCurve org.bouncycastle.math.ec.ECFieldElement fromBigInteger(java.math.BigInteger)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint shamirsTrick(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 0'>
+    <item name='org.bouncycastle.math.ec.ECCurve org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 2'>
+    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement negate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement divide(org.bouncycastle.math.ec.ECFieldElement) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement invert()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECPoint.F2m org.bouncycastle.math.ec.ECPoint negate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECPoint.Fp org.bouncycastle.math.ec.ECPoint subtract(org.bouncycastle.math.ec.ECPoint) 0'>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECFieldElement.F2m F2m(int, int, java.math.BigInteger) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.math.ec.ECPoint.Fp org.bouncycastle.math.ec.ECPoint subtract(org.bouncycastle.math.ec.ECPoint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, int, int, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, int, int, java.math.BigInteger, java.math.BigInteger) 5'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement negate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m java.lang.String getFieldName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement invert()'>
+    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECFieldElement fromBigInteger(java.math.BigInteger)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint shamirsTrick(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 3'>
@@ -50,28 +29,19 @@
     <item name='org.bouncycastle.math.ec.ECPoint org.bouncycastle.math.ec.ECPoint multiply(java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECPoint.Fp org.bouncycastle.math.ec.ECPoint negate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint sumOfTwoMultiplies(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.Fp Fp(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 2'>
+    <item name='org.bouncycastle.math.ec.ECPoint org.bouncycastle.math.ec.ECPoint negate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement invert()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement multiply(org.bouncycastle.math.ec.ECFieldElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement square()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m void checkFieldElements(org.bouncycastle.math.ec.ECFieldElement, org.bouncycastle.math.ec.ECFieldElement) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.Fp Fp(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 1'>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement square()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECFieldElement fromBigInteger(java.math.BigInteger) 0'>
@@ -80,130 +50,82 @@
     <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement divide(org.bouncycastle.math.ec.ECFieldElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECFieldElement fromBigInteger(java.math.BigInteger) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement add(org.bouncycastle.math.ec.ECFieldElement)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, int, int, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger)'>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement invert()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint sumOfTwoMultiplies(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 0'>
+    <item name='org.bouncycastle.math.ec.ECPoint.F2m org.bouncycastle.math.ec.ECPoint negate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint sumOfTwoMultiplies(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, int, int, java.math.BigInteger, java.math.BigInteger) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement divide(org.bouncycastle.math.ec.ECFieldElement)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement multiply(org.bouncycastle.math.ec.ECFieldElement) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement add(org.bouncycastle.math.ec.ECFieldElement) 0'>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement negate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint shamirsTrick(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECPoint.Fp byte[] getEncoded(boolean)'>
+    <item name='org.bouncycastle.math.ec.ECPoint.Fp org.bouncycastle.math.ec.ECPoint negate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECPoint.F2m org.bouncycastle.math.ec.ECPoint add(org.bouncycastle.math.ec.ECPoint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement)'>
+    <item name='org.bouncycastle.math.ec.ECPoint byte[] getEncoded(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, java.math.BigInteger, java.math.BigInteger) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement add(org.bouncycastle.math.ec.ECFieldElement)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m void checkFieldElements(org.bouncycastle.math.ec.ECFieldElement, org.bouncycastle.math.ec.ECFieldElement) 1'>
+    <item name='org.bouncycastle.math.ec.ECCurve org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECFieldElement.Fp Fp(java.math.BigInteger, java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement add(org.bouncycastle.math.ec.ECFieldElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement)'>
+    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECPoint.F2m org.bouncycastle.math.ec.ECPoint.F2m subtractSimple(org.bouncycastle.math.ec.ECPoint.F2m) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECPoint.F2m byte[] getEncoded(boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement multiply(org.bouncycastle.math.ec.ECFieldElement)'>
+    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint shamirsTrick(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint sumOfTwoMultiplies(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m java.math.BigInteger toBigInteger()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECPoint.F2m org.bouncycastle.math.ec.ECPoint subtract(org.bouncycastle.math.ec.ECPoint) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECCurve org.bouncycastle.math.ec.ECPoint decodePoint(byte[]) 0'>
+    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECFieldElement fromBigInteger(java.math.BigInteger)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement add(org.bouncycastle.math.ec.ECFieldElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger)'>
+    <item name='org.bouncycastle.math.ec.ECPoint org.bouncycastle.math.ec.ECPoint add(org.bouncycastle.math.ec.ECPoint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECFieldElement fromBigInteger(java.math.BigInteger)'>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement multiply(org.bouncycastle.math.ec.ECFieldElement)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, java.math.BigInteger, java.math.BigInteger) 2'>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement square()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp java.lang.String getFieldName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement divide(org.bouncycastle.math.ec.ECFieldElement)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement square()'>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.math.ec.ECFieldElement.F2m F2m(int, int, int, int, java.math.BigInteger) 4'>
@@ -215,7 +137,160 @@
     <item name='org.bouncycastle.math.ec.ECFieldElement.Fp Fp(java.math.BigInteger, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECFieldElement fromBigInteger(java.math.BigInteger)'>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement multiply(org.bouncycastle.math.ec.ECFieldElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement invert()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m java.math.BigInteger toBigInteger()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint shamirsTrick(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECPoint.Fp byte[] getEncoded(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement divide(org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement divide(org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement add(org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, int, int, java.math.BigInteger, java.math.BigInteger) 5'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement negate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement divide(org.bouncycastle.math.ec.ECFieldElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECPoint org.bouncycastle.math.ec.ECPoint subtract(org.bouncycastle.math.ec.ECPoint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement add(org.bouncycastle.math.ec.ECFieldElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.Fp Fp(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement java.lang.String getFieldName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement subtract(org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m void checkFieldElements(org.bouncycastle.math.ec.ECFieldElement, org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement add(org.bouncycastle.math.ec.ECFieldElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.Fp Fp(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECFieldElement fromBigInteger(java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp java.lang.String getFieldName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECAlgorithms org.bouncycastle.math.ec.ECPoint sumOfTwoMultiplies(org.bouncycastle.math.ec.ECPoint, java.math.BigInteger, org.bouncycastle.math.ec.ECPoint, java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m java.lang.String getFieldName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement add(org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement multiply(org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement multiply(org.bouncycastle.math.ec.ECFieldElement) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, java.math.BigInteger, java.math.BigInteger) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve org.bouncycastle.math.ec.ECFieldElement fromBigInteger(java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECPoint decompressPoint(int, java.math.BigInteger) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m void checkFieldElements(org.bouncycastle.math.ec.ECFieldElement, org.bouncycastle.math.ec.ECFieldElement) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECPoint.F2m byte[] getEncoded(boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement java.math.BigInteger toBigInteger()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement divide(org.bouncycastle.math.ec.ECFieldElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.F2m org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement org.bouncycastle.math.ec.ECFieldElement multiply(org.bouncycastle.math.ec.ECFieldElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve org.bouncycastle.math.ec.ECPoint decodePoint(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECPoint.F2m org.bouncycastle.math.ec.ECPoint subtract(org.bouncycastle.math.ec.ECPoint) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.F2m F2m(int, int, java.math.BigInteger, java.math.BigInteger) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement negate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECCurve.Fp org.bouncycastle.math.ec.ECPoint createPoint(java.math.BigInteger, java.math.BigInteger, boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.F2m org.bouncycastle.math.ec.ECFieldElement divide(org.bouncycastle.math.ec.ECFieldElement)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECFieldElement.Fp org.bouncycastle.math.ec.ECFieldElement square()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.math.ec.ECPoint.Fp org.bouncycastle.math.ec.ECPoint add(org.bouncycastle.math.ec.ECPoint) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/util/annotations.xml b/android-sdk-annotations/org/bouncycastle/util/annotations.xml
index 07f51b1e51e..9be86c41cd1 100644
--- a/android-sdk-annotations/org/bouncycastle/util/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/util/annotations.xml
@@ -5,7 +5,7 @@
     <item name='org.bouncycastle.util.BigIntegers byte[] asUnsignedByteArray(java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Strings byte[] toUTF8ByteArray(char[])'>
+    <item name='org.bouncycastle.util.Strings java.lang.String[] split(java.lang.String, char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.Strings byte[] toUTF8ByteArray(java.lang.String)'>
@@ -17,19 +17,19 @@
     <item name='org.bouncycastle.util.Arrays long[] copyOf(long[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Arrays long[] copyOf(long[], int)'>
+    <item name='org.bouncycastle.util.Strings byte[] toByteArray(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Strings byte[] toByteArray(java.lang.String) 0'>
+    <item name='org.bouncycastle.util.Memoable org.bouncycastle.util.Memoable copy()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.Strings java.lang.String fromByteArray(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Strings java.lang.String[] split(java.lang.String, char)'>
+    <item name='org.bouncycastle.util.IPAddress boolean isValid(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.IPAddress boolean isValid(java.lang.String) 0'>
+    <item name='org.bouncycastle.util.Arrays int[] copyOf(int[], int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.Strings java.lang.String toUpperCase(java.lang.String) 0'>
@@ -47,19 +47,34 @@
     <item name='org.bouncycastle.util.IPAddress boolean isValidIPv4WithNetmask(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.Strings java.lang.String toLowerCase(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Arrays java.math.BigInteger[] copyOf(java.math.BigInteger[], int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.Arrays int hashCode(short[][][]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.IPAddress boolean isValidIPv4(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.BigIntegers java.math.BigInteger createRandomInRange(java.math.BigInteger, java.math.BigInteger, java.security.SecureRandom)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Store java.util.Collection getMatches(org.bouncycastle.util.Selector)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Strings char[] asCharArray(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.Strings java.lang.String fromUTF8ByteArray(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.Arrays byte[] copyOfRange(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.BigIntegers java.math.BigInteger createRandomInRange(java.math.BigInteger, java.math.BigInteger, java.security.SecureRandom)'>
+    <item name='org.bouncycastle.util.Memoable void reset(org.bouncycastle.util.Memoable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.Arrays int hashCode(short[][]) 0'>
@@ -71,51 +86,60 @@
     <item name='org.bouncycastle.util.Arrays void fill(byte[], byte) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Strings byte[] toByteArray(char[])'>
+    <item name='org.bouncycastle.util.Strings java.lang.String fromByteArray(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.Strings java.lang.String toLowerCase(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Strings java.lang.String fromByteArray(byte[])'>
+    <item name='org.bouncycastle.util.Strings byte[] toByteArray(char[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Arrays int[] copyOfRange(int[], int, int) 0'>
+    <item name='org.bouncycastle.util.CollectionStore java.util.Collection getMatches(org.bouncycastle.util.Selector)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.BigIntegers byte[] asUnsignedByteArray(int, java.math.BigInteger)'>
+    <item name='org.bouncycastle.util.Arrays long[] copyOf(long[], int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Strings void toUTF8ByteArray(char[], java.io.OutputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Arrays java.math.BigInteger[] copyOfRange(java.math.BigInteger[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Strings byte[] toUTF8ByteArray(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Strings char[] asCharArray(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Strings byte[] toByteArray(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Arrays int hashCode(int[][]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Arrays byte[] copyOf(byte[], int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.BigIntegers java.math.BigInteger createRandomInRange(java.math.BigInteger, java.math.BigInteger, java.security.SecureRandom) 1'>
+    <item name='org.bouncycastle.util.Arrays long[] copyOfRange(long[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.Strings java.lang.String toUpperCase(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.Arrays int[] copyOfRange(int[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Arrays byte[] copyOf(byte[], int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Strings void toUTF8ByteArray(char[], java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Strings byte[] toUTF8ByteArray(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Arrays int hashCode(int[][]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.BigIntegers java.math.BigInteger createRandomInRange(java.math.BigInteger, java.math.BigInteger, java.security.SecureRandom) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Arrays byte[] copyOfRange(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.Arrays void fill(long[], long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.Strings java.lang.String fromUTF8ByteArray(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Arrays char[] copyOf(char[], int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Strings byte[] toByteArray(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.IPAddress boolean isValidWithNetMask(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -128,58 +152,43 @@
     <item name='org.bouncycastle.util.Arrays byte[] copyOf(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.Arrays java.math.BigInteger[] copyOfRange(java.math.BigInteger[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.Arrays long[] copyOfRange(long[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.Arrays int[] copyOf(int[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Arrays java.math.BigInteger[] copyOf(java.math.BigInteger[], int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.BigIntegers byte[] asUnsignedByteArray(java.math.BigInteger)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.util.Arrays void fill(int[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Arrays byte[] copyOfRange(byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.util.Strings byte[] toUTF8ByteArray(char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.BigIntegers java.math.BigInteger createRandomInRange(java.math.BigInteger, java.math.BigInteger, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.CollectionStore java.util.Collection getMatches(org.bouncycastle.util.Selector)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.util.Arrays java.math.BigInteger[] copyOfRange(java.math.BigInteger[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Arrays int[] copyOf(int[], int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Arrays long[] copyOfRange(long[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Strings char[] asCharArray(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Arrays char[] copyOf(char[], int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.Arrays java.math.BigInteger[] copyOf(java.math.BigInteger[], int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.util.Arrays int[] copyOfRange(int[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Strings java.lang.String toLowerCase(java.lang.String)'>
+    <item name='org.bouncycastle.util.Strings char[] asCharArray(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.Strings java.lang.String fromUTF8ByteArray(byte[])'>
+    <item name='org.bouncycastle.util.BigIntegers byte[] asUnsignedByteArray(int, java.math.BigInteger)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Arrays java.math.BigInteger[] copyOf(java.math.BigInteger[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.Strings byte[] toUTF8ByteArray(char[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.BigIntegers byte[] asUnsignedByteArray(java.math.BigInteger)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/util/encoders/annotations.xml b/android-sdk-annotations/org/bouncycastle/util/encoders/annotations.xml
index 3f7be541c40..bae29a23858 100644
--- a/android-sdk-annotations/org/bouncycastle/util/encoders/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/util/encoders/annotations.xml
@@ -1,46 +1,61 @@
 <root>
-    <item name='org.bouncycastle.util.encoders.Base64 byte[] decode(byte[])'>
+    <item name='org.bouncycastle.util.encoders.HexEncoder int decode(byte[], int, int, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.encoders.Hex java.lang.String toHexString(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Hex java.lang.String toHexString(byte[], int, int)'>
+    <item name='org.bouncycastle.util.encoders.Hex byte[] decode(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Base64 java.lang.String toBase64String(byte[]) 0'>
+    <item name='org.bouncycastle.util.encoders.HexEncoder int decode(java.lang.String, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Base64 java.lang.String toBase64String(byte[], int, int)'>
+    <item name='org.bouncycastle.util.encoders.Hex byte[] encode(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Base64 byte[] decode(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.encoders.Base64 byte[] decode(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.encoders.Hex int encode(byte[], java.io.OutputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.encoders.Hex java.lang.String toHexString(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.util.encoders.Base64 byte[] decode(java.lang.String) 0'>
+    <item name='org.bouncycastle.util.encoders.Base64 byte[] encode(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.encoders.Base64 byte[] encode(byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Base64 byte[] encode(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.util.encoders.Hex byte[] encode(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.encoders.Base64 java.lang.String toBase64String(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Hex int encode(byte[], java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Base64 byte[] decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Encoder int decode(byte[], int, int, java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Base64 byte[] decode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Encoder int decode(java.lang.String, java.io.OutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Base64 byte[] encode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Base64 java.lang.String toBase64String(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.encoders.Hex byte[] encode(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.encoders.Hex java.lang.String toHexString(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Base64 java.lang.String toBase64String(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.encoders.Base64Encoder int decode(java.lang.String, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -50,16 +65,13 @@
     <item name='org.bouncycastle.util.encoders.Hex byte[] decode(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Base64 byte[] encode(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.util.encoders.Base64Encoder int decode(byte[], int, int, java.io.OutputStream) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Hex byte[] decode(java.lang.String)'>
+    <item name='org.bouncycastle.util.encoders.HexEncoder int decode(byte[], int, int, java.io.OutputStream) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Hex byte[] encode(byte[], int, int)'>
+    <item name='org.bouncycastle.util.encoders.Base64 byte[] decode(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.util.encoders.Base64 int encode(byte[], java.io.OutputStream) 0'>
@@ -68,13 +80,22 @@
     <item name='org.bouncycastle.util.encoders.HexEncoder int decode(java.lang.String, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.encoders.Hex byte[] decode(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Hex java.lang.String toHexString(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.encoders.Base64Encoder int decode(java.lang.String, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Hex byte[] decode(byte[])'>
+    <item name='org.bouncycastle.util.encoders.Encoder int decode(java.lang.String, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.encoders.Base64 java.lang.String toBase64String(byte[])'>
+    <item name='org.bouncycastle.util.encoders.Encoder int decode(byte[], int, int, java.io.OutputStream) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.util.encoders.Base64 byte[] decode(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/util/io/annotations.xml b/android-sdk-annotations/org/bouncycastle/util/io/annotations.xml
index 0bc89b6bf13..f9d7e11d62c 100644
--- a/android-sdk-annotations/org/bouncycastle/util/io/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/util/io/annotations.xml
@@ -1,7 +1,4 @@
 <root>
-    <item name='org.bouncycastle.util.io.Streams byte[] readAllLimited(java.io.InputStream, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.util.io.Streams byte[] readAll(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -17,6 +14,9 @@
     <item name='org.bouncycastle.util.io.TeeInputStream int read(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.io.Streams byte[] readAllLimited(java.io.InputStream, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.io.Streams void pipeAll(java.io.InputStream, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -29,10 +29,10 @@
     <item name='org.bouncycastle.util.io.Streams long pipeAllLimited(java.io.InputStream, long, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.util.io.Streams byte[] readAll(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.util.io.Streams void drain(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.io.Streams byte[] readAll(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/util/io/pem/annotations.xml b/android-sdk-annotations/org/bouncycastle/util/io/pem/annotations.xml
index 1ebb0a5d566..2e51f8603c7 100644
--- a/android-sdk-annotations/org/bouncycastle/util/io/pem/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/util/io/pem/annotations.xml
@@ -14,6 +14,9 @@
     <item name='org.bouncycastle.util.io.pem.PemReader PemReader(java.io.Reader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.util.io.pem.PemObjectGenerator org.bouncycastle.util.io.pem.PemObject generate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.util.io.pem.PemWriter int getOutputSize(org.bouncycastle.util.io.pem.PemObject) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/bouncycastle/x509/annotations.xml b/android-sdk-annotations/org/bouncycastle/x509/annotations.xml
index a262f349657..a78c3205845 100644
--- a/android-sdk-annotations/org/bouncycastle/x509/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/x509/annotations.xml
@@ -2,37 +2,28 @@
     <item name='org.bouncycastle.x509.X509V1CertificateGenerator void setIssuerDN(org.bouncycastle.asn1.x509.X509Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.Set getTrustedACIssuers()'>
+    <item name='org.bouncycastle.x509.X509CollectionStoreParameters X509CollectionStoreParameters(java.util.Collection) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.ExtendedPKIXParameters ExtendedPKIXParameters(java.util.Set) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509CollectionStoreParameters X509CollectionStoreParameters(java.util.Collection) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.x509.X509V1CertificateGenerator void setSubjectDN(javax.security.auth.x500.X500Principal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.ExtendedPKIXBuilderParameters ExtendedPKIXBuilderParameters(java.util.Set, org.bouncycastle.util.Selector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXBuilderParameters org.bouncycastle.x509.ExtendedPKIXParameters getInstance(java.security.cert.PKIXParameters)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509CRLStoreSelector java.lang.Object clone()'>
+    <item name='org.bouncycastle.x509.X509V2AttributeCertificate org.bouncycastle.x509.AttributeCertificateIssuer getIssuer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(org.bouncycastle.jce.X509Principal, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.security.SecureRandom)'>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.lang.String, java.security.SecureRandom)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(java.security.cert.X509Certificate) 0'>
@@ -41,19 +32,139 @@
     <item name='org.bouncycastle.x509.X509V2AttributeCertificate void checkValidity(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.List getStores()'>
+    <item name='org.bouncycastle.x509.X509Attribute org.bouncycastle.asn1.ASN1Encodable[] getValues()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setSubjectUniqueID(boolean[]) 0'>
+    <item name='org.bouncycastle.x509.X509CertStoreSelector org.bouncycastle.x509.X509CertStoreSelector getInstance(java.security.cert.X509CertSelector)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.Set getProhibitedACAttributes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.security.SecureRandom)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXBuilderParameters org.bouncycastle.x509.ExtendedPKIXParameters getInstance(java.security.cert.PKIXParameters)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509CRLStoreSelector org.bouncycastle.x509.X509CRLStoreSelector getInstance(java.security.cert.X509CRLSelector)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509AttributeCertificate void checkValidity(java.util.Date) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator void setSerialNumber(java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void copyAndAddExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, java.security.cert.X509Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.lang.String, java.security.SecureRandom)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters org.bouncycastle.x509.ExtendedPKIXParameters getInstance(java.security.cert.PKIXParameters)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509Store org.bouncycastle.x509.X509Store getInstance(java.lang.String, org.bouncycastle.x509.X509StoreParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setPublicKey(java.security.PublicKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509AttributeCertificate void verify(java.security.PublicKey, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(java.lang.String, boolean, org.bouncycastle.asn1.ASN1Encodable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters org.bouncycastle.x509.ExtendedPKIXParameters getInstance(java.security.cert.PKIXParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.ExtendedPKIXBuilderParameters java.util.Set getExcludedCerts()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(javax.security.auth.x500.X500Principal, java.math.BigInteger) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setSerialNumber(java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.lang.String, java.security.SecureRandom)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509AttributeCertificate org.bouncycastle.x509.X509Attribute[] getAttributes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(javax.security.auth.x500.X500Principal) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.List getAdditionalStores()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V2AttributeCertificate org.bouncycastle.x509.AttributeCertificateHolder getHolder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters org.bouncycastle.x509.ExtendedPKIXParameters getInstance(java.security.cert.PKIXParameters)'>
+    <item name='org.bouncycastle.x509.X509V2AttributeCertificate org.bouncycastle.x509.X509Attribute[] getAttributes()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.AttributeCertificateIssuer AttributeCertificateIssuer(javax.security.auth.x500.X500Principal) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(javax.security.auth.x500.X500Principal, java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.List getStores()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.security.SecureRandom)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509CRLStoreSelector org.bouncycastle.x509.X509CRLStoreSelector getInstance(java.security.cert.X509CRLSelector) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509CRLStoreSelector java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void copyAndAddExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, java.security.cert.X509Certificate) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509CollectionStoreParameters java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator void setIssuerDN(javax.security.auth.x500.X500Principal) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V2AttributeCertificate X509V2AttributeCertificate(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXBuilderParameters org.bouncycastle.x509.ExtendedPKIXParameters getInstance(java.security.cert.PKIXParameters) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.Set getAttrCertCheckers()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.security.SecureRandom)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.AttributeCertificateIssuer java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setSubjectUniqueID(boolean[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.X509V3CertificateGenerator void copyAndAddExtension(java.lang.String, boolean, java.security.cert.X509Certificate) 2'>
@@ -65,223 +176,130 @@
     <item name='org.bouncycastle.x509.X509Attribute X509Attribute(java.lang.String, org.bouncycastle.asn1.ASN1Encodable) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509Store org.bouncycastle.x509.X509Store getInstance(java.lang.String, org.bouncycastle.x509.X509StoreParameters)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509CollectionStoreParameters java.util.Collection getCollection()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setSubjectDN(javax.security.auth.x500.X500Principal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509Store org.bouncycastle.x509.X509Store getInstance(java.lang.String, org.bouncycastle.x509.X509StoreParameters, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setIssuerUniqueID(boolean[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(java.lang.String, boolean, byte[]) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.security.SecureRandom)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.x509.ExtendedPKIXBuilderParameters void setParams(java.security.cert.PKIXParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.lang.Object clone()'>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(java.lang.String, boolean, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509CertStoreSelector org.bouncycastle.x509.X509CertStoreSelector getInstance(java.security.cert.X509CertSelector)'>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setIssuerUniqueID(boolean[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509CollectionStoreParameters java.lang.String toString()'>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.security.SecureRandom)'>
+    <item name='org.bouncycastle.x509.X509AttributeCertificate org.bouncycastle.x509.AttributeCertificateIssuer getIssuer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.lang.String, java.security.SecureRandom)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator void setSerialNumber(java.math.BigInteger) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void copyAndAddExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, java.security.cert.X509Certificate) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXBuilderParameters java.lang.Object clone()'>
+    <item name='org.bouncycastle.x509.X509Store org.bouncycastle.x509.X509Store getInstance(java.lang.String, org.bouncycastle.x509.X509StoreParameters, java.security.Provider)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setIssuerDN(javax.security.auth.x500.X500Principal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.x509.X509CertStoreSelector org.bouncycastle.x509.X509CertStoreSelector getInstance(java.security.cert.X509CertSelector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.x509.X509V1CertificateGenerator void setSubjectDN(org.bouncycastle.asn1.x509.X509Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509Store org.bouncycastle.x509.X509Store getInstance(java.lang.String, org.bouncycastle.x509.X509StoreParameters) 0'>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V2AttributeCertificate org.bouncycastle.x509.AttributeCertificateHolder getHolder()'>
+    <item name='org.bouncycastle.x509.X509Store org.bouncycastle.x509.X509Store getInstance(java.lang.String, org.bouncycastle.x509.X509StoreParameters)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setPublicKey(java.security.PublicKey) 0'>
+    <item name='org.bouncycastle.x509.X509Store org.bouncycastle.x509.X509Store getInstance(java.lang.String, org.bouncycastle.x509.X509StoreParameters, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(java.lang.String, boolean, org.bouncycastle.asn1.ASN1Encodable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V2AttributeCertificate org.bouncycastle.x509.X509Attribute[] getAttributes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters org.bouncycastle.x509.ExtendedPKIXParameters getInstance(java.security.cert.PKIXParameters) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.lang.String, java.security.SecureRandom)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.lang.String, java.security.SecureRandom)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.lang.String, java.security.SecureRandom)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(javax.security.auth.x500.X500Principal, java.math.BigInteger) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setSerialNumber(java.math.BigInteger) 0'>
+    <item name='org.bouncycastle.x509.X509CollectionStoreParameters java.util.Collection getCollection()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(int, java.lang.String, java.lang.String, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXBuilderParameters java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.x509.X509V3CertificateGenerator void setSubjectDN(org.bouncycastle.asn1.x509.X509Name) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.AttributeCertificateIssuer AttributeCertificateIssuer(org.bouncycastle.asn1.x509.AttCertIssuer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(javax.security.auth.x500.X500Principal) 0'>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.lang.String, java.security.SecureRandom)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey, java.lang.String)'>
+    <item name='org.bouncycastle.x509.X509V2AttributeCertificate byte[] getExtensionValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generateX509Certificate(java.security.PrivateKey)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V2AttributeCertificate org.bouncycastle.x509.AttributeCertificateIssuer getIssuer()'>
+    <item name='org.bouncycastle.x509.X509AttributeCertificate org.bouncycastle.x509.AttributeCertificateHolder getHolder()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.X509V1CertificateGenerator void setPublicKey(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509CollectionStoreParameters java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.AttributeCertificateIssuer java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void copyAndAddExtension(java.lang.String, boolean, java.security.cert.X509Certificate) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.AttributeCertificateIssuer AttributeCertificateIssuer(javax.security.auth.x500.X500Principal) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters void setParams(java.security.cert.PKIXParameters) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509Attribute org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509CRLStoreSelector org.bouncycastle.x509.X509CRLStoreSelector getInstance(java.security.cert.X509CRLSelector)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(java.lang.String, boolean, byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(javax.security.auth.x500.X500Principal, java.math.BigInteger) 0'>
+    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.List getAdditionalStores()'>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.security.SecureRandom)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509CRLStoreSelector org.bouncycastle.x509.X509CRLStoreSelector getInstance(java.security.cert.X509CRLSelector) 0'>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters void setParams(java.security.cert.PKIXParameters) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.Set getNecessaryACAttributes()'>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void copyAndAddExtension(java.lang.String, boolean, java.security.cert.X509Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.Set getTrustedACIssuers()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(java.lang.String, boolean, byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.X509V2AttributeCertificate void verify(java.security.PublicKey, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509Store org.bouncycastle.x509.X509Store getInstance(java.lang.String, org.bouncycastle.x509.X509StoreParameters, java.security.Provider)'>
+    <item name='org.bouncycastle.x509.X509CollectionStoreParameters java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void copyAndAddExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, java.security.cert.X509Certificate) 2'>
+    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.AttributeCertificateHolder AttributeCertificateHolder(int, java.lang.String, java.lang.String, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509Attribute X509Attribute(java.lang.String, org.bouncycastle.asn1.ASN1EncodableVector) 0'>
+    <item name='org.bouncycastle.x509.X509Attribute org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V2AttributeCertificate X509V2AttributeCertificate(byte[]) 0'>
+    <item name='org.bouncycastle.x509.X509Attribute X509Attribute(java.lang.String, org.bouncycastle.asn1.ASN1EncodableVector) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.X509Attribute X509Attribute(java.lang.String, org.bouncycastle.asn1.ASN1EncodableVector) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey)'>
+    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.Set getNecessaryACAttributes()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.X509Attribute org.bouncycastle.asn1.ASN1Encodable[] getValues()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.AttributeCertificateHolder java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator java.security.cert.X509Certificate generate(java.security.PrivateKey, java.security.SecureRandom)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, org.bouncycastle.asn1.ASN1Encodable) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V1CertificateGenerator void setIssuerDN(javax.security.auth.x500.X500Principal) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.X509V2AttributeCertificate X509V2AttributeCertificate(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.Set getAttrCertCheckers()'>
+    <item name='org.bouncycastle.x509.X509V2AttributeCertificate X509V2AttributeCertificate(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(org.bouncycastle.asn1.DERObjectIdentifier, boolean, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXBuilderParameters org.bouncycastle.x509.ExtendedPKIXParameters getInstance(java.security.cert.PKIXParameters) 0'>
+    <item name='org.bouncycastle.x509.AttributeCertificateHolder java.lang.Object clone()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.X509V3CertificateGenerator void addExtension(java.lang.String, boolean, org.bouncycastle.asn1.ASN1Encodable) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.ExtendedPKIXParameters java.util.Set getProhibitedACAttributes()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/bouncycastle/x509/extension/annotations.xml b/android-sdk-annotations/org/bouncycastle/x509/extension/annotations.xml
index ee5895b8ae3..6ac02ce7863 100644
--- a/android-sdk-annotations/org/bouncycastle/x509/extension/annotations.xml
+++ b/android-sdk-annotations/org/bouncycastle/x509/extension/annotations.xml
@@ -1,19 +1,19 @@
 <root>
-    <item name='org.bouncycastle.x509.extension.X509ExtensionUtil java.util.Collection getIssuerAlternativeNames(java.security.cert.X509Certificate)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure AuthorityKeyIdentifierStructure(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure AuthorityKeyIdentifierStructure(org.bouncycastle.asn1.x509.X509Extension) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure SubjectKeyIdentifierStructure(byte[]) 0'>
+    <item name='org.bouncycastle.x509.extension.X509ExtensionUtil java.util.Collection getIssuerAlternativeNames(java.security.cert.X509Certificate)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.bouncycastle.x509.extension.X509ExtensionUtil java.util.Collection getSubjectAlternativeNames(java.security.cert.X509Certificate)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure SubjectKeyIdentifierStructure(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure SubjectKeyIdentifierStructure(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/android-sdk-annotations/org/ccil/cowan/tagsoup/annotations.xml b/android-sdk-annotations/org/ccil/cowan/tagsoup/annotations.xml
index d29ac8ee173..9fb822a8cd3 100644
--- a/android-sdk-annotations/org/ccil/cowan/tagsoup/annotations.xml
+++ b/android-sdk-annotations/org/ccil/cowan/tagsoup/annotations.xml
@@ -1,11 +1,20 @@
 <root>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void endEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.ccil.cowan.tagsoup.XMLWriter java.lang.String getPrefix(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.XMLWriter void setPrefix(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.PYXWriter void etag(char[], int, int) 0'>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl java.lang.String getType(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Parser void pitarget(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.Schema void elementType(java.lang.String, int, int, int) 0'>
@@ -14,16 +23,16 @@
     <item name='org.ccil.cowan.tagsoup.Schema void parent(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.PYXScanner void scan(java.io.Reader, org.ccil.cowan.tagsoup.ScanHandler) 0'>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl int getIndex(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.AttributesImpl void setAttributes(org.xml.sax.Attributes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.Parser void setProperty(java.lang.String, java.lang.Object) 0'>
+    <item name='org.ccil.cowan.tagsoup.Parser void etag(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.XMLWriter void dataElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, java.lang.String) 4'>
+    <item name='org.ccil.cowan.tagsoup.ScanHandler void aval(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.XMLWriter void forceNSDecl(java.lang.String, java.lang.String) 1'>
@@ -35,40 +44,37 @@
     <item name='org.ccil.cowan.tagsoup.ElementType boolean canContain(org.ccil.cowan.tagsoup.ElementType) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.CommandLine void main(java.lang.String[]) 0'>
+    <item name='org.ccil.cowan.tagsoup.Parser boolean getFeature(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.ElementType java.lang.String namespace(java.lang.String, boolean) 0'>
+    <item name='org.ccil.cowan.tagsoup.ScanHandler void pitarget(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.Parser void parse(org.xml.sax.InputSource) 0'>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void endElement(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.ElementType java.lang.String localName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.XMLWriter void processingInstruction(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.ccil.cowan.tagsoup.PYXWriter void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.PYXWriter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.XMLWriter void setPrefix(java.lang.String, java.lang.String) 0'>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl java.lang.String getType(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.PYXWriter void pi(char[], int, int) 0'>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void setPrefix(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.XMLWriter void dataElement(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.Element boolean canContain(org.ccil.cowan.tagsoup.Element) 0'>
+    <item name='org.ccil.cowan.tagsoup.Parser void endEntity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.ElementType java.lang.String localName(java.lang.String)'>
+    <item name='org.ccil.cowan.tagsoup.ScanHandler void decl(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.PYXWriter PYXWriter(java.io.Writer) 0'>
@@ -80,40 +86,19 @@
     <item name='org.ccil.cowan.tagsoup.XMLWriter void forceNSDecl(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.AttributesImpl AttributesImpl(org.xml.sax.Attributes) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.ccil.cowan.tagsoup.Element void setAttribute(java.lang.String, java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.ccil.cowan.tagsoup.XMLWriter java.lang.String getOutputProperty(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.XMLWriter void dataElement(java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.XMLWriter void setOutputProperty(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.ccil.cowan.tagsoup.PYXWriter void aname(char[], int, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.ccil.cowan.tagsoup.Schema org.ccil.cowan.tagsoup.ElementType getElementType(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.ElementType void setAttribute(java.lang.String, java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.ccil.cowan.tagsoup.XMLWriter void processingInstruction(java.lang.String, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.ccil.cowan.tagsoup.ElementType ElementType(java.lang.String, int, int, int, org.ccil.cowan.tagsoup.Schema) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.PYXWriter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.ccil.cowan.tagsoup.ElementType void setAttribute(org.ccil.cowan.tagsoup.AttributesImpl, java.lang.String, java.lang.String, java.lang.String) 1'>
+    <item name='org.ccil.cowan.tagsoup.ScanHandler void pi(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.XMLWriter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
@@ -125,6 +110,150 @@
     <item name='org.ccil.cowan.tagsoup.Parser void decl(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.ccil.cowan.tagsoup.Schema void attribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void pitarget(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.AutoDetector java.io.Reader autoDetectingReader(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void dataElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, java.lang.String) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void setDocumentLocator(org.xml.sax.Locator) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Parser void aname(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl java.lang.String getValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Schema void attribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void endElement(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void etag(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Parser void startEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void startEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Parser void aval(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl java.lang.String getValue(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXScanner void scan(java.io.Reader, org.ccil.cowan.tagsoup.ScanHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.ElementType java.lang.String localName(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Parser void setProperty(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void dataElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, java.lang.String) 4'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Scanner void scan(java.io.Reader, org.ccil.cowan.tagsoup.ScanHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.CommandLine void main(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl int getIndex(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.ElementType java.lang.String namespace(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Parser void parse(org.xml.sax.InputSource) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void processingInstruction(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.ScanHandler void etag(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void pi(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.AutoDetector java.io.Reader autoDetectingReader(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Element boolean canContain(org.ccil.cowan.tagsoup.Element) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl java.lang.String getValue(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl int getIndex(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void startEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl AttributesImpl(org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Element void setAttribute(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void decl(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void setOutputProperty(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void aname(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.ElementType void setAttribute(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void processingInstruction(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Parser void setContentHandler(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.AttributesImpl java.lang.String getType(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.ElementType void setAttribute(org.ccil.cowan.tagsoup.AttributesImpl, java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Parser void gi(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.ccil.cowan.tagsoup.XMLWriter void characters(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -134,22 +263,25 @@
     <item name='org.ccil.cowan.tagsoup.PYXWriter void gi(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.Schema void attribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String) 1'>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void startPrefixMapping(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.Parser void setFeature(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void comment(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.ccil.cowan.tagsoup.Schema void parent(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.XMLWriter void forceNSDecl(java.lang.String, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.PYXWriter void pitarget(char[], int, int) 0'>
+    <item name='org.ccil.cowan.tagsoup.Scanner void scan(java.io.Reader, org.ccil.cowan.tagsoup.ScanHandler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.XMLWriter void dataElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, java.lang.String) 3'>
+    <item name='org.ccil.cowan.tagsoup.Parser void comment(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.HTMLScanner void scan(java.io.Reader, org.ccil.cowan.tagsoup.ScanHandler) 0'>
@@ -158,10 +290,25 @@
     <item name='org.ccil.cowan.tagsoup.XMLWriter void emptyElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.ccil.cowan.tagsoup.XMLWriter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.ccil.cowan.tagsoup.PYXScanner void scan(java.io.Reader, org.ccil.cowan.tagsoup.ScanHandler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.Schema void attribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String) 0'>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.Parser void pi(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.PYXWriter void endEntity(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.ScanHandler void gi(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.ScanHandler void aname(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/ccil/cowan/tagsoup/jaxp/annotations.xml b/android-sdk-annotations/org/ccil/cowan/tagsoup/jaxp/annotations.xml
index e19db3575c4..30e1306dd05 100644
--- a/android-sdk-annotations/org/ccil/cowan/tagsoup/jaxp/annotations.xml
+++ b/android-sdk-annotations/org/ccil/cowan/tagsoup/jaxp/annotations.xml
@@ -8,6 +8,9 @@
     <item name='org.ccil.cowan.tagsoup.jaxp.SAXParserImpl void setFeature(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.ccil.cowan.tagsoup.jaxp.SAXParserImpl org.xml.sax.XMLReader getXMLReader()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.ccil.cowan.tagsoup.jaxp.SAXParserImpl org.xml.sax.Parser getParser()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -17,10 +20,16 @@
     <item name='org.ccil.cowan.tagsoup.jaxp.SAXParserImpl java.lang.Object getProperty(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.ccil.cowan.tagsoup.jaxp.SAXFactoryImpl boolean getFeature(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.ccil.cowan.tagsoup.jaxp.SAXFactoryImpl void setFeature(java.lang.String, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.ccil.cowan.tagsoup.jaxp.SAXParserImpl org.xml.sax.XMLReader getXMLReader()'>
+    <item name='org.ccil.cowan.tagsoup.jaxp.SAX1ParserAdapter void setLocale(java.util.Locale) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.ccil.cowan.tagsoup.jaxp.SAX1ParserAdapter void parse(org.xml.sax.InputSource) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.ccil.cowan.tagsoup.jaxp.SAXParserImpl org.ccil.cowan.tagsoup.jaxp.SAXParserImpl newInstance(java.util.Map)'>
diff --git a/android-sdk-annotations/org/conscrypt/annotations.xml b/android-sdk-annotations/org/conscrypt/annotations.xml
index 76e39350953..40712745336 100644
--- a/android-sdk-annotations/org/conscrypt/annotations.xml
+++ b/android-sdk-annotations/org/conscrypt/annotations.xml
@@ -1,65 +1,47 @@
 <root>
+    <item name='org.conscrypt.OpenSSLSignatureRawRSA boolean engineVerify(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.conscrypt.OpenSSLX509Certificate java.util.List&lt;org.conscrypt.OpenSSLX509Certificate&gt; fromPkcs7DerInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.CertificateRequest CertificateRequest(org.conscrypt.HandshakeIODataStream, int) 0'>
+    <item name='org.conscrypt.OpenSSLX509Certificate javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ServerHello ServerHello(org.conscrypt.HandshakeIODataStream, int) 0'>
+    <item name='org.conscrypt.HandshakeIODataStream byte[] read(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSignatureRawRSA byte[] engineSign()'>
+    <item name='org.conscrypt.OpenSSLContextImpl javax.net.ssl.SSLServerSocketFactory engineGetServerSocketFactory()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.CertificateRequest CertificateRequest(byte[], java.security.cert.X509Certificate[]) 0'>
+    <item name='org.conscrypt.ConnectionState byte[] decrypt(byte, byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLServerSocketImpl java.net.Socket accept()'>
+    <item name='org.conscrypt.NativeCrypto java.lang.String[] checkEnabledProtocols(java.lang.String[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ConnectionStateTLS ConnectionStateTLS(org.conscrypt.SSLSessionImpl) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLRSAPublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSignatureRawRSA void engineInitVerify(java.security.PublicKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.NativeCrypto int X509_NAME_hash(javax.security.auth.x500.X500Principal) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustedCertificateStore void installCertificate(java.security.cert.X509Certificate) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLSocketImpl void addHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener) 0'>
+    <item name='org.conscrypt.OpenSSLECGroupContext java.security.spec.ECParameterSpec getECParameterSpec()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.SSLEngineImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.lang.String[] getDefaultCipherSuites()'>
+    <item name='org.conscrypt.OpenSSLCipher java.lang.String getBaseCipherName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate java.util.List&lt;org.conscrypt.OpenSSLX509Certificate&gt; fromPkcs7DerInputStream(java.io.InputStream)'>
+    <item name='org.conscrypt.Logger.Stream void println(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustManagerFactoryImpl javax.net.ssl.TrustManager[] engineGetTrustManagers()'>
+    <item name='org.conscrypt.NativeCrypto.SSLHandshakeCallbacks void verifyCertificateChain(long[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLEngineDataStream byte[] getData(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.ARC4 java.lang.String getBaseCipherName()'>
+    <item name='org.conscrypt.OpenSSLSignatureRawRSA void engineUpdate(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.CipherSuite org.conscrypt.CipherSuite getByName(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSecretKey OpenSSLSecretKey(java.lang.String, org.conscrypt.OpenSSLKey) 1'>
+    <item name='org.conscrypt.OpenSSLECPublicKey java.security.spec.ECParameterSpec getParams()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CRL engineGenerateCRL(java.io.InputStream) 0'>
@@ -68,34 +50,19 @@
     <item name='org.conscrypt.SSLSocketImpl void setEnabledProtocols(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509CertPath java.security.cert.CertPath fromEncoding(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.SSLSocketImpl void removeHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509CRL javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
+    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketInputStream int read(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustManagerImpl void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustedCertificateStore java.security.cert.X509Certificate findIssuer(java.security.cert.X509Certificate) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.NativeCrypto java.lang.String[] getDefaultCipherSuites()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECPrivateKey OpenSSLECPrivateKey(org.conscrypt.OpenSSLKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLContextImpl javax.net.ssl.SSLEngine engineCreateSSLEngine()'>
+    <item name='org.conscrypt.OpenSSLSocketImplWrapper java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustManagerImpl java.util.List&lt;java.security.cert.X509Certificate&gt; checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.lang.String) 0'>
@@ -104,93 +71,39 @@
     <item name='org.conscrypt.OpenSSLSignature void engineInitSign(java.security.PrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipher.DESEDE java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.Logger.Stream void printAsHex(int, java.lang.String, java.lang.String, byte[]) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLContextImpl javax.net.ssl.SSLSocketFactory engineGetSocketFactory()'>
+    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECPublicKey org.conscrypt.OpenSSLKey getInstance(java.security.interfaces.ECPublicKey)'>
+    <item name='org.conscrypt.OpenSSLServerSocketImpl java.lang.String[] getSupportedProtocols()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLKey java.security.PrivateKey getPrivateKey()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRLEntry java.util.Date getRevocationDate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ClientHello ClientHello(org.conscrypt.HandshakeIODataStream) 0'>
+    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.lang.String[] getDefaultCipherSuites()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLRSAPrivateKey OpenSSLRSAPrivateKey(java.security.spec.RSAPrivateKeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ConnectionStateTLS byte[] decrypt(byte, byte[], int, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustedCertificateIndex java.security.cert.TrustAnchor index(java.security.cert.X509Certificate)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.X509PublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECDHKeyAgreement javax.crypto.SecretKey engineGenerateSecret(java.lang.String)'>
+    <item name='org.conscrypt.OpenSSLX509Certificate java.security.Principal getSubjectDN()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustManagerImpl void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate java.math.BigInteger getSerialNumber()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketImplWrapper OpenSSLSocketImplWrapper(java.net.Socket, java.lang.String, int, boolean, org.conscrypt.SSLParametersImpl) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ClientSessionContext void putSession(javax.net.ssl.SSLSession) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLDSAParams java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECDHKeyAgreement void engineInit(java.security.Key, java.security.SecureRandom) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.Logger.Stream void print(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.SSLSessionImpl java.lang.Object getValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.CertPinManager CertPinManager(java.lang.String, org.conscrypt.TrustedCertificateStore) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.CertificateRequest void send(org.conscrypt.HandshakeIODataStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ChainStrengthAnalyzer void check(java.security.cert.X509Certificate[]) 0'>
+    <item name='org.conscrypt.OpenSSLCipherRSA int engineUpdate(byte[], int, int, byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustedCertificateKeyStoreSpi java.util.Date engineGetCreationDate(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLDSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLEngine javax.crypto.SecretKey getSecretKeyById(java.lang.String, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate java.util.Date getNotAfter()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLSocketImpl void removeHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -200,76 +113,67 @@
     <item name='org.conscrypt.ClientHandshakeImpl void unwrap(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.conscrypt.TrustManagerImpl java.util.List&lt;java.security.cert.X509Certificate&gt; checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipherRSA byte[] engineUpdate(byte[], int, int)'>
+    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLX509CRL java.security.cert.X509CRLEntry getRevokedCertificate(java.security.cert.X509Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustedCertificateIndex TrustedCertificateIndex(java.util.Set&lt;java.security.cert.TrustAnchor&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLEngine java.security.PrivateKey getPrivateKeyById(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLBIOInputStream OpenSSLBIOInputStream(java.io.InputStream) 0'>
+    <item name='org.conscrypt.OpenSSLECPublicKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLRecordProtocol byte[] wrap(byte, org.conscrypt.DataStream) 1'>
+    <item name='org.conscrypt.OpenSSLSignature void engineUpdate(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.lang.String[] getDefaultCipherSuites()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustedCertificateStore java.security.cert.Certificate getCertificate(java.lang.String, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRLEntry java.lang.String toString()'>
+    <item name='org.conscrypt.OpenSSLX509Certificate javax.security.auth.x500.X500Principal getSubjectX500Principal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLECGroupContext org.conscrypt.OpenSSLECGroupContext getInstance(int, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
+    <item name='org.conscrypt.OpenSSLDSAKeyPairGenerator void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLEngineImpl javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], int, int, java.nio.ByteBuffer)'>
+    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLECPublicKey OpenSSLECPublicKey(org.conscrypt.OpenSSLKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLSocketImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
+    <item name='org.conscrypt.HandshakeProtocol javax.net.ssl.SSLEngineResult.HandshakeStatus getStatus()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLSessionImpl org.conscrypt.SSLSessionImpl getNullSession()'>
+    <item name='org.conscrypt.TrustedCertificateStore java.util.Set&lt;java.lang.String&gt; allSystemAliases()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ServerHello ServerHello(java.security.SecureRandom, byte[], byte[], org.conscrypt.CipherSuite, byte) 2'>
+    <item name='org.conscrypt.OpenSSLECPrivateKey org.conscrypt.OpenSSLKey getInstance(java.security.interfaces.ECPrivateKey)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.PinFailureLogger void writeToLog(java.lang.String, boolean, boolean, java.util.List&lt;java.security.cert.X509Certificate&gt;) 3'>
+    <item name='org.conscrypt.OpenSSLSignature java.lang.Object engineGetParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLSignatureRawRSA void engineInitSign(java.security.PrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi void engineStore(java.io.OutputStream, char[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.conscrypt.OpenSSLDSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSocketImpl void clientCertificateRequested(byte[], byte[][]) 0'>
+    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLCipherRSA java.security.Key engineUnwrap(byte[], java.lang.String, int) 1'>
@@ -278,264 +182,147 @@
     <item name='org.conscrypt.OpenSSLCipherRSA void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.HandshakeIODataStream void append(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.AES java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECPrivateKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLRSAPrivateCrtKey OpenSSLRSAPrivateCrtKey(java.security.spec.RSAPrivateCrtKeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLCipher void engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSecretKey org.conscrypt.OpenSSLKey getInstance(javax.crypto.SecretKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLECGroupContext org.conscrypt.OpenSSLECGroupContext getInstance(int, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLRandom byte[] engineGenerateSeed(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ProtocolVersion boolean isSupported(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.util.Collection&lt;? extends java.security.cert.Certificate&gt; engineGenerateCertificates(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ClientHello byte[] getRandom()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipherRSA void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECPrivateKey java.lang.String getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLRSAPublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketImpl void setEnabledProtocols(java.lang.String[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.HandshakeIODataStream byte[] read(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECDHKeyAgreement java.security.Key engineDoPhase(java.security.Key, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
+    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.util.Collection&lt;? extends java.security.cert.Certificate&gt; engineGenerateCertificates(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAPrivateKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLContextImpl javax.net.ssl.SSLServerSocketFactory engineGetServerSocketFactory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509Certificate byte[] getExtensionValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSocketImpl void setEnabledProtocols(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLX509CRL java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipher void engineSetMode(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipherRSA void engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate java.util.List&lt;org.conscrypt.OpenSSLX509Certificate&gt; fromPkcs7PemInputStream(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLRecordProtocol byte[] wrap(byte, byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CertPath java.security.cert.CertPath fromEncoding(java.io.InputStream, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLServerSocketImpl java.net.Socket accept()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRLEntry java.math.BigInteger getSerialNumber()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher byte[] engineUpdate(byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLRSAPrivateKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSessionImpl void putValue(java.lang.String, java.lang.Object) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ClientHello ClientHello(org.conscrypt.HandshakeIODataStream, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECGroupContext org.conscrypt.OpenSSLECGroupContext getInstance(int, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi boolean engineIsCertificateEntry(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ConnectionState byte[] decrypt(byte, byte[]) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECKeyPairGenerator java.security.KeyPair generateKeyPair()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLRecordProtocol byte[] getChangeCipherSpecMesage(org.conscrypt.SSLSessionImpl)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLKey org.conscrypt.OpenSSLKey fromPrivateKey(java.security.PrivateKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CertPath java.util.List&lt;? extends java.security.cert.Certificate&gt; getCertificates()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustedCertificateStore java.util.Date getCreationDate(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.ARC4 java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher byte[] engineWrap(java.security.Key) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.KeyManagerFactoryImpl javax.net.ssl.KeyManager[] engineGetKeyManagers()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher int engineDoFinal(byte[], int, int, byte[], int) 3'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLServerSocketImpl java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRL java.security.cert.X509CRLEntry getRevokedCertificate(java.math.BigInteger) 0'>
+    <item name='org.conscrypt.OpenSSLX509CRL void verify(java.security.PublicKey, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.SSLParametersImpl javax.net.ssl.X509TrustManager getDefaultTrustManager()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLRSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;)'>
+    <item name='org.conscrypt.OpenSSLCipher void engineSetMode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECGroupContext org.conscrypt.OpenSSLECGroupContext getInstance(int, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSessionImpl void putValue(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA byte[] engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.HandshakeIODataStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLKey org.conscrypt.OpenSSLKey fromPrivateKey(java.security.PrivateKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateStore java.util.Date getCreationDate(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher void checkSupportedMode(org.conscrypt.OpenSSLCipher.Mode) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.Key engineTranslateKey(java.security.Key)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher int engineDoFinal(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionState byte[] encrypt(byte, byte[], int, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRL java.security.cert.X509CRLEntry getRevokedCertificate(java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLClientSessionCache byte[] getSessionData(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLCipher.DESEDE void checkSupportedMode(org.conscrypt.OpenSSLCipher.Mode) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECPublicKey java.lang.String getAlgorithm()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.X509PublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLX509CRL java.util.List&lt;org.conscrypt.OpenSSLX509CRL&gt; fromPkcs7DerInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECPublicKey org.conscrypt.OpenSSLKey getInstance(java.security.interfaces.ECPublicKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLEngine org.conscrypt.OpenSSLEngine getInstance(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipherRSA byte[] engineDoFinal(byte[], int, int)'>
+    <item name='org.conscrypt.OpenSSLX509CRLEntry byte[] getExtensionValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRL java.util.Date getThisUpdate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.AES java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSessionImpl javax.security.cert.X509Certificate[] getPeerCertificateChain()'>
+    <item name='org.conscrypt.OpenSSLRSAPrivateCrtKey java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLX509Certificate org.conscrypt.OpenSSLX509Certificate fromX509DerInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLSocketWrapper java.lang.String toString()'>
+    <item name='org.conscrypt.ConnectionStateTLS byte[] decrypt(byte, byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECGroupContext java.security.spec.ECParameterSpec getECParameterSpec()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.NativeCrypto java.lang.String[] checkEnabledCipherSuites(java.lang.String[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECPrivateKey java.security.spec.ECParameterSpec getParams()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLSessionImpl javax.security.cert.X509Certificate[] getPeerCertificateChain()'>
+    <item name='org.conscrypt.OpenSSLX509Certificate void verify(java.security.PublicKey, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSocketImplWrapper java.lang.String toString()'>
+    <item name='org.conscrypt.NativeCrypto java.lang.String[] checkEnabledCipherSuites(java.lang.String[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipher.DESEDE void checkSupportedPadding(org.conscrypt.OpenSSLCipher.Padding) 0'>
+    <item name='org.conscrypt.OpenSSLCipherRSA int engineUpdate(byte[], int, int, byte[], int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipher int engineUpdate(byte[], int, int, byte[], int) 3'>
+    <item name='org.conscrypt.OpenSSLX509CRL java.util.Date getNextUpdate()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.NativeCrypto void setEnabledProtocols(long, java.lang.String[]) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.Key engineTranslateKey(java.security.Key)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLRSAKeyPairGenerator java.security.KeyPair generateKeyPair()'>
+    <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.SSLServerSocketImpl void setEnabledProtocols(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.Key engineTranslateKey(java.security.Key) 0'>
+    <item name='org.conscrypt.ServerSessionContext void sessionRemoved(javax.net.ssl.SSLSession) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.ServerKeyExchange ServerKeyExchange(org.conscrypt.HandshakeIODataStream, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.AlertProtocol byte[] wrap()'>
+    <item name='org.conscrypt.OpenSSLX509CRLEntry java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLDSAPublicKey java.lang.String getAlgorithm()'>
+    <item name='org.conscrypt.OpenSSLDSAKeyPairGenerator java.security.KeyPair generateKeyPair()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.SSLServerSocketImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.HandshakeIODataStream byte[] getData(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.TrustedCertificateStore boolean isSystem(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -548,43 +335,34 @@
     <item name='org.conscrypt.OpenSSLServerSocketImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.Certificate engineGenerateCertificate(java.io.InputStream) 0'>
+    <item name='org.conscrypt.SSLRecordProtocol byte[] getChangeCipherSpecMesage(org.conscrypt.SSLSessionImpl)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi void engineSetCertificateEntry(java.lang.String, java.security.cert.Certificate) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.ServerHello void send(org.conscrypt.HandshakeIODataStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLContextImpl javax.net.ssl.SSLServerSocketFactory engineGetServerSocketFactory()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.TrustedCertificateStore boolean isUser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipher.Mode org.conscrypt.OpenSSLCipher.Mode valueOf(java.lang.String)'>
+    <item name='org.conscrypt.OpenSSLCipher.ARC4 java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509CRL org.conscrypt.OpenSSLX509CRL fromX509DerInputStream(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLDSAKeyPairGenerator java.security.KeyPair generateKeyPair()'>
+    <item name='org.conscrypt.OpenSSLCipher.ARC4 java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.ProtocolVersion boolean isSupported(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ProtocolVersion org.conscrypt.ProtocolVersion getByName(java.lang.String) 0'>
+    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.HandshakeProtocol void send(org.conscrypt.Message) 0'>
+    <item name='org.conscrypt.SSLSessionImpl org.conscrypt.SSLSessionImpl getNullSession()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECPublicKey java.security.spec.ECPoint getW()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipherRSA byte[] engineWrap(java.security.Key)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLMessageDigestJDK java.lang.Object clone()'>
+    <item name='org.conscrypt.TrustManagerFactoryImpl javax.net.ssl.TrustManager[] engineGetTrustManagers()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLECDHKeyAgreement int engineGenerateSecret(byte[], int) 0'>
@@ -593,30 +371,717 @@
     <item name='org.conscrypt.SSLParametersImpl void setEnabledProtocols(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate java.security.Principal getSubjectDN()'>
+    <item name='org.conscrypt.OpenSSLX509CRL java.util.List&lt;org.conscrypt.OpenSSLX509CRL&gt; fromPkcs7PemInputStream(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustedCertificateIndex java.security.cert.TrustAnchor findBySubjectAndPublicKey(java.security.cert.X509Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustManagerImpl void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.FileClientSessionCache org.conscrypt.SSLClientSessionCache usingDirectory(java.io.File)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
+    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustedCertificateStore boolean containsAlias(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.net.InetAddress, int)'>
+    <item name='org.conscrypt.OpenSSLKey javax.crypto.SecretKey getSecretKey(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi void engineSetCertificateEntry(java.lang.String, java.security.cert.Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLServerSocketImpl void setEnabledProtocols(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSessionImpl void removeValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECKeyPairGenerator java.security.KeyPair generateKeyPair()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSocketImpl void verifyCertificateChain(long[], java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECDHKeyAgreement javax.crypto.SecretKey engineGenerateSecret(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CertificateMessage CertificateMessage(org.conscrypt.HandshakeIODataStream, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CipherSuite org.conscrypt.CipherSuite[] getSupported()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateIndex java.security.cert.TrustAnchor findByIssuerAndSignature(java.security.cert.X509Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSocketImpl java.lang.String[] getSupportedProtocols()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSocketImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLInputStream byte[] read(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionState byte[] encrypt(byte, byte[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509Certificate java.math.BigInteger getSerialNumber()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.PinListEntry boolean chainIsNotPinned(java.util.List&lt;java.security.cert.X509Certificate&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateIndex java.security.cert.TrustAnchor index(java.security.cert.X509Certificate)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ServerHandshakeImpl void unwrapSSLv2(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientHello byte[] getRandom()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientSessionContext void sessionRemoved(javax.net.ssl.SSLSession) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLEngineImpl javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], int, int, java.nio.ByteBuffer)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.Appendable void append(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateIndex java.security.cert.TrustAnchor index(java.security.cert.X509Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher byte[] engineUpdate(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAPrivateKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientKeyExchange ClientKeyExchange(java.math.BigInteger) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLEngineDataStream byte[] getData(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.KeyManagerFactoryImpl javax.net.ssl.KeyManager[] engineGetKeyManagers()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509Certificate java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.NativeCrypto java.lang.String[] getSupportedProtocols()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRL byte[] getExtensionValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECPrivateKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi void engineStore(java.io.OutputStream, char[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.ARC4 void checkSupportedMode(org.conscrypt.OpenSSLCipher.Mode) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionStateTLS byte[] encrypt(byte, byte[], int, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.NativeCrypto java.lang.String[] getDefaultCipherSuites()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ServerHello ServerHello(java.security.SecureRandom, byte[], byte[], org.conscrypt.CipherSuite, byte) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.HandshakeIODataStream byte[] getMessages()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketWrapper void connect(java.net.SocketAddress, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAPublicKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLServerSocketFactoryImpl SSLServerSocketFactoryImpl(org.conscrypt.SSLParametersImpl) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLDSAPublicKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateStore boolean isUserAddedCertificate(java.security.cert.X509Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSignature void engineInitVerify(java.security.PublicKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CertificateVerify void send(org.conscrypt.HandshakeIODataStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509Certificate java.util.List&lt;org.conscrypt.OpenSSLX509Certificate&gt; fromPkcs7PemInputStream(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.X509PublicKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateStore java.security.cert.Certificate getCertificate(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAPublicKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLContextImpl javax.net.ssl.SSLSocketFactory engineGetSocketFactory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLEngine org.conscrypt.OpenSSLEngine getInstance(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRL java.util.List&lt;org.conscrypt.OpenSSLX509CRL&gt; fromPkcs7PemInputStream(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.AES void checkSupportedMode(org.conscrypt.OpenSSLCipher.Mode) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CertificateVerify CertificateVerify(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.Mode org.conscrypt.OpenSSLCipher.Mode valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRL javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.AES void checkSupportedPadding(org.conscrypt.OpenSSLCipher.Padding) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLContextImpl javax.net.ssl.SSLEngine engineCreateSSLEngine(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.Padding org.conscrypt.OpenSSLCipher.Padding valueOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSignature boolean engineVerify(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA byte[] engineWrap(java.security.Key) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CertPath java.util.List&lt;? extends java.security.cert.Certificate&gt; getCertificates()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509Certificate org.conscrypt.OpenSSLX509Certificate fromCertificate(java.security.cert.Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionStateSSLv3 ConnectionStateSSLv3(org.conscrypt.SSLSessionImpl) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRL org.conscrypt.OpenSSLX509CRL fromX509PemInputStream(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.NativeCrypto void setEnabledCipherSuites(long, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi boolean engineIsKeyEntry(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA int engineDoFinal(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA void engineSetPadding(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECPrivateKey OpenSSLECPrivateKey(java.security.spec.ECPrivateKeySpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLDSAPrivateKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLInputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLParametersImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA byte[] engineDoFinal(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRLEntry java.util.Date getRevocationDate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECDHKeyAgreement javax.crypto.SecretKey engineGenerateSecret(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionStateSSLv3 byte[] decrypt(byte, byte[], int, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.X509PublicKey java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientHello ClientHello(java.security.SecureRandom, byte[], byte[], org.conscrypt.CipherSuite[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLEngineImpl javax.net.ssl.SSLEngineResult.HandshakeStatus getHandshakeStatus()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.Key engineTranslateKey(java.security.Key)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.ARC4 java.lang.String getBaseCipherName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateIndex void index(java.security.cert.TrustAnchor) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientHello void send(org.conscrypt.HandshakeIODataStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.HandshakeProtocol void unwrap(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLContextImpl javax.net.ssl.SSLEngine engineCreateSSLEngine()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECPublicKey OpenSSLECPublicKey(java.security.spec.ECPublicKeySpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ServerKeyExchange void send(org.conscrypt.HandshakeIODataStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientHandshakeImpl void unwrapSSLv2(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.Mode org.conscrypt.OpenSSLCipher.Mode valueOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLDSAPublicKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSessionImpl java.lang.Object getValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSignature byte[] engineSign()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientKeyExchange void send(org.conscrypt.HandshakeIODataStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CipherSuite org.conscrypt.CipherSuite getByCode(byte, byte, byte)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CertificateRequest CertificateRequest(org.conscrypt.HandshakeIODataStream, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ServerHello ServerHello(org.conscrypt.HandshakeIODataStream, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CertificateRequest CertificateRequest(byte[], java.security.cert.X509Certificate[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionStateTLS ConnectionStateTLS(org.conscrypt.SSLSessionImpl) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.AlertProtocol byte[] wrap()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSignatureRawRSA void engineInitVerify(java.security.PublicKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.NativeCrypto int X509_NAME_hash(javax.security.auth.x500.X500Principal) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.ARC4 void checkSupportedPadding(org.conscrypt.OpenSSLCipher.Padding) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateStore void installCertificate(java.security.cert.X509Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketImpl void addHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLRecordProtocol byte[] wrap(byte, org.conscrypt.DataStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketImpl void connect(java.net.SocketAddress) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionStateSSLv3 byte[] decrypt(byte, byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRandom byte[] engineGenerateSeed(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSecretKey OpenSSLSecretKey(java.lang.String, org.conscrypt.OpenSSLKey) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLContextImpl javax.net.ssl.SSLSocketFactory engineGetSocketFactory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.HelloRequest void send(org.conscrypt.HandshakeIODataStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLMessageDigestJDK java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.NativeCrypto.SSLHandshakeCallbacks void clientCertificateRequested(byte[], byte[][]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateStore java.security.cert.X509Certificate findIssuer(java.security.cert.X509Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi java.util.Enumeration&lt;java.lang.String&gt; engineAliases()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLKey java.security.PublicKey getPublicKey()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECPrivateKey OpenSSLECPrivateKey(org.conscrypt.OpenSSLKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLKey java.security.PrivateKey getPrivateKey()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA byte[] engineUpdate(byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.Padding org.conscrypt.OpenSSLCipher.Padding valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSignatureRawRSA byte[] engineSign()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.DESEDE java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECPublicKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientHello ClientHello(org.conscrypt.HandshakeIODataStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionStateTLS byte[] decrypt(byte, byte[], int, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.HandshakeIODataStream byte[] getData(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECDHKeyAgreement void engineInit(java.security.Key, java.security.SecureRandom) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientSessionContext void putSession(javax.net.ssl.SSLSession) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSocketImplWrapper OpenSSLSocketImplWrapper(java.net.Socket, java.lang.String, int, boolean, org.conscrypt.SSLParametersImpl) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLDSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CertPinManager CertPinManager(java.lang.String, org.conscrypt.TrustedCertificateStore) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher int engineUpdate(byte[], int, int, byte[], int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ChainStrengthAnalyzer void check(java.security.cert.X509Certificate[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CertificateRequest void send(org.conscrypt.HandshakeIODataStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLEngine javax.crypto.SecretKey getSecretKeyById(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLClientSessionCache void putSessionData(javax.net.ssl.SSLSession, byte[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.AES java.lang.String getBaseCipherName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECPublicKey java.security.spec.ECPoint getW()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLMessageDigestJDK void engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CertPath byte[] getEncoded(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateIndex TrustedCertificateIndex(java.util.Set&lt;java.security.cert.TrustAnchor&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLRecordProtocol byte[] wrap(byte, byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateStore java.util.Set&lt;java.lang.String&gt; aliases()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLBIOInputStream OpenSSLBIOInputStream(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateStore java.util.Set&lt;java.lang.String&gt; userAliases()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRandom void engineNextBytes(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLRecordProtocol byte[] wrap(byte, org.conscrypt.DataStream) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateStore java.security.cert.Certificate getCertificate(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.lang.String[] getDefaultCipherSuites()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.DataStream byte[] getData(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionStateSSLv3 byte[] encrypt(byte, byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLMac void engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRL java.security.Principal getIssuerDN()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.Key engineTranslateKey(java.security.Key)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ServerHello ServerHello(java.security.SecureRandom, byte[], byte[], org.conscrypt.CipherSuite, byte) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLServerSocketImpl java.net.Socket accept()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.PinFailureLogger void writeToLog(java.lang.String, boolean, boolean, java.util.List&lt;java.security.cert.X509Certificate&gt;) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLDSAPrivateKey java.lang.String getAlgorithm()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSocketImpl void clientCertificateRequested(byte[], byte[][]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.HandshakeIODataStream void append(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.AES java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSecretKey org.conscrypt.OpenSSLKey getInstance(javax.crypto.SecretKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ProtocolVersion boolean isSupported(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSessionImpl javax.security.cert.X509Certificate[] getPeerCertificateChain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLSocketWrapper java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECDHKeyAgreement java.security.Key engineDoPhase(java.security.Key, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRLEntry java.math.BigInteger getSerialNumber()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA void engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi void engineSetKeyEntry(java.lang.String, byte[], java.security.cert.Certificate[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.NativeCrypto java.lang.String[] getDefaultProtocols()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CertPath java.security.cert.CertPath fromEncoding(java.io.InputStream, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ClientHello ClientHello(org.conscrypt.HandshakeIODataStream, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi boolean engineIsCertificateEntry(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLEngine org.conscrypt.OpenSSLEngine getInstance(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionState byte[] decrypt(byte, byte[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLClientSessionCache void putSessionData(javax.net.ssl.SSLSession, byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher byte[] engineWrap(java.security.Key) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRSAPublicKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.SSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher byte[] engineUpdate(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSocketImplWrapper void connect(java.net.SocketAddress, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECPublicKey org.conscrypt.OpenSSLKey getInstance(java.security.interfaces.ECPublicKey) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.CipherSuite org.conscrypt.CipherSuite getByCode(byte, byte)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher.DESEDE void checkSupportedPadding(org.conscrypt.OpenSSLCipher.Padding) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipher int engineUpdate(byte[], int, int, byte[], int) 3'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.NativeCrypto void setEnabledProtocols(long, java.lang.String[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.Key engineTranslateKey(java.security.Key) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRL boolean isRevoked(java.security.cert.Certificate) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLRandom void engineSetSeed(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.Certificate engineGenerateCertificate(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509CRL org.conscrypt.OpenSSLX509CRL fromX509DerInputStream(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.HandshakeProtocol void send(org.conscrypt.Message) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ProtocolVersion org.conscrypt.ProtocolVersion getByName(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ServerHelloDone void send(org.conscrypt.HandshakeIODataStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.ConnectionStateTLS byte[] encrypt(byte, byte[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLMessageDigestJDK byte[] engineDigest()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustManagerImpl void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi void engineDeleteEntry(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLCipherRSA byte[] engineWrap(java.security.Key)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.conscrypt.NativeCrypto java.lang.String[] checkEnabledCipherSuites(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -626,79 +1091,22 @@
     <item name='org.conscrypt.OpenSSLSessionImpl void putValue(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSecretKey org.conscrypt.OpenSSLKey getInstance(javax.crypto.SecretKey)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLCipher void engineSetPadding(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate java.util.Date getNotBefore()'>
+    <item name='org.conscrypt.ConnectionState byte[] encrypt(byte, byte[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLSessionImpl void removeValue(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLServerSocketImpl void setEnabledProtocols(java.lang.String[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ConnectionStateSSLv3 byte[] encrypt(byte, byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketImpl void verifyCertificateChain(long[], java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECDHKeyAgreement javax.crypto.SecretKey engineGenerateSecret(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate java.security.Principal getIssuerDN()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLDSAPrivateKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.HandshakeIODataStream byte[] getMessages()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRL java.util.List&lt;org.conscrypt.OpenSSLX509CRL&gt; fromPkcs7PemInputStream(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLMessageDigestJDK byte[] engineDigest()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.CertificateMessage CertificateMessage(org.conscrypt.HandshakeIODataStream, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate javax.security.auth.x500.X500Principal getSubjectX500Principal()'>
+    <item name='org.conscrypt.OpenSSLCipher.DESEDE java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLECKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLRSAPrivateCrtKey java.lang.String toString()'>
+    <item name='org.conscrypt.SSLServerSocketImpl java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLRecordProtocol byte[] wrap(byte, org.conscrypt.DataStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLContextImpl javax.net.ssl.SSLSocketFactory engineGetSocketFactory()'>
+    <item name='org.conscrypt.OpenSSLECPrivateKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustManagerImpl void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String) 0'>
@@ -707,415 +1115,238 @@
     <item name='org.conscrypt.PinListEntry PinListEntry(java.lang.String, org.conscrypt.TrustedCertificateStore) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.conscrypt.NativeCrypto java.lang.String[] checkEnabledProtocols(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.conscrypt.SSLSessionImpl javax.security.cert.X509Certificate[] getPeerCertificateChain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.conscrypt.OpenSSLX509Certificate java.util.List&lt;org.conscrypt.OpenSSLX509Certificate&gt; fromPkcs7PemInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustedCertificateIndex java.security.cert.TrustAnchor findByIssuerAndSignature(java.security.cert.X509Certificate) 0'>
+    <item name='org.conscrypt.OpenSSLCipher.AES java.lang.String getCipherName(int, org.conscrypt.OpenSSLCipher.Mode)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
+    <item name='org.conscrypt.OpenSSLECPublicKey org.conscrypt.OpenSSLKey getInstance(java.security.interfaces.ECPublicKey)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLMac void engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLRSAPrivateKey java.lang.String getAlgorithm()'>
+    <item name='org.conscrypt.OpenSSLX509CertPath java.security.cert.CertPath fromEncoding(java.io.InputStream, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.AES java.lang.String getBaseCipherName()'>
+    <item name='org.conscrypt.ConnectionState byte[] decrypt(byte, byte[], int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLDSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipher void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
+    <item name='org.conscrypt.OpenSSLServerSocketImpl java.net.Socket accept()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustedCertificateStore java.util.Set&lt;java.lang.String&gt; aliases()'>
+    <item name='org.conscrypt.OpenSSLCipher void engineInit(int, java.security.Key, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustedCertificateKeyStoreSpi java.security.cert.Certificate engineGetCertificate(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ConnectionState byte[] encrypt(byte, byte[]) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.HandshakeProtocol javax.net.ssl.SSLEngineResult.HandshakeStatus getStatus()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLCipherRSA java.security.Key engineUnwrap(byte[], java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.PinListEntry boolean chainIsNotPinned(java.util.List&lt;java.security.cert.X509Certificate&gt;) 0'>
+    <item name='org.conscrypt.TrustManagerImpl java.util.List&lt;java.security.cert.X509Certificate&gt; checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ServerHandshakeImpl void unwrapSSLv2(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLServerSocketImpl java.lang.String[] getSupportedProtocols()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ClientSessionContext void sessionRemoved(javax.net.ssl.SSLSession) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi java.util.Enumeration&lt;java.lang.String&gt; engineAliases()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustedCertificateIndex java.security.cert.TrustAnchor index(java.security.cert.X509Certificate) 0'>
+    <item name='org.conscrypt.CipherSuite java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.ServerHandshakeImpl void unwrap(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.conscrypt.OpenSSLECPrivateKey java.security.spec.ECParameterSpec getParams()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.conscrypt.NativeCrypto int X509_NAME_hash_old(javax.security.auth.x500.X500Principal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLCipherRSA void engineSetMode(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ClientKeyExchange ClientKeyExchange(java.math.BigInteger) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int)'>
+    <item name='org.conscrypt.SSLSocketImpl void connect(java.net.SocketAddress, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.HandshakeIODataStream void write(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
+    <item name='org.conscrypt.FileClientSessionCache org.conscrypt.SSLClientSessionCache usingDirectory(java.io.File)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLEngineImpl javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[], int, int)'>
+    <item name='org.conscrypt.OpenSSLDSAPublicKey java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ConnectionStateSSLv3 byte[] decrypt(byte, byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ServerHello ServerHello(java.security.SecureRandom, byte[], byte[], org.conscrypt.CipherSuite, byte) 0'>
+    <item name='org.conscrypt.OpenSSLX509CRL java.util.List&lt;org.conscrypt.OpenSSLX509CRL&gt; fromPkcs7DerInputStream(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.Key engineTranslateKey(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLSessionImpl void putValue(java.lang.String, java.lang.Object) 1'>
+    <item name='org.conscrypt.OpenSSLECGroupContext org.conscrypt.OpenSSLECGroupContext getInstance(java.security.spec.ECParameterSpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.ClientSessionContext javax.net.ssl.SSLSession getSession(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECGroupContext org.conscrypt.OpenSSLECGroupContext getInstance(java.security.spec.ECParameterSpec) 0'>
+    <item name='org.conscrypt.SSLSessionImpl void putValue(java.lang.String, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustedCertificateStore boolean isTrustAnchor(java.security.cert.X509Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLDSAPrivateKey java.lang.String getAlgorithm()'>
+    <item name='org.conscrypt.SSLEngineAppData void append(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRL java.security.Principal getIssuerDN()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustManagerImpl java.util.List&lt;java.security.cert.X509Certificate&gt; checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLServerSocketFactoryImpl SSLServerSocketFactoryImpl(org.conscrypt.SSLParametersImpl) 0'>
+    <item name='org.conscrypt.OpenSSLX509CertificateFactory java.util.Collection&lt;? extends java.security.cert.CRL&gt; engineGenerateCRLs(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLECPrivateKey org.conscrypt.OpenSSLKey getInstance(java.security.interfaces.ECPrivateKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustedCertificateStore boolean isUserAddedCertificate(java.security.cert.X509Certificate) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLX509Certificate org.conscrypt.OpenSSLX509Certificate fromX509PemInputStream(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLSignature void engineInitVerify(java.security.PublicKey) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.Padding org.conscrypt.OpenSSLCipher.Padding valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.DESEDE java.lang.String getBaseCipherName()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECPrivateKey org.conscrypt.OpenSSLKey getInstance(java.security.interfaces.ECPrivateKey)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECPublicKey java.security.spec.ECParameterSpec getParams()'>
+    <item name='org.conscrypt.OpenSSLSignatureRawRSA java.lang.Object engineGetParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLSessionImpl void removeValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustedCertificateStore java.util.Set&lt;java.lang.String&gt; allSystemAliases()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.SSLEngineImpl void setEnabledProtocols(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.SSLSessionImpl void putValue(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustedCertificateStore java.security.cert.Certificate getCertificate(java.lang.String) 0'>
+    <item name='org.conscrypt.TrustedCertificateStore java.util.List&lt;java.security.cert.X509Certificate&gt; getCertificateChain(java.security.cert.X509Certificate)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLInputStream byte[] read(int)'>
+    <item name='org.conscrypt.OpenSSLCipher void checkSupportedPadding(org.conscrypt.OpenSSLCipher.Padding) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate java.lang.String toString()'>
+    <item name='org.conscrypt.OpenSSLX509Certificate java.security.Principal getIssuerDN()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.NativeCrypto java.lang.String[] getDefaultProtocols()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRL java.util.List&lt;org.conscrypt.OpenSSLX509CRL&gt; fromPkcs7PemInputStream(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLEngine org.conscrypt.OpenSSLEngine getInstance(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.CipherSuite org.conscrypt.CipherSuite[] getSupported()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLContextImpl javax.net.ssl.SSLServerSocketFactory engineGetServerSocketFactory()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSignature byte[] engineSign()'>
+    <item name='org.conscrypt.SSLEngineImpl javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.Finished void send(org.conscrypt.HandshakeIODataStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.NativeCrypto java.lang.String[] getSupportedProtocols()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRL java.util.List&lt;org.conscrypt.OpenSSLX509CRL&gt; fromPkcs7DerInputStream(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.AES void checkSupportedMode(org.conscrypt.OpenSSLCipher.Mode) 0'>
+    <item name='org.conscrypt.SSLSocketWrapper void connect(java.net.SocketAddress) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.SSLSocketWrapper SSLSocketWrapper(java.net.Socket, java.lang.String, int, boolean, org.conscrypt.SSLParametersImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipher java.security.Key engineUnwrap(byte[], java.lang.String, int) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.CertificateVerify CertificateVerify(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLKey javax.crypto.SecretKey getSecretKey(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustedCertificateStore java.util.List&lt;java.security.cert.X509Certificate&gt; getCertificateChain(java.security.cert.X509Certificate)'>
+    <item name='org.conscrypt.OpenSSLSocketImplWrapper void connect(java.net.SocketAddress) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLRSAKeyPairGenerator void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ConnectionStateTLS byte[] decrypt(byte, byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.ServerSessionContext javax.net.ssl.SSLSession getSession(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipher.AES void checkSupportedPadding(org.conscrypt.OpenSSLCipher.Padding) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLEngineImpl javax.net.ssl.SSLEngineResult.HandshakeStatus getHandshakeStatus()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLECKeyPairGenerator void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECPrivateKey java.math.BigInteger getS()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.CipherSuite java.lang.String toString()'>
+    <item name='org.conscrypt.SSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.ProtocolVersion org.conscrypt.ProtocolVersion getByVersion(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECKeyFactory java.security.Key engineTranslateKey(java.security.Key)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLContextImpl javax.net.ssl.SSLEngine engineCreateSSLEngine(java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.Padding org.conscrypt.OpenSSLCipher.Padding valueOf(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509Certificate org.conscrypt.OpenSSLX509Certificate fromCertificate(java.security.cert.Certificate) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLCipher void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipherRSA byte[] engineWrap(java.security.Key) 0'>
+    <item name='org.conscrypt.OpenSSLECPrivateKey java.math.BigInteger getS()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLDSAKeyFactory java.security.Key engineTranslateKey(java.security.Key)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLDSAPublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRL org.conscrypt.OpenSSLX509CRL fromX509PemInputStream(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ConnectionStateSSLv3 ConnectionStateSSLv3(org.conscrypt.SSLSessionImpl) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.NativeCrypto void setEnabledCipherSuites(long, java.lang.String[]) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.CipherSuite org.conscrypt.CipherSuite getByCode(byte, byte)'>
+    <item name='org.conscrypt.OpenSSLDSAParams java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLServerSocketFactoryImpl OpenSSLServerSocketFactoryImpl(org.conscrypt.SSLParametersImpl) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustedCertificateStore java.util.Set&lt;java.lang.String&gt; userAliases()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.TrustedCertificateKeyStoreSpi boolean engineIsKeyEntry(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.ConnectionStateTLS byte[] encrypt(byte, byte[], int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.TrustedCertificateIndex void reset(java.util.Set&lt;java.security.cert.TrustAnchor&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipherRSA int engineDoFinal(byte[], int, int, byte[], int) 3'>
+    <item name='org.conscrypt.OpenSSLCipher.DESEDE java.lang.String getBaseCipherName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustedCertificateKeyStoreSpi boolean engineContainsAlias(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLRSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.OpenSSLX509Certificate void checkValidity(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.CertificateMessage void send(org.conscrypt.HandshakeIODataStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLCipherRSA void engineSetPadding(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.CipherSuite org.conscrypt.CipherSuite getByCode(byte, byte, byte)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLECPrivateKey OpenSSLECPrivateKey(java.security.spec.ECPrivateKeySpec) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.net.InetAddress, int)'>
+    <item name='org.conscrypt.OpenSSLSecretKey org.conscrypt.OpenSSLKey getInstance(javax.crypto.SecretKey)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.TrustedCertificateKeyStoreSpi java.security.Key engineGetKey(java.lang.String, char[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.SSLParametersImpl void setEnabledCipherSuites(java.lang.String[]) 0'>
+    <item name='org.conscrypt.HandshakeProtocol void unwrapSSLv2(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ConnectionStateSSLv3 byte[] decrypt(byte, byte[], int, int) 1'>
+    <item name='org.conscrypt.OpenSSLRSAKeyPairGenerator java.security.KeyPair generateKeyPair()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECPublicKey java.lang.String getFormat()'>
+    <item name='org.conscrypt.OpenSSLX509CRL java.util.Date getThisUpdate()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.conscrypt.OpenSSLX509Certificate java.util.Date getNotAfter()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.SSLSocketFactoryImpl java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ClientHello ClientHello(java.security.SecureRandom, byte[], byte[], org.conscrypt.CipherSuite[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketImpl java.lang.String[] getSupportedProtocols()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLX509CRL java.util.Date getNextUpdate()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSocketImpl void addHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener) 0'>
+    <item name='org.conscrypt.OpenSSLSocketFactoryImpl java.net.Socket createSocket(java.net.InetAddress, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.OpenSSLRSAKeyFactory java.security.Key engineTranslateKey(java.security.Key) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.TrustedCertificateIndex void index(java.security.cert.TrustAnchor) 0'>
+    <item name='org.conscrypt.OpenSSLSocketImpl void addHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.SSLRecordProtocol byte[] wrap(byte, byte[], int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ClientHello void send(org.conscrypt.HandshakeIODataStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLDSAPublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.conscrypt.CertificateRequest CertificateRequest(byte[], java.security.cert.X509Certificate[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLX509CertPath java.security.cert.CertPath fromEncoding(java.io.InputStream, java.lang.String)'>
+    <item name='org.conscrypt.OpenSSLX509Certificate java.util.Date getNotBefore()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.conscrypt.ConnectionStateSSLv3 byte[] encrypt(byte, byte[], int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLECPublicKey OpenSSLECPublicKey(java.security.spec.ECPublicKeySpec) 0'>
+    <item name='org.conscrypt.SSLSocketOutputStream void write(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLRSAKeyFactory T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 0'>
+    <item name='org.conscrypt.OpenSSLX509CertPath java.security.cert.CertPath fromEncoding(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.OpenSSLRSAPublicKey java.lang.String getAlgorithm()'>
+    <item name='org.conscrypt.OpenSSLX509Certificate java.util.List&lt;org.conscrypt.OpenSSLX509Certificate&gt; fromPkcs7DerInputStream(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.conscrypt.ServerKeyExchange void send(org.conscrypt.HandshakeIODataStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLCipher.Mode org.conscrypt.OpenSSLCipher.Mode valueOf(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.OpenSSLSessionImpl java.lang.Object getValue(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.conscrypt.NativeCrypto java.lang.String[] checkEnabledProtocols(java.lang.String[])'>
+    <item name='org.conscrypt.SSLServerSocketFactoryImpl java.net.ServerSocket createServerSocket()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/json/annotations.xml b/android-sdk-annotations/org/json/annotations.xml
index f7e90d8ae51..0e76ac2ac56 100644
--- a/android-sdk-annotations/org/json/annotations.xml
+++ b/android-sdk-annotations/org/json/annotations.xml
@@ -1,17 +1,14 @@
 <root>
-    <item name='org.json.JSONArray org.json.JSONObject getJSONObject(int)'>
+    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONStringer org.json.JSONStringer value(long)'>
+    <item name='org.json.JSONStringer org.json.JSONStringer endObject()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONTokener java.lang.String nextString(char)'>
+    <item name='org.json.JSONArray org.json.JSONArray put(double)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONTokener java.lang.String toString()'>
+    <item name='org.json.JSONStringer org.json.JSONStringer endArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONStringer org.json.JSONStringer value(java.lang.Object)'>
@@ -20,55 +17,67 @@
     <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.json.JSONTokener java.lang.String nextTo(char)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.json.JSONStringer org.json.JSONStringer array()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONStringer org.json.JSONStringer object()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONTokener java.lang.String nextTo(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONArray org.json.JSONArray put(int, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONStringer org.json.JSONStringer endArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONTokener org.json.JSONException syntaxError(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONArray java.lang.String join(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONTokener java.lang.String next(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONArray org.json.JSONArray put(boolean)'>
+    <item name='org.json.JSONArray org.json.JSONArray put(int, long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONArray java.lang.String getString(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONObject org.json.JSONObject putOpt(java.lang.String, java.lang.Object)'>
+    <item name='org.json.JSONStringer org.json.JSONStringer object()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONObject java.lang.Object get(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONArray org.json.JSONObject getJSONObject(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONObject org.json.JSONArray getJSONArray(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONArray org.json.JSONArray put(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONObject org.json.JSONObject accumulate(java.lang.String, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONObject org.json.JSONObject getJSONObject(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONObject org.json.JSONObject accumulate(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONStringer org.json.JSONStringer value(boolean)'>
+    <item name='org.json.JSONStringer org.json.JSONStringer key(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, long)'>
+    <item name='org.json.JSONTokener java.lang.String next(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONArray org.json.JSONArray put(long)'>
+    <item name='org.json.JSONArray org.json.JSONArray put(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONArray org.json.JSONArray put(int, boolean)'>
+    <item name='org.json.JSONArray java.lang.Object get(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONObject org.json.JSONObject getJSONObject(java.lang.String)'>
+    <item name='org.json.JSONArray org.json.JSONArray put(int, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONArray org.json.JSONArray getJSONArray(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONStringer org.json.JSONStringer value(double)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONTokener java.lang.String nextString(char)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONObject JSONObject(org.json.JSONTokener) 0'>
@@ -80,91 +89,82 @@
     <item name='org.json.JSONTokener java.lang.String nextTo(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONObject java.lang.Object get(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONArray org.json.JSONArray put(int, long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONArray org.json.JSONArray put(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONArray java.lang.Object get(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONArray org.json.JSONArray put(java.lang.Object)'>
+    <item name='org.json.JSONObject org.json.JSONObject putOpt(java.lang.String, java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONObject JSONObject(java.util.Map) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONArray org.json.JSONArray put(double)'>
+    <item name='org.json.JSONArray java.lang.String join(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONArray org.json.JSONArray put(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, double)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONTokener void skipPast(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.json.JSONArray org.json.JSONArray put(int, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.json.JSONArray JSONArray(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, long) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONStringer org.json.JSONStringer endObject()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.json.JSONStringer org.json.JSONStringer key(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONObject JSONObject(org.json.JSONObject, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONStringer org.json.JSONStringer key(java.lang.String)'>
+    <item name='org.json.JSONStringer org.json.JSONStringer value(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONArray org.json.JSONArray put(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONArray JSONArray(org.json.JSONTokener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, double)'>
+    <item name='org.json.JSONTokener org.json.JSONException syntaxError(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONObject org.json.JSONObject accumulate(java.lang.String, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONStringer org.json.JSONStringer value(double)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONObject org.json.JSONArray getJSONArray(java.lang.String)'>
+    <item name='org.json.JSONTokener java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONObject java.lang.String numberToString(java.lang.Number) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.json.JSONTokener java.lang.String nextTo(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.json.JSONArray org.json.JSONArray put(int, double)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONObject java.lang.String getString(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, double) 0'>
+    <item name='org.json.JSONStringer org.json.JSONStringer value(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONTokener java.lang.String nextTo(char)'>
+    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, boolean)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONArray org.json.JSONArray put(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.json.JSONObject org.json.JSONObject put(java.lang.String, double) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.json.JSONArray org.json.JSONObject toJSONObject(org.json.JSONArray) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.json.JSONArray org.json.JSONArray getJSONArray(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.json.JSONArray org.json.JSONArray put(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>
diff --git a/android-sdk-annotations/org/kxml2/io/annotations.xml b/android-sdk-annotations/org/kxml2/io/annotations.xml
index 579a2351c5f..0ee0d7c8834 100644
--- a/android-sdk-annotations/org/kxml2/io/annotations.xml
+++ b/android-sdk-annotations/org/kxml2/io/annotations.xml
@@ -1,5 +1,14 @@
 <root>
-    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer text(java.lang.String)'>
+    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer startTag(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.kxml2.io.KXmlSerializer void comment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer attribute(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.kxml2.io.KXmlSerializer void setProperty(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.kxml2.io.KXmlSerializer void setOutput(java.io.OutputStream, java.lang.String) 0'>
@@ -8,49 +17,70 @@
     <item name='org.kxml2.io.KXmlSerializer void setOutput(java.io.Writer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer startTag(java.lang.String, java.lang.String)'>
+    <item name='org.kxml2.io.KXmlParser void defineEntityReplacementText(java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.kxml2.io.KXmlParser void defineEntityReplacementText(java.lang.String, java.lang.String) 1'>
+    <item name='org.kxml2.io.KXmlSerializer boolean getFeature(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.kxml2.io.KXmlParser void setInput(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer text(char[], int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.kxml2.io.KXmlParser void setFeature(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.kxml2.io.KXmlParser java.lang.String getAttributeType(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.kxml2.io.KXmlParser char[] getTextCharacters(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.kxml2.io.KXmlParser void setProperty(java.lang.String, java.lang.Object) 0'>
+    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer text(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.kxml2.io.KXmlSerializer void ignorableWhitespace(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.kxml2.io.KXmlParser void setProperty(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer text(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.kxml2.io.KXmlParser java.lang.String getPositionDescription()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.kxml2.io.KXmlParser boolean getFeature(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.kxml2.io.KXmlSerializer void setFeature(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer startTag(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.kxml2.io.KXmlParser java.lang.Object getProperty(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer text(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer attribute(java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.kxml2.io.KXmlParser java.lang.String getPositionDescription()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer attribute(java.lang.String, java.lang.String, java.lang.String) 2'>
+    <item name='org.kxml2.io.KXmlSerializer java.lang.Object getProperty(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer endTag(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer text(char[], int, int)'>
+    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer attribute(java.lang.String, java.lang.String, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.kxml2.io.KXmlParser java.lang.String getAttributeType(int)'>
+    <item name='org.kxml2.io.KXmlSerializer org.xmlpull.v1.XmlSerializer attribute(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.kxml2.io.KXmlSerializer void startDocument(java.lang.String, java.lang.Boolean) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>
diff --git a/android-sdk-annotations/org/w3c/dom/annotations.xml b/android-sdk-annotations/org/w3c/dom/annotations.xml
new file mode 100644
index 00000000000..1567f221f7a
--- /dev/null
+++ b/android-sdk-annotations/org/w3c/dom/annotations.xml
@@ -0,0 +1,128 @@
+<root>
+    <item name='org.w3c.dom.Element org.w3c.dom.Attr setAttributeNodeNS(org.w3c.dom.Attr) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMConfiguration void setParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.NamedNodeMap org.w3c.dom.Node setNamedItemNS(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Text org.w3c.dom.Text splitText(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMConfiguration java.lang.Object getParameter(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Attr void setValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Document org.w3c.dom.Comment createComment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Element org.w3c.dom.Attr removeAttributeNode(org.w3c.dom.Attr) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Node org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMImplementation org.w3c.dom.DocumentType createDocumentType(java.lang.String, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Node org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Element void removeAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.CharacterData void setData(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Document org.w3c.dom.Element getElementById(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMImplementation java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.NamedNodeMap org.w3c.dom.Node setNamedItem(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.CharacterData java.lang.String substringData(int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.CharacterData java.lang.String getData()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Node boolean isSupported(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Node java.lang.Object getUserData(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Document org.w3c.dom.Node renameNode(org.w3c.dom.Node, java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Element org.w3c.dom.Attr setAttributeNode(org.w3c.dom.Attr) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Document org.w3c.dom.Node renameNode(org.w3c.dom.Node, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMImplementation org.w3c.dom.DocumentType createDocumentType(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMError org.w3c.dom.DOMLocator getLocation()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Node java.lang.Object setUserData(java.lang.String, java.lang.Object, org.w3c.dom.UserDataHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Element void setIdAttributeNode(org.w3c.dom.Attr, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.ProcessingInstruction void setData(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMConfiguration boolean canSetParameter(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Node org.w3c.dom.Node appendChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMImplementation boolean hasFeature(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMConfiguration void setParameter(java.lang.String, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Node org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMConfiguration org.w3c.dom.DOMStringList getParameterNames()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Node java.lang.Object getFeature(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMImplementation org.w3c.dom.Document createDocument(java.lang.String, java.lang.String, org.w3c.dom.DocumentType)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Document org.w3c.dom.Node importNode(org.w3c.dom.Node, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.DOMErrorHandler boolean handleError(org.w3c.dom.DOMError) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Element java.lang.String getAttribute(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Document org.w3c.dom.Text createTextNode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Document org.w3c.dom.CDATASection createCDATASection(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.Node org.w3c.dom.Node removeChild(org.w3c.dom.Node) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/android-sdk-annotations/org/w3c/dom/ls/annotations.xml b/android-sdk-annotations/org/w3c/dom/ls/annotations.xml
new file mode 100644
index 00000000000..28f5ea67384
--- /dev/null
+++ b/android-sdk-annotations/org/w3c/dom/ls/annotations.xml
@@ -0,0 +1,11 @@
+<root>
+    <item name='org.w3c.dom.ls.LSOutput void setEncoding(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.ls.LSSerializer org.w3c.dom.DOMConfiguration getDomConfig()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.w3c.dom.ls.LSSerializer boolean write(org.w3c.dom.Node, org.w3c.dom.ls.LSOutput) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
diff --git a/android-sdk-annotations/org/xmlpull/v1/annotations.xml b/android-sdk-annotations/org/xmlpull/v1/annotations.xml
index ba1a3e88408..e51ec8b3be2 100644
--- a/android-sdk-annotations/org/xmlpull/v1/annotations.xml
+++ b/android-sdk-annotations/org/xmlpull/v1/annotations.xml
@@ -1,14 +1,107 @@
 <root>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer text(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer void setOutput(java.io.Writer) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser java.lang.Object getProperty(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer void setFeature(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser void setFeature(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer void comment(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser java.lang.String getPositionDescription()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser void defineEntityReplacementText(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer endTag(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.xmlpull.v1.XmlPullParserFactory org.xmlpull.v1.XmlSerializer newSerializer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.xmlpull.v1.XmlPullParserFactory org.xmlpull.v1.XmlPullParserFactory newInstance(java.lang.String, java.lang.Class)'>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer text(char[], int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.xmlpull.v1.XmlPullParserFactory org.xmlpull.v1.XmlPullParser newPullParser()'>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer text(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer text(char[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer attribute(java.lang.String, java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser java.lang.String getAttributeNamespace(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer void ignorableWhitespace(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer attribute(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser char[] getTextCharacters(int[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer startTag(java.lang.String, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer void setOutput(java.io.OutputStream, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser void setInput(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.xmlpull.v1.XmlPullParserFactory org.xmlpull.v1.XmlPullParserFactory newInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.xmlpull.v1.XmlPullParser java.lang.String getAttributeName(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParserFactory org.xmlpull.v1.XmlPullParser newPullParser()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer void setProperty(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer void startDocument(java.lang.String, java.lang.Boolean) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer java.lang.Object getProperty(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser java.lang.String getAttributeType(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser void setProperty(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser boolean getFeature(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer attribute(java.lang.String, java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParser java.lang.String getNamespace()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer boolean getFeature(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlSerializer org.xmlpull.v1.XmlSerializer startTag(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.XmlPullParserFactory org.xmlpull.v1.XmlPullParserFactory newInstance(java.lang.String, java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
diff --git a/android-sdk-annotations/org/xmlpull/v1/sax2/annotations.xml b/android-sdk-annotations/org/xmlpull/v1/sax2/annotations.xml
index dd0e6388a68..a444329bb6e 100644
--- a/android-sdk-annotations/org/xmlpull/v1/sax2/annotations.xml
+++ b/android-sdk-annotations/org/xmlpull/v1/sax2/annotations.xml
@@ -2,7 +2,49 @@
     <item name='org.xmlpull.v1.sax2.Driver void parseSubTree(org.xmlpull.v1.XmlPullParser) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.xmlpull.v1.sax2.Driver java.lang.String getType(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.xmlpull.v1.sax2.Driver void parse(org.xml.sax.InputSource) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.xmlpull.v1.sax2.Driver int getIndex(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver boolean getFeature(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver int getIndex(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver void setContentHandler(org.xml.sax.ContentHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver int getIndex(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver java.lang.String getValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver void setProperty(java.lang.String, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver java.lang.String getType(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver java.lang.String getValue(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver java.lang.String getValue(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver java.lang.Object getProperty(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver void setFeature(java.lang.String, boolean) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.xmlpull.v1.sax2.Driver java.lang.String getType(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>