fs_mgr: fix header ordering
am: e35e4e4e39

Change-Id: I16866690e9e40916f67b4191fc054ab5a0c1b63b