Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 8846165753 am: 6d98433f36 am: 03320c3a87

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

Change-Id: I21a1645f4b27cf745ea16114c1cabe057b4753fb