Merge "Remove old C fs_mgr interface"