Merge "fsconfig: Use defined macro for masking" am: 35eaf52ee2
am: d83bb4193a

Change-Id: Ie5fb625707a7e59bd623130617515674c908f0a6