Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 54ca36c551

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

Change-Id: I581c810c60ca2e35720b5631e664e1390058d6db