Merge "Always start jack server before first call to jack"

diff --cc core/java.mk
Simple merge

diff --cc core/main.mk
Simple merge

diff --cc core/prebuilt_internal.mk
index b0af228,2dd392b..601a79c
--- 1/core/prebuilt_internal.mk
--- 2/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@@ -325,14 -322,9 +325,14 @@@ 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_DEP) \
-         $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK)
+         $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK) | setup-jack-server
        $(transform-jar-to-jack)
  
 +# Update timestamps of .toc files for prebuilts so dependents will be
 +# always rebuilt.
 +$(intermediates.COMMON)/classes.dex.toc: $(intermediates.COMMON)/classes.jack
 +      touch $@
 +
  endif # JAVA_LIBRARIES
  
  $(built_module) : $(LOCAL_MODULE_MAKEFILE_DEP) $(LOCAL_ADDITIONAL_DEPENDENCIES)