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

Change-Id: Ic9cd62b685dbc40f5e61bd8072cffba3cb2aff37