Merge changes from topic "ext2simg-fixes" am: 8f3f2f1c57 am: 72aea32529 am: 34483aac10 am: eaf1436fc5 am: e260ee25c2

Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2504218

Change-Id: I234765806053f53d807fcf3d2831e858ebb5159b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>