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

Change-Id: I3f4d0300f3c63c392cff66dbda16e4ae7467f8cb