resolved conflicts for merge of ee3d4d49 to mnc-dev

Change-Id: Ibfa043e2a7400e659f0355bcd139352b02a058e9

diff --cc squashfs_utils/mksquashfsimage.sh
index dab80ba,0686092..260a0fd
--- 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] [-c FILE_CONTEXTS] [-b BLOCK_SIZE]
 -${0##*/} SRC_DIR OUTPUT_FILE [-m MOUNT_POINT] [-c FILE_CONTEXTS] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT]
++${0##*/} SRC_DIR OUTPUT_FILE [-s] [-m MOUNT_POINT] [-c FILE_CONTEXTS] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT]
  EOT
  }
  
@@@ -59,10 -66,9 +72,10 @@@ if [ -n "$BLOCK_SIZE" ]; the
    OPT="$OPT -b $BLOCK_SIZE"
  fi
  
- MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR/ $OUTPUT_FILE -no-progress -comp lz4 -Xhc -no-exports -noappend -no-recovery -android-fs-config $OPT"
 -MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR $OUTPUT_FILE -no-progress -comp $COMPRESSOR $COMPRESSOR_OPT -no-exports -noappend -no-recovery -android-fs-config $OPT"
++MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR/ $OUTPUT_FILE -no-progress -comp $COMPRESSOR $COMPRESSOR_OPT -no-exports -noappend -no-recovery -android-fs-config $OPT"
  echo $MAKE_SQUASHFS_CMD
  $MAKE_SQUASHFS_CMD
 +
  if [ $? -ne 0 ]; then
      exit 4
  fi