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

* commit '93ec2ec378349e118975460dd924d143007b447d':
  Switch fs_mgr_verity.c to C++.