Merge "fs_mgr: remove -Wno-unused-variable from cflags" am: fc216d664a am: b65ce990fa
am: 1a28bf2d81

Change-Id: I5fc66104b2330fae7e6a78ea693271497b8708ab