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

Change-Id: I88ea2ea155c1cc67a65c62fe9fe5c6dfefcb014e