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

* aosp/upstream-master:
  f2fs-tools: use proper 64bit types for PPC
  mkfs.f2fs: fix wrong indentation and clean up
  mkfs.f2fs: set project quota by default for -g android for v4.14+

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