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

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

Change-Id: I88363ae8edd5b45088b03fdd5fc3552d96214168