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: I88d0f70ca60bab40d7d887a1ad8e008350fe3610