resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp

Change-Id: Ic490104e9b7f01df5ea6404b3b5bab733fa46812

diff --cc libs/gui/Android.mk
index 89a24ca,635020e..799b2b5
--- 1/libs/gui/Android.mk
--- 2/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@@ -94,16 -93,6 +94,10 @@@ ifeq ($(TARGET_BOARD_PLATFORM), tegra3
        LOCAL_CFLAGS += -DDONT_USE_FENCE_SYNC
  endif
  
- ifeq ($(BOARD_ENABLE_GPU_PROTECTED_CONTENT),true)
-       LOCAL_CFLAGS += -DENABLE_GPU_PROTECTED_CONTENT=true
- else
-       LOCAL_CFLAGS += -DENABLE_GPU_PROTECTED_CONTENT=false
- endif
- 
 +ifeq ($(TARGET_BOARD_HAS_NO_SURFACE_FLINGER), true)
 +      LOCAL_CFLAGS += -DHAVE_NO_SURFACE_FLINGER
 +endif
 +
  include $(BUILD_SHARED_LIBRARY)
  
  ifeq (,$(ONE_SHOT_MAKEFILE))