resolve merge conflicts of 7354c0e to nyc-mr1-dev

Change-Id: I19693f5459794b71decfae4507fb2742c74f7c41

diff --cc squashfs_utils/mksquashfsimage.sh
index 9dae51b,05ca4e0..74c612d
--- 1/squashfs_utils/mksquashfsimage.sh
--- 2/squashfs_utils/mksquashfsimage.sh
+++ b/squashfs_utils/mksquashfsimage.sh
@@@ -5,7 -5,7 +5,7 @@@
  function usage() {
  cat<<EOT
  Usage:
- ${0##*/} SRC_DIR OUTPUT_FILE [-s] [-m MOUNT_POINT] [-d PRODUCT_OUT] [-C FS_CONFIG ] [-c FILE_CONTEXTS] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT] [-t COMPRESS_THRESHOLD]
 -${0##*/} SRC_DIR OUTPUT_FILE [-s] [-m MOUNT_POINT] [-d PRODUCT_OUT] [-C FS_CONFIG ] [-c FILE_CONTEXTS] [-B BLOCK_MAP_FILE] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT]
++${0##*/} SRC_DIR OUTPUT_FILE [-s] [-m MOUNT_POINT] [-d PRODUCT_OUT] [-C FS_CONFIG ] [-c FILE_CONTEXTS] [-B BLOCK_MAP_FILE] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT] [-t COMPRESS_THRESHOLD]
  EOT
  }
  
@@@ -96,11 -98,8 +105,11 @@@ f
  if [ -n "$BLOCK_SIZE" ]; then
    OPT="$OPT -b $BLOCK_SIZE"
  fi
 +if [ -n "$COMPRESS_THRESHOLD" ]; then
 +  OPT="$OPT -t $COMPRESS_THRESHOLD"
 +fi
  
- MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR/ $OUTPUT_FILE -no-progress -comp $COMPRESSOR $COMPRESSOR_OPT -no-exports -noappend -no-recovery -android-fs-config -no-fragments $OPT"
+ MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR/ $OUTPUT_FILE -no-progress -comp $COMPRESSOR $COMPRESSOR_OPT -no-exports -noappend -no-recovery -no-fragments -no-duplicates -android-fs-config $OPT"
  echo $MAKE_SQUASHFS_CMD
  $MAKE_SQUASHFS_CMD