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

Change-Id: Id16b21392aca9a2feb2a90a6808a9eb465e365c8