Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 0fad5b2f5f

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

Change-Id: I902af9b29dd120a98f76cd9fd5c4990ff8a2bc1d