diff --git a/external/android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp b/external/android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp
index fdcf451..c567efd 100644
--- a/external/android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp
+++ b/external/android-emugl/host/libs/Translator/EGL/EglOsApi_glx.cpp
@@ -25,6 +25,10 @@
 #include <string.h>
 #include <X11/Xlib.h>
 #include <GL/glx.h>
+#if defined(Status)
+// undef to address conflict between X11 symbol and protobuf
+#undef Status
+#endif
 
 namespace {