am 25b81110: Merge "Fix EGL JNI bugs Bug #3461349" into honeycomb-mr1

* commit '25b81110b1a4d8882727ebdb8aef523f108b53fd':
  Fix EGL JNI bugs Bug #3461349