Merge "e2fsck_static is no longer needed for remount"