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

Change-Id: I97ace0eda2fa531977a0a014e4f6f2a0b63415d5