Merge "Improve eglSwapBuffers error handling."