Merge "fs_mgr: remove private/android_filesystem_config.h" am: f5ee213a5c am: ba9d88ebab
am: 8f9a187785

Change-Id: Ib9cbcd36021cc80202f04162a4aa555142a46ea6