Merge "Fix android build warnings in e2fsdroid and libext2fs"
am: 1c1fe0e66e

Change-Id: I7f27a57c92d87104dfb37ad1697190a5f361d52f