Merge commit 'goog/master_gl' into merge_master_gl
diff --git a/standalone/main.cpp b/standalone/main.cpp
index 5e7ad76..31d0c59 100644
--- a/standalone/main.cpp
+++ b/standalone/main.cpp
@@ -4,7 +4,7 @@
 #include <GLES/gl.h>
 #include <pthread.h>
 #include <ui/EventHub.h>
-#include <ui/EGLDisplaySurface.h>
+#include <ui/FramebufferNativeWindow.h>
 
 extern void AndroidInitArgs(int argc, char** argv);
 extern int AndroidInit();