Android S V2 Beta 3
Merge remote-tracking branch 'aosp/upstream-master' into aosp/master

* aosp/upstream-master:
  f2fs-tools: add atomic write related options to f2fs_io write command
  mkfs.f2fs: set required quota types only
  fsck.f2fs: Add progression feedback

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