Merge "Optimize dependencies in rkp_factory_extraction_tool"