fix vold to use new fstab.grouper format

Change-Id: I1839f2e2d697d2413b399cdfb8d617203152bff7

Conflicts:
	fstab.grouper