Merge "fs_mgr: Separate the required modules of core and recovery variants"