Matt The Painter

Both, more than likely. The mason should replace the masonry products and the roofer should work with the mason to achieve a regletted counterflashing and flash the roof under counterflashings.