Merge "Revert "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"" am: cbb91a538f am: b2ce87de12 am: 12e13e172d
am: ec647d5639

Change-Id: I8247218bcbea28f89ff8e58f3a1cda68216d3c9c