am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"

* commit '8a63c34bb0f0cf25051c6eeb49c21476258fadfb':
  Use long to store pointers in GLES_JNI/EGL classes