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

Change-Id: I1fbd71cdbf2e55cca508d26960606686e54ebd85