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

* aosp/upstream-master:
  fsck.f2fs: check nat_bits separately from bug_on
  fsck.f2fs: don't ask anything on dry-run
  f2fs_io: add pin_file control command
  dump.f2fs: fix incorrect endian conversion
  fsck: Fix big endian platforms
  tools: add f2fs_io
  parse.f2fs: fix parsing of f2fs_trace_ios
  fsck.f2fs: introduce preen mode 2
  fsck.f2fs: allow to fsck readonly image w/ -f option
  f2fs-tools: fix to check return value of {c,m}alloc()
  libf2fs: avoid to use static local string for global f2fs_conf

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