am c5771b5a: Merge "Vold: Add the fstrim subsystem to vold" into jb-mr2-dev

* commit 'c5771b5a4d66a0c7ca0e2cb1056e670f38b3834f':
  Vold: Add the fstrim subsystem to vold