Merge "fs_mgr: Remove fs_mgr_flags #define's"
am: c03169caea

Change-Id: Iefa67976c45df702b67cb420c6eb45ea50f30b9b