Merge change I7136220b into eclair

* changes:
  Fix egl cleanup code on context teardown.