Merge "Make GLSurfaceView handle eglSwapBuffers errors more robustly."