Merge "TARGET_FS_CONFIG_GEN: switch from android_filesystem_config.h"