am 097b5991: am e5c99bf3: Merge "Use long for pointers in opengl/EGL classes"

* commit '097b59919f01d7b057d252d23cb96ce5fcdd9469':
  Use long for pointers in opengl/EGL classes