resolved conflicts for merge of eec386a4 to master

Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266

diff --cc core/package_internal.mk
index 4dbb1ac,016e23f..ecc2a95
--- 1/core/package_internal.mk
--- 2/core/package_internal.mk
+++ b/core/package_internal.mk
@@@ -429,10 -402,6 +429,9 @@@ ifeq ($(full_classes_jar),
  else
        $(add-dex-to-package)
  endif
-       $(sign-package)
 +ifdef LOCAL_JACK_ENABLED
 +      $(add-carried-jack-resources)
 +endif
  ifdef LOCAL_DEX_PREOPT
  ifneq (nostripping,$(LOCAL_DEX_PREOPT))
        $(call dexpreopt-remove-classes.dex,$@)

diff --cc core/prebuilt_internal.mk
Simple merge