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

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