Merge "fs_mgr: support a unified fstab format."