system/vold from hellybean

Change-Id: I11edc8884759dd4c976b44d746303ec5f2c4bd85
Merge branch 'cm-10.2' of github.com:Hellybean/android into cm-10.2
Revert "Update default.xml"

This reverts commit 39e5626b54882006b35915df16eedb6e6baab7a8.