Update vold setup for 4.4

Change-Id: I7c8646dc962cb15a7cc84ac4405db95d360be15f
Merge branch 'cm-11.0' into martincz