Merge change 27168 into eclair

* changes:
  Use EGLUtils to simplify choosing a configuration.