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

Change-Id: I754d121a0d94a281cbdcb8642d0bb9722f0be5b0