Merge "Removed duplicate definition of E2FSCK"