st/mesa: some more merge fixes