Merge remote-tracking branch 'aosp/upstream-master' into aosp/master am: 802713c6bf am: bb97c2146f am: c665e91018

Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/1971460

Change-Id: Ibd121d1abb4c57f4e8de86e95b3ec83b994a24ea