Merge changes Ieacdcbc3,I875001d0,I5a9c9578 am: c1f5cf5960 am: 2f09d25e74

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

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