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

Change-Id: Ia378eb64aa3df5564d7bd5aa4c1fc8160174b9af