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

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

Change-Id: Iad12589ea84938cf4221757a57990524d45efd1d