Remove the ext4 discard mount option.

Now that fstrim is being used, the discard mount option
is no longer needed.

Change-Id: I7f7157c00daa3e3782d9ec237a9991cf8cf3a10f
diff --git a/fstab.grouper b/fstab.grouper
index 66dbd68..c1bddbc 100644
--- a/fstab.grouper
+++ b/fstab.grouper
@@ -5,8 +5,8 @@
 
 
 /dev/block/platform/sdhci-tegra.3/by-name/APP           /system             ext4      ro                                                            wait
-/dev/block/platform/sdhci-tegra.3/by-name/CAC           /cache              ext4      discard,noatime,nosuid,nodev,nomblk_io_submit,errors=panic    wait
-/dev/block/platform/sdhci-tegra.3/by-name/UDA           /data               ext4      discard,noatime,nosuid,nodev,nomblk_io_submit,errors=panic    wait,encryptable=/dev/block/platform/sdhci-tegra.3/by-name/MDA
+/dev/block/platform/sdhci-tegra.3/by-name/CAC           /cache              ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic    wait
+/dev/block/platform/sdhci-tegra.3/by-name/UDA           /data               ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic    wait,encryptable=/dev/block/platform/sdhci-tegra.3/by-name/MDA
 /dev/block/platform/sdhci-tegra.3/by-name/MSC           /misc               emmc      defaults                                                      defaults
 /dev/block/platform/sdhci-tegra.3/by-name/LNX           /boot               emmc      defaults                                                      defaults
 /dev/block/platform/sdhci-tegra.3/by-name/SOS           /recovery           emmc      defaults                                                      defaults