Merge "Make extractors separate libraries"