am d9be16f9: Merge "Fix OpenGL stub exception handling."

* commit 'd9be16f920f7c2581fda3ca495c1e6fc88857a6c':
  Fix OpenGL stub exception handling.