wipe.c: Fix merging derp
there seems to be a big merging derp in wipe.c
at least for bacon this failed because of missing #ifdef condition
I got wipe.c from CM-12.0 branch and added #ifdef NO_SECURE_DISCARD to it

PS2:
Readded SUPPRESS_EMMC_WIPE support

Change-Id: I8bbe87ee78e51681571965a652e2326fff417d48