am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."

* commit '596219d9c2ea760a473c9f90bfa0317c326913af':