Include private/fs_config.h directly when needed am: 2474111e6f am: 5efd62031b am: 2135b406bb

Change-Id: I589607f3cdecc3e8478f1fd371b9a8625ee69090