ext4_utils: Yet another MMC discard pain in the ass

 * Secure discard on this device is painfully slow. Use regular
   discard until the issue is sorted out.

Change-Id: Id6cc80ea7a25410b812803425a4b6267289834fb
Merge branch 'cm' into HEAD