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

Change-Id: I682c0a0955ba1f2f330fe88608136a71282287a2