Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS" am: 85b80dc18d
am: a4b15d7e2c

Change-Id: Ic57af6475e804fff036e318c05b6cd0123fcf402