Merge "fs_mgr: turn on -Werror"