am fd164299: Merge "Remove the ext4 discard mount option." into jb-mr2-dev

* commit 'fd164299f3a05ee2855b0c714beb376a0102689c':
  Remove the ext4 discard mount option.