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

Change-Id: I6639d454db9eb1c906b0569be8eebd5c08637644