diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index af271b2..eade2e2 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -90,7 +90,7 @@
 endif
 
 LOCAL_CFLAGS += -fvisibility=hidden -Werror=format
-LOCAL_CFLAGS += -std=c++1y
+LOCAL_CFLAGS += -std=c++11
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
@@ -108,8 +108,6 @@
 
 LOCAL_MODULE:= libsurfaceflinger
 
-include external/libcxx/libcxx.mk
-
 include $(BUILD_SHARED_LIBRARY)
 
 ###############################################################