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

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

Change-Id: I81387339ff8ff94cd15f354b08c154b3447fbb64