Merge "Use long for pointers in opengl/EGL classes"