Merge tag 'v1.2.1' into update am: 7269cd8246 am: 8fe4f5452d am: 9c9ce2caf4 am: b4b786ca61

Original change: https://android-review.googlesource.com/c/platform/external/erofs-utils/+/1703646

Change-Id: I844e1f3335d0a6fa208ddf18b50ad642dfd828d8