resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp

Change-Id: I336f9e6859dce3bb18224b3340837474319c809c

diff --cc core/binary.mk
index 3358544,452fbab..48d1ba7
--- 1/core/binary.mk
--- 2/core/binary.mk
+++ b/core/binary.mk
@@@ -48,26 -19,12 +48,32 @@@ ifeq ($(strip $(LOCAL_NO_FDO_SUPPORT)),
  endif
  
  ###########################################################
+ ## Explicitly declare assembly-only __ASSEMBLY__ macro for
+ ## assembly source
+ ###########################################################
+ LOCAL_ASFLAGS += -D__ASSEMBLY__
+ 
+ ###########################################################
 +## Define PRIVATE_ variables from global vars
 +###########################################################
 +ifdef LOCAL_NDK_VERSION
 +my_target_project_includes :=
 +my_target_c_inclues := $(my_ndk_version_root)/usr/include
 +# TODO: more reliable way to remove platform stuff.
 +my_target_global_cflags := $(filter-out -include -I system/%, $(TARGET_GLOBAL_CFLAGS))
 +my_target_global_cppflags := $(filter-out -include -I system/%, $(TARGET_GLOBAL_CPPFLAGS))
 +else
 +my_target_project_includes := $(TARGET_PROJECT_INCLUDES)
 +my_target_c_inclues := $(TARGET_C_INCLUDES)
 +my_target_global_cflags := $(TARGET_GLOBAL_CFLAGS)
 +my_target_global_cppflags := $(TARGET_GLOBAL_CPPFLAGS)
 +endif
 +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_PROJECT_INCLUDES := $(my_target_project_includes)
 +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_C_INCLUDES := $(my_target_c_inclues)
 +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CFLAGS := $(my_target_global_cflags)
 +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags)
 +
 +###########################################################
  ## Define PRIVATE_ variables used by multiple module types
  ###########################################################
  $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_DEFAULT_COMPILER_FLAGS := \