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

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