resolved conflicts for merge of 9f4d00b9 to master

Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5

diff --cc core/combo/HOST_darwin-x86.mk
index c84e375,00b532f..229eaf0
--- 1/core/combo/HOST_darwin-x86.mk
--- 2/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@@ -69,7 -64,7 +69,7 @@@ HOST_SHLIB_SUFFIX := .dyli
  HOST_JNILIB_SUFFIX := .jnilib
  
  HOST_GLOBAL_CFLAGS += \
--      -include $(call select-android-config-h,darwin-x86)
++    -include $(call select-android-config-h,darwin-x86)
  ifneq ($(filter 10.7 10.7.% 10.8 10.8.%, $(build_mac_version)),)
         HOST_RUN_RANLIB_AFTER_COPYING := false
  else