[automerger] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs am: dd89f9cde6 am: cbba57fb8a

Change-Id: If0073c11e5cff749193860cee6f547c04aabf684