resolved conflicts for merge of 70190a2b to klp-dev-plus-aosp

Change-Id: I9abcb4e258ad95912860dcae2973c4e417b05369

diff --cc core/combo/TARGET_linux-x86.mk
index 2fb45d9,a8a2b45..5f9e46b
--- 1/core/combo/TARGET_linux-x86.mk
--- 2/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@@ -134,8 -132,11 +134,9 @@@ TARGET_GLOBAL_CFLAGS += 
                        -funswitch-loops \
                        -funwind-tables \
                        -fstack-protector \
 -                      -m32
 -
 -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)
++                      -m32 \
 +                      -include $(android_config_h) \
 +                      -I $(dir $(android_config_h))
  
  # XXX: Not sure this is still needed. Must check with our toolchains.
  TARGET_GLOBAL_CPPFLAGS += \