Merge "Fix android build warnings in e2fsdroid and libext2fs" am: 1c1fe0e66e am: 93821ee945 am: 1bedc6f72c am: 06cf2e4770
am: 7b46a449f9

Change-Id: I5d0a9127995e6537f1be920f89d5a197cf3bebdf