Fix vold.fstab
Fix ramdisk files
Merge branch 'jellybean' into cm-10.1