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

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

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