Merge "fs_mgr: Remove fs_mgr_flags #define's"