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

Change-Id: I9faf773fd39e4cbc1e7b500f4fa6aeaa60589441