Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 21152a838f am: 94afeda2cd

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

Change-Id: I74694d5a098d39536c621e76d1748e42653be3a5