Reverted cm-10.1 to cm-10.2 changes to fstab and vold.

Change-Id: I84c8191ef467e439ed846884de23ed6ca55c3b86