Merge "Switch fs_mgr/*.c to C++." am: 8c0cf30a6b am: e41dc8e906 am: b9acb187f0
am: ed213e6814

Change-Id: I333d2e995083ac1e16fdae360046124f61824871