Merge "e2fsck_static is no longer needed for remount"
am: 725d7f8dfd

Change-Id: Ie67ab328d10aebd078a1a41fe48b79f6d4467ebe