resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev

diff --cc core/Makefile
index 9a432da,9094303..8ff1111
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -679,12 -697,14 +679,16 @@@ INTERNAL_USERIMAGES_DEPS += $(MKEXTUSER
  ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
  INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS)
  endif
 -else
 -INTERNAL_USERIMAGES_DEPS := $(MKYAFFS2)
 +endif
 +
 +ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)
 +INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG)
  endif
  
+ ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)
+ INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG)
+ endif
+ 
  INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))
  
  ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY))