Merge "Fix EGL JNI bugs Bug #3461349" into honeycomb-mr1