diff --git a/api/current.xml b/api/current.xml
index 57518a7ec656d..9ad6a86267d8e 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -250330,7 +250330,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
 </parameter>
 </method>
 </interface>
@@ -250370,6 +250370,16 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<field name="MAXIMUM_PACKED_VALUE"
+ type="int"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="MAXIMUM_VALUE"
  type="int"
  transient="false"
@@ -250751,6 +250761,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_CHECK_CAST_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="511"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_CMPG_DOUBLE"
  type="int"
  transient="false"
@@ -250850,6 +250871,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_CONST_CLASS_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="255"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_CONST_HIGH16"
  type="int"
  transient="false"
@@ -251103,6 +251135,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_FILLED_NEW_ARRAY_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1535"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_FILLED_NEW_ARRAY_RANGE"
  type="int"
  transient="false"
@@ -251345,6 +251388,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IGET_BOOLEAN_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2559"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IGET_BYTE"
  type="int"
  transient="false"
@@ -251356,6 +251410,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IGET_BYTE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2815"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IGET_CHAR"
  type="int"
  transient="false"
@@ -251367,6 +251432,28 @@
  visibility="public"
 >
 </field>
+<field name="OP_IGET_CHAR_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3071"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="OP_IGET_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1791"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IGET_OBJECT"
  type="int"
  transient="false"
@@ -251378,6 +251465,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IGET_OBJECT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2303"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IGET_OBJECT_QUICK"
  type="int"
  transient="false"
@@ -251411,6 +251509,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IGET_SHORT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3327"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IGET_WIDE"
  type="int"
  transient="false"
@@ -251422,6 +251531,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IGET_WIDE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2047"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IGET_WIDE_QUICK"
  type="int"
  transient="false"
@@ -251455,6 +251575,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_INSTANCE_OF_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="767"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_INT_TO_BYTE"
  type="int"
  transient="false"
@@ -251543,6 +251674,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_INVOKE_DIRECT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="9471"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_INVOKE_DIRECT_RANGE"
  type="int"
  transient="false"
@@ -251565,6 +251707,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_INVOKE_INTERFACE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="9983"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_INVOKE_INTERFACE_RANGE"
  type="int"
  transient="false"
@@ -251587,6 +251740,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_INVOKE_STATIC_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="9727"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_INVOKE_STATIC_RANGE"
  type="int"
  transient="false"
@@ -251609,6 +251773,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_INVOKE_SUPER_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="9215"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_INVOKE_SUPER_QUICK"
  type="int"
  transient="false"
@@ -251653,6 +251828,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_INVOKE_VIRTUAL_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="8959"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_INVOKE_VIRTUAL_QUICK"
  type="int"
  transient="false"
@@ -251708,6 +251894,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IPUT_BOOLEAN_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4351"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IPUT_BYTE"
  type="int"
  transient="false"
@@ -251719,6 +251916,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IPUT_BYTE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4607"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IPUT_CHAR"
  type="int"
  transient="false"
@@ -251730,6 +251938,28 @@
  visibility="public"
 >
 </field>
+<field name="OP_IPUT_CHAR_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4863"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="OP_IPUT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3583"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IPUT_OBJECT"
  type="int"
  transient="false"
@@ -251741,6 +251971,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IPUT_OBJECT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4095"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IPUT_OBJECT_QUICK"
  type="int"
  transient="false"
@@ -251774,6 +252015,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IPUT_SHORT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="5119"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IPUT_WIDE"
  type="int"
  transient="false"
@@ -251785,6 +252037,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_IPUT_WIDE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3839"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_IPUT_WIDE_QUICK"
  type="int"
  transient="false"
@@ -252170,6 +252433,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_NEW_ARRAY_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1279"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_NEW_INSTANCE"
  type="int"
  transient="false"
@@ -252181,6 +252455,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_NEW_INSTANCE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1023"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_NOP"
  type="int"
  transient="false"
@@ -252489,6 +252774,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SGET_BOOLEAN_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="6143"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SGET_BYTE"
  type="int"
  transient="false"
@@ -252500,6 +252796,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SGET_BYTE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="6399"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SGET_CHAR"
  type="int"
  transient="false"
@@ -252511,6 +252818,28 @@
  visibility="public"
 >
 </field>
+<field name="OP_SGET_CHAR_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="6655"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="OP_SGET_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="5375"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SGET_OBJECT"
  type="int"
  transient="false"
@@ -252522,6 +252851,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SGET_OBJECT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="5887"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SGET_SHORT"
  type="int"
  transient="false"
@@ -252533,6 +252873,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SGET_SHORT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="6911"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SGET_WIDE"
  type="int"
  transient="false"
@@ -252544,6 +252895,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SGET_WIDE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="5631"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SGET_WIDE_VOLATILE"
  type="int"
  transient="false"
@@ -252698,6 +253060,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SPUT_BOOLEAN_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="7935"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SPUT_BYTE"
  type="int"
  transient="false"
@@ -252709,6 +253082,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SPUT_BYTE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="8191"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SPUT_CHAR"
  type="int"
  transient="false"
@@ -252720,6 +253104,28 @@
  visibility="public"
 >
 </field>
+<field name="OP_SPUT_CHAR_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="8447"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="OP_SPUT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="7167"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SPUT_OBJECT"
  type="int"
  transient="false"
@@ -252731,6 +253137,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SPUT_OBJECT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="7679"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SPUT_SHORT"
  type="int"
  transient="false"
@@ -252742,6 +253159,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SPUT_SHORT_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="8703"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SPUT_WIDE"
  type="int"
  transient="false"
@@ -252753,6 +253181,17 @@
  visibility="public"
 >
 </field>
+<field name="OP_SPUT_WIDE_JUMBO"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="7423"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="OP_SPUT_WIDE_VOLATILE"
  type="int"
  transient="false"
@@ -367094,9 +367533,9 @@
 >
 <parameter name="buf" type="byte[]">
 </parameter>
-<parameter name="off" type="int">
+<parameter name="offset" type="int">
 </parameter>
-<parameter name="nbytes" type="int">
+<parameter name="byteCount" type="int">
 </parameter>
 </method>
 </class>
@@ -367178,9 +367617,9 @@
 >
 <parameter name="buf" type="byte[]">
 </parameter>
-<parameter name="off" type="int">
+<parameter name="offset" type="int">
 </parameter>
-<parameter name="nbytes" type="int">
+<parameter name="byteCount" type="int">
 </parameter>
 </method>
 </class>
@@ -367398,9 +367837,9 @@
 >
 <parameter name="buf" type="byte[]">
 </parameter>
-<parameter name="off" type="int">
+<parameter name="offset" type="int">
 </parameter>
-<parameter name="nbytes" type="int">
+<parameter name="byteCount" type="int">
 </parameter>
 </method>
 <method name="end"
@@ -367523,7 +367962,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="buf" type="byte[]">
+<parameter name="dictionary" type="byte[]">
 </parameter>
 </method>
 <method name="setDictionary"
@@ -367538,9 +367977,9 @@
 >
 <parameter name="buf" type="byte[]">
 </parameter>
-<parameter name="off" type="int">
+<parameter name="offset" type="int">
 </parameter>
-<parameter name="nbytes" type="int">
+<parameter name="byteCount" type="int">
 </parameter>
 </method>
 <method name="setInput"
@@ -367568,9 +368007,9 @@
 >
 <parameter name="buf" type="byte[]">
 </parameter>
-<parameter name="off" type="int">
+<parameter name="offset" type="int">
 </parameter>
-<parameter name="nbytes" type="int">
+<parameter name="byteCount" type="int">
 </parameter>
 </method>
 <method name="setLevel"
@@ -368098,9 +368537,9 @@
 >
 <parameter name="buf" type="byte[]">
 </parameter>
-<parameter name="off" type="int">
+<parameter name="offset" type="int">
 </parameter>
-<parameter name="nbytes" type="int">
+<parameter name="byteCount" type="int">
 </parameter>
 <exception name="DataFormatException" type="java.util.zip.DataFormatException">
 </exception>
@@ -368148,7 +368587,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="buf" type="byte[]">
+<parameter name="dictionary" type="byte[]">
 </parameter>
 </method>
 <method name="setDictionary"
@@ -368161,11 +368600,11 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="buf" type="byte[]">
+<parameter name="dictionary" type="byte[]">
 </parameter>
-<parameter name="off" type="int">
+<parameter name="offset" type="int">
 </parameter>
-<parameter name="nbytes" type="int">
+<parameter name="byteCount" type="int">
 </parameter>
 </method>
 <method name="setInput"
@@ -368193,9 +368632,9 @@
 >
 <parameter name="buf" type="byte[]">
 </parameter>
-<parameter name="off" type="int">
+<parameter name="offset" type="int">
 </parameter>
-<parameter name="nbytes" type="int">
+<parameter name="byteCount" type="int">
 </parameter>
 </method>
 </class>
@@ -372711,7 +373150,7 @@
 </parameter>
 <parameter name="offset" type="int">
 </parameter>
-<parameter name="len" type="int">
+<parameter name="byteCount" type="int">
 </parameter>
 </constructor>
 <method name="getIV"