Merge "rkp_factory_extraction_tool: Add support for IRPC v3"