Merge "fs_mgr: make changes needed to port vold to new Fstab interface"
am: 6c44d00d79

Change-Id: I3ed2723784298b6866594ce62a7491d2ddbd67a9