Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"