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

Change-Id: Idd9e0216dd0bd3782ee1b8360a121e9ed55a76a0