am e9e50b57: Merge change I7136220b into eclair

Merge commit 'e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8' into eclair-mr2

* commit 'e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8':
  Fix egl cleanup code on context teardown.