am fb4f25c8: am 73bf853e: Merge "Switch fs_mgr_verity.c to C++."

* commit 'fb4f25c8cd501661df37c32c55fad2aa4ce28dfc':
  Switch fs_mgr_verity.c to C++.