resolved conflicts for merge of 3e91f5ad to jb-mr1-dev

Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db

diff --cc core/combo/TARGET_linux-x86.mk
index 1f6f96d,9a6e08e..96577f1
--- 1/core/combo/TARGET_linux-x86.mk
--- 2/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@@ -93,11 -93,9 +93,12 @@@ TARGET_GLOBAL_CFLAGS += 
                        -fno-short-enums \
                        -fstrict-aliasing \
                        -funswitch-loops \
-                       -funwind-tables
+                       -funwind-tables \
 -                      -fstack-protector \
 -                      -include $(call select-android-config-h,target_linux-x86)
++                      -fstack-protector
 +
 +android_config_h := $(call select-android-config-h,target_linux-x86)
 +TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
 +TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)
  
  # XXX: Not sure this is still needed. Must check with our toolchains.
  TARGET_GLOBAL_CPPFLAGS += \