vold is deprecated, use fstab v2

Conflicts:

	fstab.p990
	vold.fstab

Change-Id: I9a959d933cee23db8e21a6751c3f0bd27d70016d