Merge changes from topic "am-10d9c021ab4e44f3b99009e7bfee3442" into rvc-d1-dev-plus-aosp am: 00fd6e7a5c

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

Change-Id: Ib8ffe8fa298dbcbe670670b9bcd1f6b420bf93ff