Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp"