Merge change 20677

* changes:
  workaround a bug in the SGX driver that would prevent eglGetConfig to work properly