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

Change-Id: I148a63c8928db1b198472226b598d981203aab47