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

Change-Id: Ib872a5703e0cac4813b7bc1ccdac90782aec9b71