ofproto-dpif: Fix merge error that caused memory leak.