Merge "fs_mgr: fix header ordering" into nyc-mr1-dev-plus-aosp
am: 093f9b7aee

Change-Id: I874b6cbd704b29c8f529efe3aa78ca51dedc810b