Merge \\"Convert fuse.c to C++.\\" am: a17427cb1e
am: da4bc7484f

Change-Id: Ic885af5146c4fb11d0545430a043562b80bbcbe0