Merge "fs_mgr: remove private/android_filesystem_config.h"