Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled" am: f3780f3cc8 am: 3dccdc5ec5
am: ef847af8bf

Change-Id: Idfb7cfdad7c4ea1b1fe1821160878869cd33e179