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