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

Change-Id: Icb976093487500750b2572815fdbeafc22b75a2f