Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 158f1c6374

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

Change-Id: I2d0aad1a80aef40ef9e72d482946431d64d84d18