Merge "e2fsck: remove unneeded type redefinitions"