Merge "Fix android build warnings in e2fsdroid and libext2fs"