resolve merge conflicts of 041bdd8 to nyc-mr1-dev

Change-Id: I8b9b227f8afedb1eb77de8be9de689e3c621003e

diff --cc squashfs_utils/mksquashfsimage.sh
index 74c612d,5f45a64..6a2ec1c
--- 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_MAP_FILE] [-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] [-a ]
++${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] [-a]
  EOT
  }
  
@@@ -79,13 -79,12 +79,19 @@@ if [[ "$1" == "-zo" ]]; the
      shift; shift
  fi
  
 +COMPRESS_THRESHOLD=0
 +if [[ "$1" == "-t" ]]; then
 +    COMPRESS_THRESHOLD=$2
 +    shift; shift
 +fi
 +
 +
+ DISABLE_4K_ALIGN=false
+ if [[ "$1" == "-a" ]]; then
+     DISABLE_4K_ALIGN=true
+     shift;
+ fi
+ 
  OPT=""
  if [ -n "$MOUNT_POINT" ]; then
    OPT="$OPT -mount-point $MOUNT_POINT"
@@@ -105,9 -104,9 +111,12 @@@ f
  if [ -n "$BLOCK_SIZE" ]; then
    OPT="$OPT -b $BLOCK_SIZE"
  fi
 +if [ -n "$COMPRESS_THRESHOLD" ]; then
 +  OPT="$OPT -t $COMPRESS_THRESHOLD"
 +fi
+ if [ "$DISABLE_4K_ALIGN" = true ]; then
+   OPT="$OPT -disable-4k-align"
+ fi
  
  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