Merge "fsconfig: Use defined macro for masking"