am 3c249da7: am 21e799ed: am e9e50b57: Merge change I7136220b into eclair

Merge commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570'

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