resolved conflicts for merge of 3701548f to lmp-mr1-dev-plus-aosp

Change-Id: I186fcab7c0d55c1cb60a56429792601f6ae6f2e0

diff --cc ext4_utils/mkuserimg.sh
index 436e8f1,e2bc33f..3a6006e
--- 1/ext4_utils/mkuserimg.sh
--- 2/ext4_utils/mkuserimg.sh
+++ b/ext4_utils/mkuserimg.sh
@@@ -5,8 -5,8 +5,8 @@@
  function usage() {
  cat<<EOT
  Usage:
 -mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE
 +mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE [-j <journal_size>]
-              [-T TIMESTAMP] [-C FS_CONFIG] [-B BLOCK_LIST_FILE] [FILE_CONTEXTS]
+              [-T TIMESTAMP] [-C FS_CONFIG] [-B BLOCK_LIST_FILE] [-L LABEL] [FILE_CONTEXTS]
  EOT
  }
  
@@@ -88,8 -84,11 +94,11 @@@ f
  if [ -n "$BLOCK_LIST" ]; then
    OPT="$OPT -B $BLOCK_LIST"
  fi
+ if [ -n "$LABEL" ]; then
+   OPT="$OPT -L $LABEL"
+ fi
  
 -MAKE_EXT4FS_CMD="make_ext4fs $ENABLE_SPARSE_IMAGE -T $TIMESTAMP $OPT -l $SIZE -a $MOUNT_POINT $OUTPUT_FILE $SRC_DIR"
 +MAKE_EXT4FS_CMD="make_ext4fs $ENABLE_SPARSE_IMAGE -T $TIMESTAMP $OPT -l $SIZE $JOURNAL_FLAGS -a $MOUNT_POINT $OUTPUT_FILE $SRC_DIR"
  echo $MAKE_EXT4FS_CMD
  $MAKE_EXT4FS_CMD
  if [ $? -ne 0 ]; then