diff --git a/tools/emulator/opengl/host/libs/Translator/EGL/Android.mk b/tools/emulator/opengl/host/libs/Translator/EGL/Android.mk
index 9fcf9ceb7..1109f121e 100644
--- a/tools/emulator/opengl/host/libs/Translator/EGL/Android.mk
+++ b/tools/emulator/opengl/host/libs/Translator/EGL/Android.mk
@@ -8,7 +8,7 @@ OS_SRCS:=
 
 ifeq ($(HOST_OS),linux)
     OS_SRCS = EglX11Api.cpp
-     LOCAL_LDLIBS += -lX11 -lGL -ldl -lpthread
+    LOCAL_LDLIBS += -lX11 -lGL -ldl -lpthread
 endif
 
 ifeq ($(HOST_OS),darwin)
diff --git a/tools/emulator/opengl/host/libs/Translator/GLcommon/Android.mk b/tools/emulator/opengl/host/libs/Translator/GLcommon/Android.mk
index 9ad9c3175..78d8e504c 100644
--- a/tools/emulator/opengl/host/libs/Translator/GLcommon/Android.mk
+++ b/tools/emulator/opengl/host/libs/Translator/GLcommon/Android.mk
@@ -22,6 +22,8 @@ LOCAL_SRC_FILES :=           \
 ifeq ($(HOST_OS),linux)
 #    $(call emugl-export,LDFLAGS,-Wl,--whole-archive)
     $(call emugl-export,LDLIBS,-lGL -ldl)
+    GL_COMMON_LINKER_FLAGS := -Wl,-Bsymbolic
+    $(call emugl-export,LDFLAGS,$(GL_COMMON_LINKER_FLAGS))
 endif
 
 ifeq ($(HOST_OS),windows)