Merge changes I47373995,I5bf9a003,Iff6f5f8a am: eb40ceb178

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

Change-Id: Ie5ffb2734d0df58f1184ccb367fb42f09c9c8996