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

* commit 'ca66fc1cb204dfe9e9b8c8eaad5be95a78207212':