Merge remote-tracking branch 'aosp/upstream-master' into aosp

* aosp/upstream-master:
  f2fs-tools: release 1.12.0
  f2fs-tools: create sparse file first before stat
  f2fs-tools: show versions if exist
  sload.f2fs: fix memory leak
  f2fs-tools: add the max chunk size limit in sparse image
  mkfs.f2fs: Added missing statements related to error checking.
  f2fs-tools: give WITH_KERNEL_VERSION to check kernel version only
  mkfs.f2fs: support formating large size file in 32-bits platform
  fsck.f2fs: do not hard-code encrypted filename length to avoid heap buffer overflow
  mkfs.f2fs: show the info of volume label only when specify it
  fsck.f2fs: don't allocate new blocks on unclean shutdown
  fsck.f2fs: detect and recover corrupted quota file
  fsck.f2fs: try to recover cp_payload from valid cp pack
  f2fs-tools: introduce sb checksum
  fsck.f2fs: unify the updating of superblocks
  WIP: Add partial shrinking support to f2fs
  dump.f2fs: allow dump data on mounted image
  fsck.f2fs: support checkpoint=disable
  f2fs-tools: rename CHECKSUM_OFFSET to CP_CHKSUM_OFFSET
  doc: add versioning rule
  f2fs-tools: release 1.11.1
  f2fs-tools: Fix cross-build problem caused by AC_CHECK_FILE abuse
  fsck.f2fs: supply more check entries for checkpoint
  fsck.f2fs: print node block address
  f2fs-tools: fix to reset i_gc_failures offline
  mkfs.f2fs: Fixed typos in several printed messages.
  build: declare that libf2fs_format uses the blkid library
  add configure option --with-root-libdir
  mkfs.f2fs: add -R 0:0 by default for android
  mkfs.f2fs: add root_owner to give uid/gid
  mkfs.f2fs: Add several media formats + exe
  f2fs-tools: set namelen parameter of convert_encrypted_name as unsigned
  fsck.f2fs: init quota_file before re-create quota file
  fsck.f2fs: fix to do sanity check with extra_attr feature
  f2fs-tools: avoid mounting f2fs if tools already open the device
  fsck.f2fs: check extent of inline data/dentry inode
  dump.f2fs: only dump nat inside the specified nid range
  fsck.f2fs: fix wrong err message of check quota node
  f2fs-tools: fix compile errors on AOSP
  f2fs-tools: do not count free_segs in flush_sit_entries
  fsck.f2fs: introduce fsck_chk_curseg_info
  sload.f2fs: update sit entries of cursegs
  fsck.f2fs: show missing large_nat_bitmap flag in print_ckpt_info
  fsck.f2fs: do not print content beyond sb->version
  resize.f2fs: skip cursegs when finding next free block
  configure: uclinux is also linux
  f2fs-tools: fix to ignore sg_write_buffer in git
  f2fs-tools: fix overflow bug of start_sector when computing zone_align_start_offset
  f2fs-tools: fix to match with the start_sector
  libf2fs: read "disk model" from SCSI ioctl the same way kernel does
  mkfs.f2fs: not allow to format too small sized partition
  fsck.f2fs: fix to avoid accessing invalid memory address
  fsck.f2fs: add -O features to tune the bits
  mkfs.f2fs: factor out feature table from mkfs.f2fs
  f2fs-tools: add -g to give default options
  mkfs.f2fs: use an array to manage features
  f2fs-tools: remove duplicated declaration of f2fs_configuration c
  f2fs-tools: introduce new option V to show version
  resize.f2fs: clear CP_COMPACT_SUM_FLAG when rebuilding checkpoint
  mkfs.f2fs: support multiple features with one "-O"
  mkfs.f2fs: fix incorrect cold data location

Change-Id: I9849e9b81bc8ad89779bb0e7f39fd2eb0df93f60
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>