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

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

Change-Id: I16094ae41362a657fab5e49f99d346edd743cc68