Merge changes Id3a4a573,I7adf4ef0

* changes:
  eglTerminate() now actually frees up all active egl objects
  refactor EGL source code