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

Change-Id: Ie6ec11d57ff7c448425422a4f47854bd4dfb0aac