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

* commit 'f018560cb57e47c3e4bc542e4c596c4d3be3d4c4':
  Fix EGL JNI bugs Bug #3461349