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

* aosp/upstream-master:
  fsck.f2fs: allow fsck to fix issues with online resize due to SPO
  fsck.f2fs: account COMPRESS_ADDR as reserved blocks correctly
  f2fs_io: support compress blocks ioctls
  fsck.f2fs: report real wall time
  Include private/fs_config.h directly when needed
  f2fs-tools: Casefolded Encryption support
  fsck.f2fs: allow --dry-run to check readonly mounted fs

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