am 391237dd: am 89a74292: Merge "emulator GLESv2: fixed (#16) NenaMark crashes on exit"

* commit '391237dda869e27a0d5e82888dfed0dfa87c3241':
  emulator GLESv2: fixed (#16) NenaMark crashes on exit