Merge changes 20497,20498,20499

* changes:
  minor code clean-up
  added EGLUtils::strerror
  better error handling