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

* aosp/upstream-master:
  fsck.f2fs: fix to do sanity check with inode.i_inline_xattr_size
  fsck.f2fs: add missing FIX_MSG during extra_attr field recovery
  fsck/mount: Gracefully terminate the mount procedure in case the program runs out of memory.
  lib/libf2fs_io.c: Added a missing free statement.
  fsck.f2fs: preserve CP_TRIMMED_FLAG
  fsck.f2fs: fix incorrect boundary of IS_VALID_NID()
  fsck.f2fs: check validity of nat journal
  f2fs_io: exit if system(3) is failed
  f2fs-tools: Add f2fs_io to .gitignore
  f2fs-tools: Fix various compilation warnings
  f2fs-tools: add c++ for UNUSED
  f2fscrypt: avoid to fail android build
  f2fs-tools: fix build breakage

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