Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp" am: a37ff0dd83 am: ca11618b25 am: bfe74a7ac3
am: e40e90c24d

Change-Id: I0e491ec1f826961c0cebb446ee57be0a9957aadd