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

Change-Id: I2807440a4df091743134387661c5fec9e998ba8e