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

Change-Id: I59bfdbcf17ac7918ab8c93f7fc089d6e2ba8ca1a