s4-common: disable secure discard for ext4 wipes

Users are reporting really long wipe times in recovery on ext4
partitions.

Change-Id: I2f326622917266e9f43ea12da85889ca843008ca
Merge remote-tracking branch 'cm/cm-11.0' into HEAD