Merge "Fix e2fsdroid build with musl" am: a8c312b513 am: e3816d833d am: a1bf8e0e4a am: 51fa8db804 am: 3b463c3207

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

Change-Id: Icc3c9466f9543bfe8f12bbb36859bd0502fc7d02