Merge "Fix e2fsdroid build with musl"