Merge "fs_mgr: Drop some unneeded dependencies."
am: d262346b57

Change-Id: Ib3f423f2c611d6f0f8adbfbc44f842b7b039f5c7