resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce

diff --cc core/main.mk
index d568f8a,5d46c98..f6ab3ff
--- 1/core/main.mk
--- 2/core/main.mk
+++ b/core/main.mk
@@@ -759,12 -700,8 +759,12 @@@ ifdef is_sdk_buil
    $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \
      $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
        $(eval dangling_modules += $(m))))
 +  ifneq ($(TARGET_IS_64_BIT),true)
 +    # We know those 64-bit modules don't exist in the 32-bit SDK build.
 +    dangling_modules := $(filter-out %64,$(dangling_modules))
 +  endif
    ifneq ($(dangling_modules),)
-     $(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!)
 -    $(warning: Modules '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!)
++    $(warning: Modules '$(dangling_modules)' in PRODUCT_PACKAGES have nothing to install!)
    endif
    $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG), \
      $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\