diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 902aecaf4..d970a33b2 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -46,7 +46,8 @@ ifeq ($(TARGET_BOARD_PLATFORM), s5pc110)
 	LOCAL_CFLAGS += -DUSE_FENCE_SYNC
 endif
 ifeq ($(TARGET_BOARD_PLATFORM), exynos5)
-	LOCAL_CFLAGS += -DUSE_FENCE_SYNC
+	LOCAL_CFLAGS += -DUSE_NATIVE_FENCE_SYNC
+	LOCAL_CFLAGS += -DUSE_WAIT_SYNC
 endif
 ifneq ($(filter generic%,$(TARGET_DEVICE)),)
     # Emulator build
diff --git a/libs/gui/CleanSpec.mk b/libs/gui/CleanSpec.mk
index 17136946f..0d082915d 100644
--- a/libs/gui/CleanSpec.mk
+++ b/libs/gui/CleanSpec.mk
@@ -48,3 +48,4 @@
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
 $(call add-clean-step, find $(PRODUCT_OUT) -type f -name "libgui*" -print0 | xargs -0 rm -f)
+$(call add-clean-step, rm -rf $PRODUCT_OUT/obj/SHARED_LIBRARIES/libgui_intermediates)