Merge "Delete include/private/android_filesystem_config.h"