fs_mgr: fix header ordering am: e35e4e4e39
am: 67b9a04352

Change-Id: Id247deeb6e025f19621e5ce5d59614893f19d4b8