Merge "Export android_filesystem_config.h as a filegroup"