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

Change-Id: If4347f83f23290102fe40497c93599f514df9c08