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

Change-Id: I1f55af63884345688bc877c15979f712b9f9ba2f