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

Change-Id: I8593bdf9366e72bc165117fc1fe8414567984661