Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS"