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

Change-Id: I3267bdb550fab611157f74c90b7ad926c56d10d2