Merge "fs_mgr: use "-T now" for tune2fs" am: 7ef2b1d853

Change-Id: I188eb32d57db668312dc17efe0705df4b6706665