Use our aries-common
Nvm.. CM merged what i needed :)
Track our own system/vold.
Back to CM vold since trim didn't work.
Merge remote-tracking branch 'upstream/jb2' into jb2