resolved conflicts for 953981db to stage-aosp-master

Change-Id: Ic1003a594ac5e5e91b124f249a569fb81123e973

diff --cc core/binary.mk
Simple merge

diff --cc core/definitions.mk
Simple merge

diff --cc core/executable_prefer_symlink.mk
index fc97ad3,888db88..931550f
--- 1/core/executable_prefer_symlink.mk
--- 2/core/executable_prefer_symlink.mk
+++ b/core/executable_prefer_symlink.mk
@@@ -39,10 -39,7 +39,10 @@@ $(my_symlink): PRIVATE_SRC_BINARY_NAME 
    endif
  endif
  
 -$(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE_DEP)
 +# $(my_symlink) doesn't need to depend on $(PRIVATE_SRC_BINARY_NAME): we can generate symlink to nonexistent file.
 +# If you add the dependency, make would compare the timestamp of a file against that of its symlink:
 +# they are always equal, because make follows symlink.
- $(my_symlink): $(LOCAL_MODULE_MAKEFILE)
++$(my_symlink): $(LOCAL_MODULE_MAKEFILE_DEP)
        @echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)"
        @mkdir -p $(dir $@)
        @rm -rf $@

diff --cc core/java.mk
Simple merge

diff --cc core/prebuilt_internal.mk
index 0406353,2388ab9..034b5ec
--- 1/core/prebuilt_internal.mk
--- 2/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@@ -312,7 -304,7 +312,7 @@@ endif # TARGET JAVA_LIBRARIE
  
  ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)
  $(intermediates.COMMON)/classes.jack : PRIVATE_JILL_FLAGS:=$(LOCAL_JILL_FLAGS)
- $(intermediates.COMMON)/classes.jack : $(my_src_jar) $(LOCAL_MODULE_MAKEFILE) \
 -$(intermediates.COMMON)/classes.jack : $(my_prebuilt_src_file) $(LOCAL_MODULE_MAKEFILE_DEP) \
++$(intermediates.COMMON)/classes.jack : $(my_src_jar) $(LOCAL_MODULE_MAKEFILE_DEP) \
          $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK_JAR) $(JACK_LAUNCHER_JAR)
        $(transform-jar-to-jack)