Remove the ext4 discard mount option.

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

Change-Id: I043ab587aaa91d89e6d736138d049fc85d13e623