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

Change-Id: I06eb6e086a1fbdff4de1c4bed28d136c5e81caab