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

Merge commit '21e799ed62d4fca56fc472acef2995fa2235c0c1' into eclair-mr2-plus-aosp

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