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