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

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