Upgrade cglib to 3.1, fix ASM5 breakages

This now passes internal Google tests.
I had to upgrade cglib to 3.1 to fix JUnit breakages
that are triggered by ASM 5. I also had to revert the
DevMode 'JavaScriptHost.checkNotNull' change which was
never merged into the Google branch.

Change-Id: Ic41d597fc91179f610705884aeb64f5de8f72b13

dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteJsniMethods.java

diff --git a/dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteJsniMethods.java b/dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteJsniMethods.java
index 80eeeaf..868dc9b 100644
--- a/dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteJsniMethods.java
+++ b/dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteJsniMethods.java
@@ -206,7 +206,7 @@
 
     public MyMethodAdapter(MethodVisitor mv, int access, String name,
         String desc) {
-      super(mv, access, name, desc);
+      super(Opcodes.ASM5, mv, access, name, desc);
       this.descriptor = desc;
       this.name = name;
       isStatic = (access & Opcodes.ACC_STATIC) != 0;
@@ -255,13 +255,6 @@
         visitInsn(Opcodes.ACONST_NULL);
       } else {
         loadThis();
-        // Ensure the instance method is not invoked against null, otherwise
-        // JS's apply will turn it into the window object. See Issue 3069.
-        visitMethodInsn(
-            Opcodes.INVOKESTATIC,
-            "com/google/gwt/dev/shell/JavaScriptHost",
-            "checkNotNull",
-            "(Ljava/lang/Object;)Ljava/lang/Object;", false);
       }
       // Stack is at 2
 

user/build.xml

diff --git a/user/build.xml b/user/build.xml
index e22e985..c0c8f3d 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -51,7 +51,7 @@
     <pathelement location="test-super"/>
     <pathelement location="test_i18n_${gwt.i18n.test.InnerClassChar}"/>
     <pathelement location="${gwt.tools.lib}/apache/log4j/log4j-1.2.16.jar"/>
-    <pathelement location="${gwt.tools.lib}/cglib/cglib-2.2.jar"/>
+    <pathelement location="${gwt.tools.lib}/cglib/cglib-3.1.jar"/>
     <pathelement location="${gwt.tools.lib}/mockito/1.9.5/mockito-all-1.9.5.jar"/>
     <pathelement location="${gwt.tools.lib}/objenesis/objenesis-1.2.jar"/>
     <pathelement location="${gwt.tools.lib}/objectweb/asm-5.0.3/lib/asm-all-5.0.3.jar"/>