Merge changes I47373995,I5bf9a003,Iff6f5f8a am: eb40ceb178 am: 76c28599af

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

Change-Id: Iedebcaafa6c9b304d2afa35b3281fbcecaaf2cfe