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

Change-Id: I78230fad7c5f910433a00f96e87d26c4c8b9be0d