[automerger skipped] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs
am: e42a494592  -s ours

Change-Id: Ib5b7cd1291e4a5db62e19fd85462b81ac5af22be