Merge "fs_mgr: Don't try to suffix "vroot" with "-verity"."
am: 55f8b894a3

Change-Id: I29fac2f7785850749f67762b03c9488750f64238